diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 99906f08952a..ace7db82f8e5 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -21,7 +21,7 @@
       ]
     },
     "ppy.localisationanalyser.tools": {
-      "version": "2023.1117.0",
+      "version": "2024.517.0",
       "commands": [
         "localisation"
       ]
diff --git a/.gitignore b/.gitignore
index 525b3418cd1a..11fee27f2803 100644
--- a/.gitignore
+++ b/.gitignore
@@ -340,4 +340,5 @@ inspectcode
 # Fody (pulled in by Realm) - schema file
 FodyWeavers.xsd
 
-.idea/.idea.osu.Desktop/.idea/misc.xml
\ No newline at end of file
+.idea/.idea.osu.Desktop/.idea/misc.xml
+.idea/.idea.osu.Android/.idea/deploymentTargetDropDown.xml
diff --git a/Directory.Build.props b/Directory.Build.props
index 2d289d0f22c1..5ba12b845ba0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,6 @@
 <Project>
   <PropertyGroup Label="C#">
     <LangVersion>12.0</LangVersion>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/assets/lazer-nuget.png b/assets/lazer-nuget.png
index fed2f45149d7..fabfcc223e74 100644
Binary files a/assets/lazer-nuget.png and b/assets/lazer-nuget.png differ
diff --git a/assets/lazer.png b/assets/lazer.png
index 2ee44225bf02..f564b93d6f58 100644
Binary files a/assets/lazer.png and b/assets/lazer.png differ
diff --git a/osu.Android.props b/osu.Android.props
index 4901f30d8ad5..1f241c6db550 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.306.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.523.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Android/AndroidJoystickSettings.cs b/osu.Android/AndroidJoystickSettings.cs
deleted file mode 100644
index bf69461f0d02..000000000000
--- a/osu.Android/AndroidJoystickSettings.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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.Android.Input;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Localisation;
-using osu.Game.Overlays.Settings;
-
-namespace osu.Android
-{
-    public partial class AndroidJoystickSettings : SettingsSubsection
-    {
-        protected override LocalisableString Header => JoystickSettingsStrings.JoystickGamepad;
-
-        private readonly AndroidJoystickHandler joystickHandler;
-
-        private readonly Bindable<bool> enabled = new BindableBool(true);
-
-        private SettingsSlider<float> deadzoneSlider = null!;
-
-        private Bindable<float> handlerDeadzone = null!;
-
-        private Bindable<float> localDeadzone = null!;
-
-        public AndroidJoystickSettings(AndroidJoystickHandler joystickHandler)
-        {
-            this.joystickHandler = joystickHandler;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            // use local bindable to avoid changing enabled state of game host's bindable.
-            handlerDeadzone = joystickHandler.DeadzoneThreshold.GetBoundCopy();
-            localDeadzone = handlerDeadzone.GetUnboundCopy();
-
-            Children = new Drawable[]
-            {
-                new SettingsCheckbox
-                {
-                    LabelText = CommonStrings.Enabled,
-                    Current = enabled
-                },
-                deadzoneSlider = new SettingsSlider<float>
-                {
-                    LabelText = JoystickSettingsStrings.DeadzoneThreshold,
-                    KeyboardStep = 0.01f,
-                    DisplayAsPercentage = true,
-                    Current = localDeadzone,
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            enabled.BindTo(joystickHandler.Enabled);
-            enabled.BindValueChanged(e => deadzoneSlider.Current.Disabled = !e.NewValue, true);
-
-            handlerDeadzone.BindValueChanged(val =>
-            {
-                bool disabled = localDeadzone.Disabled;
-
-                localDeadzone.Disabled = false;
-                localDeadzone.Value = val.NewValue;
-                localDeadzone.Disabled = disabled;
-            }, true);
-
-            localDeadzone.BindValueChanged(val => handlerDeadzone.Value = val.NewValue);
-        }
-    }
-}
diff --git a/osu.Android/AndroidMouseSettings.cs b/osu.Android/AndroidMouseSettings.cs
deleted file mode 100644
index fd01b1116485..000000000000
--- a/osu.Android/AndroidMouseSettings.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 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 Android.OS;
-using osu.Framework.Allocation;
-using osu.Framework.Android.Input;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Configuration;
-using osu.Game.Localisation;
-using osu.Game.Overlays.Settings;
-using osu.Game.Overlays.Settings.Sections.Input;
-
-namespace osu.Android
-{
-    public partial class AndroidMouseSettings : SettingsSubsection
-    {
-        private readonly AndroidMouseHandler mouseHandler;
-
-        protected override LocalisableString Header => MouseSettingsStrings.Mouse;
-
-        private Bindable<double> handlerSensitivity = null!;
-
-        private Bindable<double> localSensitivity = null!;
-
-        private Bindable<bool> relativeMode = null!;
-
-        public AndroidMouseSettings(AndroidMouseHandler mouseHandler)
-        {
-            this.mouseHandler = mouseHandler;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager osuConfig)
-        {
-            // use local bindable to avoid changing enabled state of game host's bindable.
-            handlerSensitivity = mouseHandler.Sensitivity.GetBoundCopy();
-            localSensitivity = handlerSensitivity.GetUnboundCopy();
-
-            relativeMode = mouseHandler.UseRelativeMode.GetBoundCopy();
-
-            // High precision/pointer capture is only available on Android 8.0 and up
-            if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
-            {
-                AddRange(new Drawable[]
-                {
-                    new SettingsCheckbox
-                    {
-                        LabelText = MouseSettingsStrings.HighPrecisionMouse,
-                        TooltipText = MouseSettingsStrings.HighPrecisionMouseTooltip,
-                        Current = relativeMode,
-                        Keywords = new[] { @"raw", @"input", @"relative", @"cursor", @"captured", @"pointer" },
-                    },
-                    new MouseSettings.SensitivitySetting
-                    {
-                        LabelText = MouseSettingsStrings.CursorSensitivity,
-                        Current = localSensitivity,
-                    },
-                });
-            }
-
-            AddRange(new Drawable[]
-            {
-                new SettingsCheckbox
-                {
-                    LabelText = MouseSettingsStrings.DisableMouseWheelVolumeAdjust,
-                    TooltipText = MouseSettingsStrings.DisableMouseWheelVolumeAdjustTooltip,
-                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel),
-                },
-                new SettingsCheckbox
-                {
-                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
-                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),
-                },
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            relativeMode.BindValueChanged(relative => localSensitivity.Disabled = !relative.NewValue, true);
-
-            handlerSensitivity.BindValueChanged(val =>
-            {
-                bool disabled = localSensitivity.Disabled;
-
-                localSensitivity.Disabled = false;
-                localSensitivity.Value = val.NewValue;
-                localSensitivity.Disabled = disabled;
-            }, true);
-
-            localSensitivity.BindValueChanged(val => handlerSensitivity.Value = val.NewValue);
-        }
-    }
-}
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 52cfb67f428c..a235913ef3aa 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -5,13 +5,9 @@
 using Android.App;
 using Microsoft.Maui.Devices;
 using osu.Framework.Allocation;
-using osu.Framework.Android.Input;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Input.Handlers;
 using osu.Framework.Platform;
 using osu.Game;
-using osu.Game.Overlays.Settings;
-using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;
 
@@ -88,24 +84,6 @@ public override void SetHost(GameHost host)
 
         protected override BatteryInfo CreateBatteryInfo() => new AndroidBatteryInfo();
 
-        public override SettingsSubsection CreateSettingsSubsectionFor(InputHandler handler)
-        {
-            switch (handler)
-            {
-                case AndroidMouseHandler mh:
-                    return new AndroidMouseSettings(mh);
-
-                case AndroidJoystickHandler jh:
-                    return new AndroidJoystickSettings(jh);
-
-                case AndroidTouchHandler th:
-                    return new TouchSettings(th);
-
-                default:
-                    return base.CreateSettingsSubsectionFor(handler);
-            }
-        }
-
         private class AndroidBatteryInfo : BatteryInfo
         {
             public override double? ChargeLevel => Battery.ChargeLevel;
diff --git a/osu.Android/Resources/drawable/monochrome.xml b/osu.Android/Resources/drawable/monochrome.xml
index e12af03bfb1b..600c070c3e1a 100644
--- a/osu.Android/Resources/drawable/monochrome.xml
+++ b/osu.Android/Resources/drawable/monochrome.xml
@@ -1,24 +1,8 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M73.92,44.43C74.82,44.43 75.43,45.1 75.43,46.02V54.54C75.43,55.46 74.82,56.13 73.92,56.13C73,56.13 72.41,55.46 72.41,54.54V46.02C72.41,45.1 73,44.43 73.92,44.43ZM73.92,61.55C72.82,61.55 71.95,60.68 71.95,59.58C71.95,58.51 72.82,57.64 73.92,57.64C75.02,57.64 75.89,58.51 75.89,59.58C75.89,60.68 75.02,61.55 73.92,61.55Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M68.41,48.55C69.33,48.55 69.92,49.22 69.92,50.11V55.77C69.92,59.94 67.35,61.55 64.22,61.55C61.08,61.55 58.5,59.94 58.5,55.77V50.11C58.5,49.22 59.09,48.55 60.01,48.55C60.91,48.55 61.52,49.22 61.52,50.11V55.56C61.52,57.84 62.48,58.74 64.22,58.74C65.94,58.74 66.9,57.84 66.9,55.56V50.11C66.9,49.22 67.51,48.55 68.41,48.55Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M49.94,52.01C49.94,52.85 50.81,53.16 52.47,53.54C54.78,54.1 56.98,54.69 56.98,57.53C56.98,60.3 54.93,61.55 51.99,61.55C49.56,61.55 47.79,60.71 46.97,59.73C46.33,58.97 46.41,58.3 47.02,57.71C47.79,56.97 48.46,57.28 48.89,57.66C49.58,58.3 50.43,58.97 52.07,58.97C53.29,58.97 54.06,58.56 54.06,57.74C54.06,56.92 53.24,56.64 51.09,56.05C48.97,55.46 47.08,54.9 47.08,52.36C47.08,49.52 49.38,48.35 51.94,48.35C53.4,48.35 55.06,48.73 56.08,49.83C56.52,50.27 56.85,50.88 56.08,51.72C55.32,52.52 54.75,52.29 54.22,51.88C53.73,51.52 52.88,50.91 51.6,50.91C50.73,50.91 49.94,51.19 49.94,52.01Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M38.79,61.55C34.9,61.55 32.11,58.74 32.11,54.95C32.11,51.14 34.9,48.35 38.79,48.35C42.68,48.35 45.47,51.14 45.47,54.95C45.47,58.74 42.68,61.55 38.79,61.55ZM38.79,58.74C41.04,58.74 42.45,57.1 42.45,54.95C42.45,52.8 41.04,51.14 38.79,51.14C36.54,51.14 35.13,52.8 35.13,54.95C35.13,57.1 36.54,58.74 38.79,58.74Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M86,54C86,71.67 71.67,86 54,86C36.33,86 22,71.67 22,54C22,36.33 36.33,22 54,22C71.67,22 86,36.33 86,54ZM25.2,54C25.2,69.91 38.09,82.8 54,82.8C69.91,82.8 82.8,69.91 82.8,54C82.8,38.09 69.91,25.2 54,25.2C38.09,25.2 25.2,38.09 25.2,54Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M36.78,54.99C36.78,56.09 37.65,56.96 38.75,56.96C39.85,56.96 40.72,56.09 40.72,54.99C40.72,53.91 39.85,53.04 38.75,53.04C37.65,53.04 36.78,53.91 36.78,54.99Z"
-      android:fillColor="#000000"/>
+<vector android:height="108dp" android:viewportHeight="434"
+    android:viewportWidth="434" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M299.36,178.05C303.08,178.05 305.62,180.81 305.62,184.62V219.92C305.62,223.74 303.08,226.5 299.36,226.5C295.55,226.5 293.11,223.74 293.11,219.92V184.62C293.11,180.81 295.55,178.05 299.36,178.05ZM299.36,248.97C294.81,248.97 291.2,245.37 291.2,240.81C291.2,236.35 294.81,232.75 299.36,232.75C303.92,232.75 307.53,236.35 307.53,240.81C307.53,245.37 303.92,248.97 299.36,248.97Z"/>
+    <path android:fillColor="#000000" android:pathData="M276.52,195.12C280.34,195.12 282.77,197.87 282.77,201.58V225.01C282.77,242.29 272.12,248.97 259.19,248.97C246.15,248.97 235.49,242.29 235.49,225.01V201.58C235.49,197.87 237.93,195.12 241.75,195.12C245.46,195.12 248,197.87 248,201.58V224.16C248,233.6 251.98,237.31 259.19,237.31C266.29,237.31 270.27,233.6 270.27,224.16V201.58C270.27,197.87 272.81,195.12 276.52,195.12Z"/>
+    <path android:fillColor="#000000" android:pathData="M200.02,209.43C200.02,212.93 203.63,214.2 210.52,215.79C220.06,218.12 229.18,220.56 229.18,232.33C229.18,243.78 220.7,248.97 208.51,248.97C198.43,248.97 191.12,245.47 187.73,241.44C185.08,238.26 185.4,235.51 187.94,233.07C191.12,229.99 193.88,231.27 195.68,232.86C198.54,235.51 202.04,238.26 208.82,238.26C213.91,238.26 217.09,236.57 217.09,233.18C217.09,229.78 213.7,228.62 204.8,226.18C196,223.74 188.15,221.41 188.15,210.91C188.15,199.15 197.69,194.27 208.29,194.27C214.34,194.27 221.23,195.86 225.47,200.42C227.27,202.22 228.65,204.76 225.47,208.26C222.29,211.55 219.96,210.6 217.73,208.9C215.71,207.41 212.22,204.87 206.92,204.87C203.31,204.87 200.02,206.04 200.02,209.43Z"/>
+    <path android:fillColor="#000000" android:pathData="M153.74,248.97C138.46,248.97 127.5,237.27 127.5,221.53C127.5,205.68 138.46,194.09 153.74,194.09C169.03,194.09 179.99,205.68 179.99,221.53C179.99,237.27 169.03,248.97 153.74,248.97ZM153.74,237.27C162.59,237.27 168.12,230.46 168.12,221.53C168.12,212.6 162.59,205.68 153.74,205.68C144.89,205.68 139.36,212.6 139.36,221.53C139.36,230.46 144.89,237.27 153.74,237.27Z"/>
+    <path android:fillColor="#000000" android:pathData="M349,217.5C349,290.13 290.13,349 217.5,349C144.88,349 86,290.13 86,217.5C86,144.88 144.88,86 217.5,86C290.13,86 349,144.88 349,217.5ZM99.15,217.5C99.15,282.86 152.14,335.85 217.5,335.85C282.86,335.85 335.85,282.86 335.85,217.5C335.85,152.14 282.86,99.15 217.5,99.15C152.14,99.15 99.15,152.14 99.15,217.5Z"/>
 </vector>
diff --git a/osu.Android/Resources/mipmap-hdpi/ic_launcher.png b/osu.Android/Resources/mipmap-hdpi/ic_launcher.png
index 7870430484b7..a1f717cf6c41 100644
Binary files a/osu.Android/Resources/mipmap-hdpi/ic_launcher.png and b/osu.Android/Resources/mipmap-hdpi/ic_launcher.png differ
diff --git a/osu.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/osu.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png
index b2ec3e49da19..36651206e8c7 100644
Binary files a/osu.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and b/osu.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/osu.Android/Resources/mipmap-mdpi/ic_launcher.png b/osu.Android/Resources/mipmap-mdpi/ic_launcher.png
index 2a01d8f78115..c68ed7a2d558 100644
Binary files a/osu.Android/Resources/mipmap-mdpi/ic_launcher.png and b/osu.Android/Resources/mipmap-mdpi/ic_launcher.png differ
diff --git a/osu.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/osu.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png
index e22f25656252..85f308442952 100644
Binary files a/osu.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and b/osu.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/osu.Android/Resources/mipmap-xhdpi/ic_launcher.png b/osu.Android/Resources/mipmap-xhdpi/ic_launcher.png
index b5e1a9e37988..28be07512ad6 100644
Binary files a/osu.Android/Resources/mipmap-xhdpi/ic_launcher.png and b/osu.Android/Resources/mipmap-xhdpi/ic_launcher.png differ
diff --git a/osu.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/osu.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png
index 1cc3fa9072d0..613b817f0a54 100644
Binary files a/osu.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and b/osu.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/osu.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/osu.Android/Resources/mipmap-xxhdpi/ic_launcher.png
index 8a37b0449edc..4330a939d9f1 100644
Binary files a/osu.Android/Resources/mipmap-xxhdpi/ic_launcher.png and b/osu.Android/Resources/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/osu.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/osu.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
index 1b856a31b2e8..ec7d60283808 100644
Binary files a/osu.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and b/osu.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher.png
index 65751e15c943..2e722ee884f6 100644
Binary files a/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and b/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
index 05c6829a4762..f22db0c61680 100644
Binary files a/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and b/osu.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 6e8554d617d3..780d367900ea 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -35,8 +35,6 @@ internal partial class DiscordRichPresence : Component
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        private IBindable<APIUser> user = null!;
-
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -49,9 +47,11 @@ internal partial class DiscordRichPresence : Component
         [Resolved]
         private MultiplayerClient multiplayerClient { get; set; } = null!;
 
+        [Resolved]
+        private OsuConfigManager config { get; set; } = null!;
+
         private readonly IBindable<UserStatus?> status = new Bindable<UserStatus?>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
-
         private readonly Bindable<DiscordRichPresenceMode> privacyMode = new Bindable<DiscordRichPresenceMode>();
 
         private readonly RichPresence presence = new RichPresence
@@ -64,8 +64,10 @@ internal partial class DiscordRichPresence : Component
             },
         };
 
+        private IBindable<APIUser>? user;
+
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load()
         {
             client = new DiscordRpcClient(client_id)
             {
@@ -77,10 +79,27 @@ private void load(OsuConfigManager config)
             client.OnReady += onReady;
             client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Message} ({e.Code})", LoggingTarget.Network, LogLevel.Error);
 
-            // A URI scheme is required to support game invitations, as well as informing Discord of the game executable path to support launching the game when a user clicks on join/spectate.
-            client.RegisterUriScheme();
-            client.Subscribe(EventType.Join);
-            client.OnJoin += onJoin;
+            try
+            {
+                client.RegisterUriScheme();
+                client.Subscribe(EventType.Join);
+                client.OnJoin += onJoin;
+            }
+            catch (Exception ex)
+            {
+                // This is known to fail in at least the following sandboxed environments:
+                // - macOS (when packaged as an app bundle)
+                // - flatpak (see: https://github.com/flathub/sh.ppy.osu/issues/170)
+                // There is currently no better way to do this offered by Discord, so the best we can do is simply ignore it for now.
+                Logger.Log($"Failed to register Discord URI scheme: {ex}");
+            }
+
+            client.Initialize();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);
 
@@ -99,8 +118,6 @@ private void load(OsuConfigManager config)
             activity.BindValueChanged(_ => schedulePresenceUpdate());
             privacyMode.BindValueChanged(_ => schedulePresenceUpdate());
             multiplayerClient.RoomUpdated += onRoomUpdated;
-
-            client.Initialize();
         }
 
         private void onReady(object _, ReadyMessage __)
@@ -141,11 +158,14 @@ private void schedulePresenceUpdate()
 
         private void updatePresence(bool hideIdentifiableInformation)
         {
+            if (user == null)
+                return;
+
             // user activity
             if (activity.Value != null)
             {
-                presence.State = truncate(activity.Value.GetStatus(hideIdentifiableInformation));
-                presence.Details = truncate(activity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
+                presence.State = clampLength(activity.Value.GetStatus(hideIdentifiableInformation));
+                presence.Details = clampLength(activity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
 
                 if (getBeatmapID(activity.Value) is int beatmapId && beatmapId > 0)
                 {
@@ -190,7 +210,9 @@ private void updatePresence(bool hideIdentifiableInformation)
                     Password = room.Settings.Password,
                 };
 
-                presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
+                if (client.HasRegisteredUriScheme)
+                    presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
+
                 // discord cannot handle both secrets and buttons at the same time, so we need to choose something.
                 // the multiplayer room seems more important.
                 presence.Buttons = null;
@@ -249,8 +271,19 @@ private void onJoin(object sender, JoinMessage args) => Scheduler.AddOnce(() =>
 
         private static readonly int ellipsis_length = Encoding.UTF8.GetByteCount(new[] { '…' });
 
-        private static string truncate(string str)
+        private static string clampLength(string str)
         {
+            // Empty strings are fine to discord even though single-character strings are not. Make it make sense.
+            if (string.IsNullOrEmpty(str))
+                return str;
+
+            // As above, discord decides that *non-empty* strings shorter than 2 characters cannot possibly be valid input, because... reasons?
+            // And yes, that is two *characters*, or *codepoints*, not *bytes* as further down below (as determined by empirical testing).
+            // That seems very questionable, and isn't even documented anywhere. So to *make it* accept such valid input,
+            // just tack on enough of U+200B ZERO WIDTH SPACEs at the end.
+            if (str.Length < 2)
+                return str.PadRight(2, '\u200B');
+
             if (Encoding.UTF8.GetByteCount(str) <= 128)
                 return str;
 
diff --git a/osu.Desktop/NVAPI.cs b/osu.Desktop/NVAPI.cs
index 554f89a847f9..0b09613ba0c3 100644
--- a/osu.Desktop/NVAPI.cs
+++ b/osu.Desktop/NVAPI.cs
@@ -489,6 +489,7 @@ internal struct NvApplication
         public static uint Stride => (uint)Marshal.SizeOf(typeof(NvApplication)) | (2 << 16);
     }
 
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum NvStatus
     {
         OK = 0, // Success. Request is completed.
@@ -611,6 +612,7 @@ internal enum NvStatus
         FIRMWARE_REVISION_NOT_SUPPORTED = -200, // The device's firmware is not supported.
     }
 
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum NvSystemType
     {
         UNKNOWN = 0,
@@ -618,6 +620,7 @@ internal enum NvSystemType
         DESKTOP = 2
     }
 
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum NvGpuType
     {
         UNKNOWN = 0,
@@ -625,6 +628,7 @@ internal enum NvGpuType
         DGPU = 2, // Discrete
     }
 
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum NvSettingID : uint
     {
         OGL_AA_LINE_GAMMA_ID = 0x2089BF6C,
@@ -717,6 +721,7 @@ internal enum NvSettingID : uint
         INVALID_SETTING_ID = 0xFFFFFFFF
     }
 
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum NvShimSetting : uint
     {
         SHIM_RENDERING_MODE_INTEGRATED = 0x00000000,
@@ -731,6 +736,7 @@ internal enum NvShimSetting : uint
         SHIM_RENDERING_MODE_DEFAULT = SHIM_RENDERING_MODE_AUTO_SELECT
     }
 
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum NvThreadControlSetting : uint
     {
         OGL_THREAD_CONTROL_ENABLE = 0x00000001,
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 2b232db274b1..3e06dad4c54b 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -22,7 +22,6 @@
 using osu.Game.Online.Multiplayer;
 using osu.Game.Performance;
 using osu.Game.Utils;
-using SDL2;
 
 namespace osu.Desktop
 {
@@ -161,7 +160,7 @@ public override void SetHost(GameHost host)
             host.Window.Title = Name;
         }
 
-        protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();
+        protected override BatteryInfo CreateBatteryInfo() => FrameworkEnvironment.UseSDL3 ? new SDL3BatteryInfo() : new SDL2BatteryInfo();
 
         protected override void Dispose(bool isDisposing)
         {
@@ -169,23 +168,5 @@ protected override void Dispose(bool isDisposing)
             osuSchemeLinkIPCChannel?.Dispose();
             archiveImportIPCChannel?.Dispose();
         }
-
-        private class SDL2BatteryInfo : BatteryInfo
-        {
-            public override double? ChargeLevel
-            {
-                get
-                {
-                    SDL.SDL_GetPowerInfo(out _, out int percentage);
-
-                    if (percentage == -1)
-                        return null;
-
-                    return percentage / 100.0;
-                }
-            }
-
-            public override bool OnBattery => SDL.SDL_GetPowerInfo(out _, out _) == SDL.SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
-        }
     }
 }
diff --git a/osu.Desktop/Performance/HighPerformanceSessionManager.cs b/osu.Desktop/Performance/HighPerformanceSessionManager.cs
index eb2b3be5b934..0df87ab007f5 100644
--- a/osu.Desktop/Performance/HighPerformanceSessionManager.cs
+++ b/osu.Desktop/Performance/HighPerformanceSessionManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime;
+using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Game.Performance;
@@ -11,16 +12,26 @@ namespace osu.Desktop.Performance
 {
     public class HighPerformanceSessionManager : IHighPerformanceSessionManager
     {
+        public bool IsSessionActive => activeSessions > 0;
+
+        private int activeSessions;
+
         private GCLatencyMode originalGCMode;
 
         public IDisposable BeginSession()
         {
-            enableHighPerformanceSession();
-            return new InvokeOnDisposal<HighPerformanceSessionManager>(this, static m => m.disableHighPerformanceSession());
+            enterSession();
+            return new InvokeOnDisposal<HighPerformanceSessionManager>(this, static m => m.exitSession());
         }
 
-        private void enableHighPerformanceSession()
+        private void enterSession()
         {
+            if (Interlocked.Increment(ref activeSessions) > 1)
+            {
+                Logger.Log($"High performance session requested ({activeSessions} running in total)");
+                return;
+            }
+
             Logger.Log("Starting high performance session");
 
             originalGCMode = GCSettings.LatencyMode;
@@ -30,8 +41,14 @@ private void enableHighPerformanceSession()
             GC.Collect(0);
         }
 
-        private void disableHighPerformanceSession()
+        private void exitSession()
         {
+            if (Interlocked.Decrement(ref activeSessions) > 0)
+            {
+                Logger.Log($"High performance session finished ({activeSessions} others remain)");
+                return;
+            }
+
             Logger.Log("Ending high performance session");
 
             if (GCSettings.LatencyMode == GCLatencyMode.LowLatency)
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 2d7ec5aa5f18..23e56cdce9c6 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -13,7 +13,7 @@
 using osu.Game;
 using osu.Game.IPC;
 using osu.Game.Tournament;
-using SDL2;
+using SDL;
 using Squirrel;
 
 namespace osu.Desktop
@@ -52,16 +52,19 @@ public static void Main(string[] args)
                 // See https://www.mongodb.com/docs/realm/sdk/dotnet/compatibility/
                 if (windowsVersion.Major < 6 || (windowsVersion.Major == 6 && windowsVersion.Minor <= 2))
                 {
-                    // If users running in compatibility mode becomes more of a common thing, we may want to provide better guidance or even consider
-                    // disabling it ourselves.
-                    // We could also better detect compatibility mode if required:
-                    // https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
-                    SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
-                        "Your operating system is too old to run osu!",
-                        "This version of osu! requires at least Windows 8.1 to run.\n"
-                        + "Please upgrade your operating system or consider using an older version of osu!.\n\n"
-                        + "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!", IntPtr.Zero);
-                    return;
+                    unsafe
+                    {
+                        // If users running in compatibility mode becomes more of a common thing, we may want to provide better guidance or even consider
+                        // disabling it ourselves.
+                        // We could also better detect compatibility mode if required:
+                        // https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
+                        SDL3.SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
+                            "Your operating system is too old to run osu!"u8,
+                            "This version of osu! requires at least Windows 8.1 to run.\n"u8
+                            + "Please upgrade your operating system or consider using an older version of osu!.\n\n"u8
+                            + "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!"u8, null);
+                        return;
+                    }
                 }
 
                 setupSquirrel();
@@ -104,7 +107,13 @@ public static void Main(string[] args)
                 }
             }
 
-            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null }))
+            var hostOptions = new HostOptions
+            {
+                IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null,
+                FriendlyGameName = OsuGameBase.GAME_NAME,
+            };
+
+            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, hostOptions))
             {
                 if (!host.IsPrimaryInstance)
                 {
diff --git a/osu.Desktop/SDL2BatteryInfo.cs b/osu.Desktop/SDL2BatteryInfo.cs
new file mode 100644
index 000000000000..9ca2dc3a5c82
--- /dev/null
+++ b/osu.Desktop/SDL2BatteryInfo.cs
@@ -0,0 +1,25 @@
+// 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.Game.Utils;
+
+namespace osu.Desktop
+{
+    internal class SDL2BatteryInfo : BatteryInfo
+    {
+        public override double? ChargeLevel
+        {
+            get
+            {
+                SDL2.SDL.SDL_GetPowerInfo(out _, out int percentage);
+
+                if (percentage == -1)
+                    return null;
+
+                return percentage / 100.0;
+            }
+        }
+
+        public override bool OnBattery => SDL2.SDL.SDL_GetPowerInfo(out _, out _) == SDL2.SDL.SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
+    }
+}
diff --git a/osu.Desktop/SDL3BatteryInfo.cs b/osu.Desktop/SDL3BatteryInfo.cs
new file mode 100644
index 000000000000..89084b5a15db
--- /dev/null
+++ b/osu.Desktop/SDL3BatteryInfo.cs
@@ -0,0 +1,27 @@
+// 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.Game.Utils;
+using SDL;
+
+namespace osu.Desktop
+{
+    internal unsafe class SDL3BatteryInfo : BatteryInfo
+    {
+        public override double? ChargeLevel
+        {
+            get
+            {
+                int percentage;
+                SDL3.SDL_GetPowerInfo(null, &percentage);
+
+                if (percentage == -1)
+                    return null;
+
+                return percentage / 100.0;
+            }
+        }
+
+        public override bool OnBattery => SDL3.SDL_GetPowerInfo(null, null) == SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
+    }
+}
diff --git a/osu.Desktop/Windows/WindowsAssociationManager.cs b/osu.Desktop/Windows/WindowsAssociationManager.cs
index 11b5c19ca1a8..b32c01433de9 100644
--- a/osu.Desktop/Windows/WindowsAssociationManager.cs
+++ b/osu.Desktop/Windows/WindowsAssociationManager.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
@@ -163,6 +164,7 @@ string getLocalisedString(LocalisableString s)
         [DllImport("Shell32.dll")]
         private static extern void SHChangeNotify(EventId wEventId, Flags uFlags, IntPtr dwItem1, IntPtr dwItem2);
 
+        [SuppressMessage("ReSharper", "InconsistentNaming")]
         private enum EventId
         {
             /// <summary>
@@ -172,6 +174,7 @@ private enum EventId
             SHCNE_ASSOCCHANGED = 0x08000000
         }
 
+        [SuppressMessage("ReSharper", "InconsistentNaming")]
         private enum Flags : uint
         {
             SHCNF_IDLIST = 0x0000
diff --git a/osu.Desktop/lazer.ico b/osu.Desktop/lazer.ico
index a3280f0de0b6..d5dbf933c1c6 100644
Binary files a/osu.Desktop/lazer.ico and b/osu.Desktop/lazer.ico differ
diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponentLookup.cs b/osu.Game.Rulesets.Catch/CatchSkinComponentLookup.cs
index 149aae1cb490..596b102ac575 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponentLookup.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponentLookup.cs
@@ -11,9 +11,5 @@ public CatchSkinComponentLookup(CatchSkinComponents component)
             : base(component)
         {
         }
-
-        protected override string RulesetPrefix => "catch"; // todo: use CatchRuleset.SHORT_NAME;
-
-        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaTouchInputArea.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaTouchInputArea.cs
new file mode 100644
index 000000000000..30c0113bffa7
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaTouchInputArea.cs
@@ -0,0 +1,49 @@
+// 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;
+using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public partial class TestSceneManiaTouchInputArea : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestTouchAreaNotInitiallyVisible()
+        {
+            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
+        }
+
+        [Test]
+        public void TestPressReceptors()
+        {
+            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
+
+            for (int i = 0; i < 4; i++)
+            {
+                int index = i;
+
+                AddStep($"touch receptor {index}", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+
+                AddAssert("action sent",
+                    () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
+                    () => Does.Contain(getReceptor(index).Action.Value));
+
+                AddStep($"release receptor {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+
+                AddAssert("touch area visible", () => getTouchOverlay()?.State.Value == Visibility.Visible);
+            }
+        }
+
+        private ManiaTouchInputArea? getTouchOverlay() => this.ChildrenOfType<ManiaTouchInputArea>().SingleOrDefault();
+
+        private ManiaTouchInputArea.ColumnInputReceptor getReceptor(int index) => this.ChildrenOfType<ManiaTouchInputArea.ColumnInputReceptor>().ElementAt(index);
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
index 28cdf8907ea9..8222e5477da9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
@@ -22,11 +22,6 @@ public class ManiaBeatmap : Beatmap<ManiaHitObject>
         /// </summary>
         public int TotalColumns => Stages.Sum(g => g.Columns);
 
-        /// <summary>
-        /// The total number of columns that were present in this <see cref="ManiaBeatmap"/> before any user adjustments.
-        /// </summary>
-        public readonly int OriginalTotalColumns;
-
         /// <summary>
         /// Creates a new <see cref="ManiaBeatmap"/>.
         /// </summary>
@@ -35,7 +30,6 @@ public class ManiaBeatmap : Beatmap<ManiaHitObject>
         public ManiaBeatmap(StageDefinition defaultStage, int? originalTotalColumns = null)
         {
             Stages.Add(defaultStage);
-            OriginalTotalColumns = originalTotalColumns ?? defaultStage.Columns;
         }
 
         public override IEnumerable<BeatmapStatistic> GetStatistics()
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index def22608d617..39ee3d209bd1 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -1,8 +1,6 @@
 // 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.Game.Rulesets.Mania.Objects;
 using System;
 using System.Linq;
@@ -14,6 +12,7 @@
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Utils;
 using osuTK;
@@ -27,24 +26,42 @@ public class ManiaBeatmapConverter : BeatmapConverter<ManiaHitObject>
         /// </summary>
         private const int max_notes_for_density = 7;
 
+        /// <summary>
+        /// The total number of columns.
+        /// </summary>
+        public int TotalColumns => TargetColumns * (Dual ? 2 : 1);
+
+        /// <summary>
+        /// The number of columns per-stage.
+        /// </summary>
         public int TargetColumns;
+
+        /// <summary>
+        /// Whether to double the number of stages.
+        /// </summary>
         public bool Dual;
-        public readonly bool IsForCurrentRuleset;
 
-        private readonly int originalTargetColumns;
+        /// <summary>
+        /// Whether the beatmap instantiated with is for the mania ruleset.
+        /// </summary>
+        public readonly bool IsForCurrentRuleset;
 
         // Internal for testing purposes
-        internal LegacyRandom Random { get; private set; }
+        internal readonly LegacyRandom Random;
 
         private Pattern lastPattern = new Pattern();
 
-        private ManiaBeatmap beatmap;
-
         public ManiaBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
-            : base(beatmap, ruleset)
+            : this(beatmap, LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap), ruleset)
+        {
+        }
+
+        private ManiaBeatmapConverter(IBeatmap? beatmap, LegacyBeatmapConversionDifficultyInfo difficulty, Ruleset ruleset)
+            : base(beatmap!, ruleset)
         {
-            IsForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.Equals(ruleset.RulesetInfo);
-            TargetColumns = GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap));
+            IsForCurrentRuleset = difficulty.SourceRuleset.Equals(ruleset.RulesetInfo);
+            Random = new LegacyRandom((int)MathF.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)MathF.Round(difficulty.ApproachRate));
+            TargetColumns = getColumnCount(difficulty);
 
             if (IsForCurrentRuleset && TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
             {
@@ -52,52 +69,53 @@ public ManiaBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
                 Dual = true;
             }
 
-            originalTargetColumns = TargetColumns;
-        }
+            static int getColumnCount(LegacyBeatmapConversionDifficultyInfo difficulty)
+            {
+                double roundedCircleSize = Math.Round(difficulty.CircleSize);
 
-        public static int GetColumnCount(LegacyBeatmapConversionDifficultyInfo difficulty)
-        {
-            double roundedCircleSize = Math.Round(difficulty.CircleSize);
+                if (difficulty.SourceRuleset.ShortName == ManiaRuleset.SHORT_NAME)
+                    return (int)Math.Max(1, roundedCircleSize);
 
-            if (difficulty.SourceRuleset.ShortName == ManiaRuleset.SHORT_NAME)
-                return (int)Math.Max(1, roundedCircleSize);
+                double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
 
-            double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
+                if (difficulty.TotalObjectCount > 0 && difficulty.EndTimeObjectCount >= 0)
+                {
+                    int countSliderOrSpinner = difficulty.EndTimeObjectCount;
+
+                    // In osu!stable, this division appears as if it happens on floats, but due to release-mode
+                    // optimisations, it actually ends up happening on doubles.
+                    double percentSpecialObjects = (double)countSliderOrSpinner / difficulty.TotalObjectCount;
+
+                    if (percentSpecialObjects < 0.2)
+                        return 7;
+                    if (percentSpecialObjects < 0.3 || roundedCircleSize >= 5)
+                        return roundedOverallDifficulty > 5 ? 7 : 6;
+                    if (percentSpecialObjects > 0.6)
+                        return roundedOverallDifficulty > 4 ? 5 : 4;
+                }
 
-            if (difficulty.TotalObjectCount > 0 && difficulty.EndTimeObjectCount >= 0)
-            {
-                int countSliderOrSpinner = difficulty.EndTimeObjectCount;
-
-                // In osu!stable, this division appears as if it happens on floats, but due to release-mode
-                // optimisations, it actually ends up happening on doubles.
-                double percentSpecialObjects = (double)countSliderOrSpinner / difficulty.TotalObjectCount;
-
-                if (percentSpecialObjects < 0.2)
-                    return 7;
-                if (percentSpecialObjects < 0.3 || roundedCircleSize >= 5)
-                    return roundedOverallDifficulty > 5 ? 7 : 6;
-                if (percentSpecialObjects > 0.6)
-                    return roundedOverallDifficulty > 4 ? 5 : 4;
+                return Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
             }
-
-            return Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
         }
 
-        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
-
-        protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
+        public static int GetColumnCount(LegacyBeatmapConversionDifficultyInfo difficulty, IReadOnlyList<Mod>? mods = null)
         {
-            IBeatmapDifficultyInfo difficulty = original.Difficulty;
+            var converter = new ManiaBeatmapConverter(null, difficulty, new ManiaRuleset());
 
-            int seed = (int)MathF.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)MathF.Round(difficulty.ApproachRate);
-            Random = new LegacyRandom(seed);
+            if (mods != null)
+            {
+                foreach (var m in mods.OfType<IApplicableToBeatmapConverter>())
+                    m.ApplyToBeatmapConverter(converter);
+            }
 
-            return base.ConvertBeatmap(original, cancellationToken);
+            return converter.TotalColumns;
         }
 
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
+
         protected override Beatmap<ManiaHitObject> CreateBeatmap()
         {
-            beatmap = new ManiaBeatmap(new StageDefinition(TargetColumns), originalTargetColumns);
+            ManiaBeatmap beatmap = new ManiaBeatmap(new StageDefinition(TargetColumns));
 
             if (Dual)
                 beatmap.Stages.Add(new StageDefinition(TargetColumns));
@@ -115,10 +133,6 @@ protected override IEnumerable<ManiaHitObject> ConvertHitObject(HitObject origin
             }
 
             var objects = IsForCurrentRuleset ? generateSpecific(original, beatmap) : generateConverted(original, beatmap);
-
-            if (objects == null)
-                yield break;
-
             foreach (ManiaHitObject obj in objects)
                 yield return obj;
         }
@@ -152,7 +166,7 @@ private void recordNote(double time, Vector2 position)
         /// <returns>The hit objects generated.</returns>
         private IEnumerable<ManiaHitObject> generateSpecific(HitObject original, IBeatmap originalBeatmap)
         {
-            var generator = new SpecificBeatmapPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
+            var generator = new SpecificBeatmapPatternGenerator(Random, original, originalBeatmap, TotalColumns, lastPattern);
 
             foreach (var newPattern in generator.Generate())
             {
@@ -171,13 +185,13 @@ private IEnumerable<ManiaHitObject> generateSpecific(HitObject original, IBeatma
         /// <returns>The hit objects generated.</returns>
         private IEnumerable<ManiaHitObject> generateConverted(HitObject original, IBeatmap originalBeatmap)
         {
-            Patterns.PatternGenerator conversion = null;
+            Patterns.PatternGenerator? conversion = null;
 
             switch (original)
             {
                 case IHasPath:
                 {
-                    var generator = new PathObjectPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
+                    var generator = new PathObjectPatternGenerator(Random, original, originalBeatmap, TotalColumns, lastPattern);
                     conversion = generator;
 
                     var positionData = original as IHasPosition;
@@ -195,7 +209,7 @@ private IEnumerable<ManiaHitObject> generateConverted(HitObject original, IBeatm
 
                 case IHasDuration endTimeData:
                 {
-                    conversion = new EndTimeObjectPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
+                    conversion = new EndTimeObjectPatternGenerator(Random, original, originalBeatmap, TotalColumns, lastPattern);
 
                     recordNote(endTimeData.EndTime, new Vector2(256, 192));
                     computeDensity(endTimeData.EndTime);
@@ -206,7 +220,7 @@ private IEnumerable<ManiaHitObject> generateConverted(HitObject original, IBeatm
                 {
                     computeDensity(original.StartTime);
 
-                    conversion = new HitObjectPatternGenerator(Random, original, beatmap, lastPattern, lastTime, lastPosition, density, lastStair, originalBeatmap);
+                    conversion = new HitObjectPatternGenerator(Random, original, originalBeatmap, TotalColumns, lastPattern, lastTime, lastPosition, density, lastStair);
 
                     recordNote(original.StartTime, positionData.Position);
                     break;
@@ -231,8 +245,8 @@ private IEnumerable<ManiaHitObject> generateConverted(HitObject original, IBeatm
         /// </summary>
         private class SpecificBeatmapPatternGenerator : Patterns.Legacy.PatternGenerator
         {
-            public SpecificBeatmapPatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
-                : base(random, hitObject, beatmap, previousPattern, originalBeatmap)
+            public SpecificBeatmapPatternGenerator(LegacyRandom random, HitObject hitObject, IBeatmap beatmap, int totalColumns, Pattern previousPattern)
+                : base(random, hitObject, beatmap, previousPattern, totalColumns)
             {
             }
 
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index 2265d3d347d4..52bb87ae193b 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -17,8 +17,8 @@ internal class EndTimeObjectPatternGenerator : PatternGenerator
         private readonly int endTime;
         private readonly PatternType convertType;
 
-        public EndTimeObjectPatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
-            : base(random, hitObject, beatmap, previousPattern, originalBeatmap)
+        public EndTimeObjectPatternGenerator(LegacyRandom random, HitObject hitObject, IBeatmap beatmap, int totalColumns, Pattern previousPattern)
+            : base(random, hitObject, beatmap, previousPattern, totalColumns)
         {
             endTime = (int)((HitObject as IHasDuration)?.EndTime ?? 0);
 
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 27cb6813009f..ad45a3fb21ab 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -23,9 +23,9 @@ internal class HitObjectPatternGenerator : PatternGenerator
 
         private readonly PatternType convertType;
 
-        public HitObjectPatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, double previousTime, Vector2 previousPosition, double density,
-                                         PatternType lastStair, IBeatmap originalBeatmap)
-            : base(random, hitObject, beatmap, previousPattern, originalBeatmap)
+        public HitObjectPatternGenerator(LegacyRandom random, HitObject hitObject, IBeatmap beatmap, int totalColumns, Pattern previousPattern, double previousTime, Vector2 previousPosition,
+                                         double density, PatternType lastStair)
+            : base(random, hitObject, beatmap, previousPattern, totalColumns)
         {
             StairType = lastStair;
 
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs
index 4922915c7db0..6d593a75e73e 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs
@@ -31,8 +31,8 @@ internal class PathObjectPatternGenerator : PatternGenerator
 
         private PatternType convertType;
 
-        public PathObjectPatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
-            : base(random, hitObject, beatmap, previousPattern, originalBeatmap)
+        public PathObjectPatternGenerator(LegacyRandom random, HitObject hitObject, IBeatmap beatmap, int totalColumns, Pattern previousPattern)
+            : base(random, hitObject, beatmap, previousPattern, totalColumns)
         {
             convertType = PatternType.None;
             if (!Beatmap.ControlPointInfo.EffectPointAt(hitObject.StartTime).KiaiMode)
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
index 77f93b4ef96c..48b877850198 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
@@ -27,20 +27,12 @@ internal abstract class PatternGenerator : Patterns.PatternGenerator
         /// </summary>
         protected readonly LegacyRandom Random;
 
-        /// <summary>
-        /// The beatmap which <see cref="HitObject"/> is being converted from.
-        /// </summary>
-        protected readonly IBeatmap OriginalBeatmap;
-
-        protected PatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
-            : base(hitObject, beatmap, previousPattern)
+        protected PatternGenerator(LegacyRandom random, HitObject hitObject, IBeatmap beatmap, Pattern previousPattern, int totalColumns)
+            : base(hitObject, beatmap, totalColumns, previousPattern)
         {
             ArgumentNullException.ThrowIfNull(random);
-            ArgumentNullException.ThrowIfNull(originalBeatmap);
 
             Random = random;
-            OriginalBeatmap = originalBeatmap;
-
             RandomStart = TotalColumns == 8 ? 1 : 0;
         }
 
@@ -104,17 +96,17 @@ protected double ConversionDifficulty
                 if (conversionDifficulty != null)
                     return conversionDifficulty.Value;
 
-                HitObject lastObject = OriginalBeatmap.HitObjects.LastOrDefault();
-                HitObject firstObject = OriginalBeatmap.HitObjects.FirstOrDefault();
+                HitObject lastObject = Beatmap.HitObjects.LastOrDefault();
+                HitObject firstObject = Beatmap.HitObjects.FirstOrDefault();
 
                 // Drain time in seconds
-                int drainTime = (int)(((lastObject?.StartTime ?? 0) - (firstObject?.StartTime ?? 0) - OriginalBeatmap.TotalBreakTime) / 1000);
+                int drainTime = (int)(((lastObject?.StartTime ?? 0) - (firstObject?.StartTime ?? 0) - Beatmap.TotalBreakTime) / 1000);
 
                 if (drainTime == 0)
                     drainTime = 10000;
 
-                IBeatmapDifficultyInfo difficulty = OriginalBeatmap.Difficulty;
-                conversionDifficulty = ((difficulty.DrainRate + Math.Clamp(difficulty.ApproachRate, 4, 7)) / 1.5 + (double)OriginalBeatmap.HitObjects.Count / drainTime * 9f) / 38f * 5f / 1.15;
+                IBeatmapDifficultyInfo difficulty = Beatmap.Difficulty;
+                conversionDifficulty = ((difficulty.DrainRate + Math.Clamp(difficulty.ApproachRate, 4, 7)) / 1.5 + (double)Beatmap.HitObjects.Count / drainTime * 9f) / 38f * 5f / 1.15;
                 conversionDifficulty = Math.Min(conversionDifficulty.Value, 12);
 
                 return conversionDifficulty.Value;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs
index 3d3c35773b51..8d98515fa4ec 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/PatternGenerator.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns
@@ -25,11 +26,11 @@ internal abstract class PatternGenerator
         /// <summary>
         /// The beatmap which <see cref="HitObject"/> is a part of.
         /// </summary>
-        protected readonly ManiaBeatmap Beatmap;
+        protected readonly IBeatmap Beatmap;
 
         protected readonly int TotalColumns;
 
-        protected PatternGenerator(HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern)
+        protected PatternGenerator(HitObject hitObject, IBeatmap beatmap, int totalColumns, Pattern previousPattern)
         {
             ArgumentNullException.ThrowIfNull(hitObject);
             ArgumentNullException.ThrowIfNull(beatmap);
@@ -38,8 +39,7 @@ protected PatternGenerator(HitObject hitObject, ManiaBeatmap beatmap, Pattern pr
             HitObject = hitObject;
             Beatmap = beatmap;
             PreviousPattern = previousPattern;
-
-            TotalColumns = Beatmap.TotalColumns;
+            TotalColumns = totalColumns;
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index d9fd96ac6aeb..8a1b12726547 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -51,13 +51,8 @@ public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapCon
                 return multiplier;
 
             // Apply key mod multipliers.
-
             int originalColumns = ManiaBeatmapConverter.GetColumnCount(difficulty);
-            int actualColumns = originalColumns;
-
-            actualColumns = mods.OfType<ManiaKeyMod>().SingleOrDefault()?.KeyCount ?? actualColumns;
-            if (mods.Any(m => m is ManiaModDualStages))
-                actualColumns *= 2;
+            int actualColumns = ManiaBeatmapConverter.GetColumnCount(difficulty, mods);
 
             if (actualColumns > originalColumns)
                 multiplier *= 0.9;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 967cdb0e5499..c229039dc340 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -28,7 +28,7 @@ public ManiaHitObjectComposer(Ruleset ruleset)
         {
         }
 
-        public new ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
+        public new ManiaPlayfield Playfield => drawableRuleset.Playfield;
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;
 
diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
index 930ca217cdba..8c6efbc72d86 100644
--- a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
@@ -1,9 +1,14 @@
 // 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.Generic;
+using System.Linq;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
@@ -14,9 +19,9 @@ public class ManiaFilterCriteria : IRulesetFilterCriteria
     {
         private FilterCriteria.OptionalRange<float> keys;
 
-        public bool Matches(BeatmapInfo beatmapInfo)
+        public bool Matches(BeatmapInfo beatmapInfo, FilterCriteria criteria)
         {
-            return !keys.HasFilter || keys.IsInRange(ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo)));
+            return !keys.HasFilter || keys.IsInRange(ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo), criteria.Mods));
         }
 
         public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
@@ -30,5 +35,20 @@ public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
 
             return false;
         }
+
+        public bool FilterMayChangeFromMods(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        {
+            if (keys.HasFilter)
+            {
+                // Interpreting as the Mod type is required for equality comparison.
+                HashSet<Mod> oldSet = mods.OldValue.OfType<ManiaKeyMod>().AsEnumerable<Mod>().ToHashSet();
+                HashSet<Mod> newSet = mods.NewValue.OfType<ManiaKeyMod>().AsEnumerable<Mod>().ToHashSet();
+
+                if (!oldSet.SetEquals(newSet))
+                    return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 3d4803f1e4d5..b5614e2b56ae 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -423,8 +423,8 @@ public override IRulesetFilterCriteria CreateRulesetFilterCriteria()
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
 
-        public int GetKeyCount(IBeatmapInfo beatmapInfo)
-            => ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo));
+        public int GetKeyCount(IBeatmapInfo beatmapInfo, IReadOnlyList<Mod>? mods = null)
+            => ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo), mods);
     }
 
     public enum PlayfieldType
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
index 44120e16e64b..046d1c5b3490 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
@@ -15,10 +15,6 @@ public ManiaSkinComponentLookup(ManiaSkinComponents component)
             : base(component)
         {
         }
-
-        protected override string RulesetPrefix => ManiaRuleset.SHORT_NAME;
-
-        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 
     public enum ManiaSkinComponents
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 6cd55bb099e9..c05a8f2a2923 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -93,8 +93,7 @@ private void load(GameHost host)
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements externally
                 // (see `Stage.columnBackgrounds`).
                 BackgroundContainer,
-                TopLevelContainer,
-                new ColumnTouchInputArea(this)
+                TopLevelContainer
             };
 
             var background = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
@@ -181,38 +180,5 @@ public void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
             => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
-
-        public partial class ColumnTouchInputArea : Drawable
-        {
-            private readonly Column column;
-
-            [Resolved(canBeNull: true)]
-            private ManiaInputManager maniaInputManager { get; set; }
-
-            private KeyBindingContainer<ManiaAction> keyBindingContainer;
-
-            public ColumnTouchInputArea(Column column)
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                this.column = column;
-            }
-
-            protected override void LoadComplete()
-            {
-                keyBindingContainer = maniaInputManager?.KeyBindingContainer;
-            }
-
-            protected override bool OnTouchDown(TouchDownEvent e)
-            {
-                keyBindingContainer?.TriggerPressed(column.Action.Value);
-                return true;
-            }
-
-            protected override void OnTouchUp(TouchUpEvent e)
-            {
-                keyBindingContainer?.TriggerReleased(column.Action.Value);
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 1593e8e76fd4..f44444879743 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -3,15 +3,12 @@
 
 #nullable disable
 
-using System;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -62,12 +59,6 @@ private void load(ISkinSource skin)
             onSkinChanged();
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateMobileSizing();
-        }
-
         private void onSkinChanged()
         {
             for (int i = 0; i < stageDefinition.Columns; i++)
@@ -92,8 +83,6 @@ private void onSkinChanged()
 
                 columns[i].Width = width.Value;
             }
-
-            updateMobileSizing();
         }
 
         /// <summary>
@@ -106,31 +95,6 @@ public void SetContentForColumn(int column, TContent content)
             Content[column] = columns[column].Child = content;
         }
 
-        private void updateMobileSizing()
-        {
-            if (!IsLoaded || !RuntimeInfo.IsMobile)
-                return;
-
-            // GridContainer+CellContainer containing this stage (gets split up for dual stages).
-            Vector2? containingCell = this.FindClosestParent<Stage>()?.Parent?.DrawSize;
-
-            // Will be null in tests.
-            if (containingCell == null)
-                return;
-
-            float aspectRatio = containingCell.Value.X / containingCell.Value.Y;
-
-            // 2.83 is a mostly arbitrary scale-up (170 / 60, based on original implementation for argon)
-            float mobileAdjust = 2.83f * Math.Min(1, 7f / stageDefinition.Columns);
-            // 1.92 is a "reference" mobile screen aspect ratio for phones.
-            // We should scale it back for cases like tablets which aren't so extreme.
-            mobileAdjust *= aspectRatio / 1.92f;
-
-            // Best effort until we have better mobile support.
-            for (int i = 0; i < stageDefinition.Columns; i++)
-                columns[i].Width *= mobileAdjust;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 275b1311dee3..ce53862c7630 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -31,6 +31,7 @@
 
 namespace osu.Game.Rulesets.Mania.UI
 {
+    [Cached]
     public partial class DrawableManiaRuleset : DrawableScrollingRuleset<ManiaHitObject>
     {
         /// <summary>
@@ -43,7 +44,7 @@ public partial class DrawableManiaRuleset : DrawableScrollingRuleset<ManiaHitObj
         /// </summary>
         public const double MAX_TIME_RANGE = 11485;
 
-        protected new ManiaPlayfield Playfield => (ManiaPlayfield)base.Playfield;
+        public new ManiaPlayfield Playfield => (ManiaPlayfield)base.Playfield;
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
@@ -103,6 +104,8 @@ private void load(ISkinSource source)
             configScrollSpeed.BindValueChanged(speed => this.TransformTo(nameof(smoothTimeRange), ComputeScrollTime(speed.NewValue), 200, Easing.OutQuint));
 
             TimeRange.Value = smoothTimeRange = ComputeScrollTime(configScrollSpeed.Value);
+
+            KeyBindingInputManager.Add(new ManiaTouchInputArea());
         }
 
         protected override void AdjustScrollSpeed(int amount) => configScrollSpeed.Value += amount;
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaTouchInputArea.cs b/osu.Game.Rulesets.Mania/UI/ManiaTouchInputArea.cs
new file mode 100644
index 000000000000..32e4616a25db
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/ManiaTouchInputArea.cs
@@ -0,0 +1,216 @@
+// 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.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Configuration;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    /// <summary>
+    /// An overlay that captures and displays osu!mania mouse and touch input.
+    /// </summary>
+    public partial class ManiaTouchInputArea : VisibilityContainer
+    {
+        // visibility state affects our child. we always want to handle input.
+        public override bool PropagatePositionalInputSubTree => true;
+        public override bool PropagateNonPositionalInputSubTree => true;
+
+        [SettingSource("Spacing", "The spacing between receptors.")]
+        public BindableFloat Spacing { get; } = new BindableFloat(10)
+        {
+            Precision = 1,
+            MinValue = 0,
+            MaxValue = 100,
+        };
+
+        [SettingSource("Opacity", "The receptor opacity.")]
+        public BindableFloat Opacity { get; } = new BindableFloat(1)
+        {
+            Precision = 0.1f,
+            MinValue = 0,
+            MaxValue = 1
+        };
+
+        [Resolved]
+        private DrawableManiaRuleset drawableRuleset { get; set; } = null!;
+
+        private GridContainer gridContainer = null!;
+
+        public ManiaTouchInputArea()
+        {
+            Anchor = Anchor.BottomCentre;
+            Origin = Anchor.BottomCentre;
+
+            RelativeSizeAxes = Axes.Both;
+            Height = 0.5f;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            List<Drawable> receptorGridContent = new List<Drawable>();
+            List<Dimension> receptorGridDimensions = new List<Dimension>();
+
+            bool first = true;
+
+            foreach (var stage in drawableRuleset.Playfield.Stages)
+            {
+                foreach (var column in stage.Columns)
+                {
+                    if (!first)
+                    {
+                        receptorGridContent.Add(new Gutter { Spacing = { BindTarget = Spacing } });
+                        receptorGridDimensions.Add(new Dimension(GridSizeMode.AutoSize));
+                    }
+
+                    receptorGridContent.Add(new ColumnInputReceptor { Action = { BindTarget = column.Action } });
+                    receptorGridDimensions.Add(new Dimension());
+
+                    first = false;
+                }
+            }
+
+            InternalChild = gridContainer = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                AlwaysPresent = true,
+                Content = new[] { receptorGridContent.ToArray() },
+                ColumnDimensions = receptorGridDimensions.ToArray()
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Opacity.BindValueChanged(o => Alpha = o.NewValue, true);
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            // Hide whenever the keyboard is used.
+            Hide();
+            return false;
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            Show();
+            return true;
+        }
+
+        protected override bool OnTouchDown(TouchDownEvent e)
+        {
+            Show();
+            return true;
+        }
+
+        protected override void PopIn()
+        {
+            gridContainer.FadeIn(500, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            gridContainer.FadeOut(300);
+        }
+
+        public partial class ColumnInputReceptor : CompositeDrawable
+        {
+            public readonly IBindable<ManiaAction> Action = new Bindable<ManiaAction>();
+
+            private readonly Box highlightOverlay;
+
+            [Resolved]
+            private ManiaInputManager? inputManager { get; set; }
+
+            private bool isPressed;
+
+            public ColumnInputReceptor()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        CornerRadius = 10,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0.15f,
+                            },
+                            highlightOverlay = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                Blending = BlendingParameters.Additive,
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override bool OnTouchDown(TouchDownEvent e)
+            {
+                updateButton(true);
+                return false; // handled by parent container to show overlay.
+            }
+
+            protected override void OnTouchUp(TouchUpEvent e)
+            {
+                updateButton(false);
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                updateButton(true);
+                return false; // handled by parent container to show overlay.
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                updateButton(false);
+            }
+
+            private void updateButton(bool press)
+            {
+                if (press == isPressed)
+                    return;
+
+                isPressed = press;
+
+                if (press)
+                {
+                    inputManager?.KeyBindingContainer?.TriggerPressed(Action.Value);
+                    highlightOverlay.FadeTo(0.1f, 80, Easing.OutQuint);
+                }
+                else
+                {
+                    inputManager?.KeyBindingContainer?.TriggerReleased(Action.Value);
+                    highlightOverlay.FadeTo(0, 400, Easing.OutQuint);
+                }
+            }
+        }
+
+        private partial class Gutter : Drawable
+        {
+            public readonly IBindable<float> Spacing = new Bindable<float>();
+
+            public Gutter()
+            {
+                Spacing.BindValueChanged(s => Size = new Vector2(s.NewValue));
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
index 3d35ab79f740..dfe950c01e0f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
@@ -68,7 +68,7 @@ public void TestMergeCircleSlider()
 
             AddAssert("slider created", () =>
             {
-                if (circle1 is null || circle2 is null || slider is null)
+                if (circle1 == null || circle2 == null || slider == null)
                     return false;
 
                 var controlPoints = slider.Path.ControlPoints;
@@ -111,7 +111,7 @@ public void TestMergeSliderSlider()
 
             AddAssert("slider created", () =>
             {
-                if (slider1 is null || slider2 is null || slider1Path is null)
+                if (slider1 == null || slider2 == null || slider1Path == null)
                     return false;
 
                 var controlPoints1 = slider1Path.ControlPoints;
@@ -143,7 +143,7 @@ public void TestMergeSliderSlider()
 
             AddAssert("slider end is at same completion for last slider", () =>
             {
-                if (slider1Path is null || slider2 is null)
+                if (slider1Path == null || slider2 == null)
                     return false;
 
                 var mergedSlider = (Slider)EditorBeatmap.SelectedHitObjects.First();
@@ -231,6 +231,137 @@ public void TestSameStartTimeMerge()
                 (pos: circle2.Position, pathType: null)));
         }
 
+        [Test]
+        public void TestMergeSliderSliderSameStartTime()
+        {
+            Slider? slider1 = null;
+            SliderPath? slider1Path = null;
+            Slider? slider2 = null;
+
+            AddStep("select two sliders", () =>
+            {
+                slider1 = (Slider)EditorBeatmap.HitObjects.First(h => h is Slider);
+                slider1Path = new SliderPath(slider1.Path.ControlPoints.Select(p => new PathControlPoint(p.Position, p.Type)).ToArray(), slider1.Path.ExpectedDistance.Value);
+                slider2 = (Slider)EditorBeatmap.HitObjects.First(h => h is Slider && h.StartTime > slider1.StartTime);
+                EditorClock.Seek(slider1.StartTime);
+                EditorBeatmap.SelectedHitObjects.AddRange([slider1, slider2]);
+            });
+
+            AddStep("move sliders to the same start time", () =>
+            {
+                slider2!.StartTime = slider1!.StartTime;
+            });
+
+            mergeSelection();
+
+            AddAssert("slider created", () =>
+            {
+                if (slider1 == null || slider2 == null || slider1Path == null)
+                    return false;
+
+                var controlPoints1 = slider1Path.ControlPoints;
+                var controlPoints2 = slider2.Path.ControlPoints;
+                (Vector2, PathType?)[] args = new (Vector2, PathType?)[controlPoints1.Count + controlPoints2.Count - 1];
+
+                for (int i = 0; i < controlPoints1.Count - 1; i++)
+                {
+                    args[i] = (controlPoints1[i].Position + slider1.Position, controlPoints1[i].Type);
+                }
+
+                for (int i = 0; i < controlPoints2.Count; i++)
+                {
+                    args[i + controlPoints1.Count - 1] = (controlPoints2[i].Position + controlPoints1[^1].Position + slider1.Position, controlPoints2[i].Type);
+                }
+
+                return sliderCreatedFor(args);
+            });
+
+            AddAssert("samples exist", sliderSampleExist);
+
+            AddAssert("merged slider matches first slider", () =>
+            {
+                var mergedSlider = (Slider)EditorBeatmap.SelectedHitObjects.First();
+                return slider1 is not null && mergedSlider.HeadCircle.Samples.SequenceEqual(slider1.HeadCircle.Samples)
+                                           && mergedSlider.TailCircle.Samples.SequenceEqual(slider1.TailCircle.Samples)
+                                           && mergedSlider.Samples.SequenceEqual(slider1.Samples);
+            });
+
+            AddAssert("slider end is at same completion for last slider", () =>
+            {
+                if (slider1Path == null || slider2 == null)
+                    return false;
+
+                var mergedSlider = (Slider)EditorBeatmap.SelectedHitObjects.First();
+                return Precision.AlmostEquals(mergedSlider.Path.Distance, slider1Path.CalculatedDistance + slider2.Path.Distance);
+            });
+        }
+
+        [Test]
+        public void TestMergeSliderSliderSameStartAndEndTime()
+        {
+            Slider? slider1 = null;
+            SliderPath? slider1Path = null;
+            Slider? slider2 = null;
+
+            AddStep("select two sliders", () =>
+            {
+                slider1 = (Slider)EditorBeatmap.HitObjects.First(h => h is Slider);
+                slider1Path = new SliderPath(slider1.Path.ControlPoints.Select(p => new PathControlPoint(p.Position, p.Type)).ToArray(), slider1.Path.ExpectedDistance.Value);
+                slider2 = (Slider)EditorBeatmap.HitObjects.First(h => h is Slider && h.StartTime > slider1.StartTime);
+                EditorClock.Seek(slider1.StartTime);
+                EditorBeatmap.SelectedHitObjects.AddRange([slider1, slider2]);
+            });
+
+            AddStep("move sliders to the same start & end time", () =>
+            {
+                slider2!.StartTime = slider1!.StartTime;
+                slider2.Path = slider1.Path;
+            });
+
+            mergeSelection();
+
+            AddAssert("slider created", () =>
+            {
+                if (slider1 == null || slider2 == null || slider1Path == null)
+                    return false;
+
+                var controlPoints1 = slider1Path.ControlPoints;
+                var controlPoints2 = slider2.Path.ControlPoints;
+                (Vector2, PathType?)[] args = new (Vector2, PathType?)[controlPoints1.Count + controlPoints2.Count - 1];
+
+                for (int i = 0; i < controlPoints1.Count - 1; i++)
+                {
+                    args[i] = (controlPoints1[i].Position + slider1.Position, controlPoints1[i].Type);
+                }
+
+                for (int i = 0; i < controlPoints2.Count; i++)
+                {
+                    args[i + controlPoints1.Count - 1] = (controlPoints2[i].Position + controlPoints1[^1].Position + slider1.Position, controlPoints2[i].Type);
+                }
+
+                return sliderCreatedFor(args);
+            });
+
+            AddAssert("samples exist", sliderSampleExist);
+
+            AddAssert("merged slider matches first slider", () =>
+            {
+                var mergedSlider = (Slider)EditorBeatmap.SelectedHitObjects.First();
+                return slider1 is not null && mergedSlider.HeadCircle.Samples.SequenceEqual(slider1.HeadCircle.Samples)
+                                           && mergedSlider.TailCircle.Samples.SequenceEqual(slider1.TailCircle.Samples)
+                                           && mergedSlider.Samples.SequenceEqual(slider1.Samples);
+            });
+
+            AddAssert("slider end is at same completion for last slider", () =>
+            {
+                if (slider1Path == null || slider2 == null)
+                    return false;
+
+                var mergedSlider = (Slider)EditorBeatmap.SelectedHitObjects.First();
+                return Precision.AlmostEquals(mergedSlider.Path.Distance, slider1Path.CalculatedDistance + slider2.Path.Distance);
+            });
+        }
+
         private void mergeSelection()
         {
             AddStep("merge selection", () =>
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
index d14e59358775..5798869210c8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Tests.Visual;
@@ -52,6 +53,65 @@ public void TestDistanceSnapMomentaryToggle()
             AddUntilStep("distance snap grid visible", () => this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
             AddStep("release alt", () => InputManager.ReleaseKey(Key.AltLeft));
             AddUntilStep("distance snap grid hidden", () => !this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+
+            AddStep("enable distance snap grid", () => InputManager.Key(Key.T));
+            AddUntilStep("distance snap grid visible", () => this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+            AddStep("hold alt", () => InputManager.PressKey(Key.AltLeft));
+            AddUntilStep("distance snap grid hidden", () => !this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+            AddStep("release alt", () => InputManager.ReleaseKey(Key.AltLeft));
+            AddUntilStep("distance snap grid visible", () => this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+        }
+
+        [Test]
+        public void TestDistanceSnapAdjustDoesNotHideTheGridIfStartingEnabled()
+        {
+            double distanceSnap = double.PositiveInfinity;
+
+            AddStep("enable distance snap grid", () => InputManager.Key(Key.T));
+
+            AddStep("select second object", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.ElementAt(1)));
+            AddUntilStep("distance snap grid visible", () => this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+            AddStep("store distance snap", () => distanceSnap = this.ChildrenOfType<IDistanceSnapProvider>().First().DistanceSpacingMultiplier.Value);
+
+            AddStep("increase distance", () =>
+            {
+                InputManager.PressKey(Key.AltLeft);
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.ScrollVerticalBy(1);
+                InputManager.ReleaseKey(Key.ControlLeft);
+                InputManager.ReleaseKey(Key.AltLeft);
+            });
+
+            AddUntilStep("distance snap increased", () => this.ChildrenOfType<IDistanceSnapProvider>().First().DistanceSpacingMultiplier.Value, () => Is.GreaterThan(distanceSnap));
+            AddUntilStep("distance snap grid still visible", () => this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+        }
+
+        [Test]
+        public void TestDistanceSnapAdjustShowsGridMomentarilyIfStartingDisabled()
+        {
+            double distanceSnap = double.PositiveInfinity;
+
+            AddStep("select second object", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.ElementAt(1)));
+            AddUntilStep("distance snap grid hidden", () => !this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+            AddStep("store distance snap", () => distanceSnap = this.ChildrenOfType<IDistanceSnapProvider>().First().DistanceSpacingMultiplier.Value);
+
+            AddStep("start increasing distance", () =>
+            {
+                InputManager.PressKey(Key.AltLeft);
+                InputManager.PressKey(Key.ControlLeft);
+            });
+
+            AddUntilStep("distance snap grid visible", () => this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
+
+            AddStep("finish increasing distance", () =>
+            {
+                InputManager.ScrollVerticalBy(1);
+                InputManager.ReleaseKey(Key.ControlLeft);
+                InputManager.ReleaseKey(Key.AltLeft);
+            });
+
+            AddUntilStep("distance snap increased", () => this.ChildrenOfType<IDistanceSnapProvider>().First().DistanceSpacingMultiplier.Value, () => Is.GreaterThan(distanceSnap));
+            AddUntilStep("distance snap hidden in the end", () => !this.ChildrenOfType<OsuDistanceSnapGrid>().Any());
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 2b53554ed142..9af028fd8cf5 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -30,23 +30,6 @@ public void Setup() => Schedule(() =>
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
         });
 
-        [Test]
-        public void TestAddOverlappingControlPoints()
-        {
-            createVisualiser(true);
-
-            addControlPointStep(new Vector2(200));
-            addControlPointStep(new Vector2(300));
-            addControlPointStep(new Vector2(300));
-            addControlPointStep(new Vector2(500, 300));
-
-            AddAssert("last connection displayed", () =>
-            {
-                var lastConnection = visualiser.Connections.Last(c => c.ControlPoint.Position == new Vector2(300));
-                return lastConnection.DrawWidth > 50;
-            });
-        }
-
         [Test]
         public void TestPerfectCurveTooManyPoints()
         {
@@ -172,6 +155,36 @@ public void TestCatmullAvailableIffSelectionContainsCatmull()
             assertControlPointPathType(4, null);
         }
 
+        [Test]
+        public void TestStackingUpdatesPointsPosition()
+        {
+            createVisualiser(true);
+
+            Vector2[] points =
+            [
+                new Vector2(200),
+                new Vector2(300),
+                new Vector2(500, 300),
+                new Vector2(700, 200),
+                new Vector2(500, 100)
+            ];
+
+            foreach (var point in points) addControlPointStep(point);
+
+            AddStep("apply stacking", () => slider.StackHeightBindable.Value += 1);
+
+            for (int i = 0; i < points.Length; i++)
+                addAssertPointPositionChanged(points, i);
+        }
+
+        private void addAssertPointPositionChanged(Vector2[] points, int index)
+        {
+            AddAssert($"Point at {points.ElementAt(index)} changed",
+                () => visualiser.Pieces[index].Position,
+                () => !Is.EqualTo(points.ElementAt(index))
+            );
+        }
+
         private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser<Slider>(slider, allowSelection)
         {
             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs
index d7dd30d608f0..30e0dbbf2e6f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs
@@ -24,14 +24,38 @@ public partial class TestScenePreciseRotation : TestSceneOsuEditor
         [Test]
         public void TestHotkeyHandling()
         {
-            AddStep("select single circle", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.OfType<HitCircle>().First()));
+            AddStep("deselect everything", () => EditorBeatmap.SelectedHitObjects.Clear());
             AddStep("press rotate hotkey", () =>
             {
                 InputManager.PressKey(Key.ControlLeft);
                 InputManager.Key(Key.R);
                 InputManager.ReleaseKey(Key.ControlLeft);
             });
-            AddUntilStep("no popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.Zero);
+            AddUntilStep("no popover present", getPopover, () => Is.Null);
+
+            AddStep("select single circle",
+                () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.OfType<HitCircle>().First()));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("popover present", getPopover, () => Is.Not.Null);
+            AddAssert("only playfield centre origin rotation available", () =>
+            {
+                var popover = getPopover();
+                var buttons = popover.ChildrenOfType<EditorRadioButton>();
+                return buttons.Any(btn => btn.Text == "Selection centre" && !btn.Enabled.Value)
+                       && buttons.Any(btn => btn.Text == "Playfield centre" && btn.Enabled.Value);
+            });
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("no popover present", getPopover, () => Is.Null);
 
             AddStep("select first three objects", () =>
             {
@@ -44,14 +68,23 @@ public void TestHotkeyHandling()
                 InputManager.Key(Key.R);
                 InputManager.ReleaseKey(Key.ControlLeft);
             });
-            AddUntilStep("popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.EqualTo(1));
+            AddUntilStep("popover present", getPopover, () => Is.Not.Null);
+            AddAssert("both origin rotation available", () =>
+            {
+                var popover = getPopover();
+                var buttons = popover.ChildrenOfType<EditorRadioButton>();
+                return buttons.Any(btn => btn.Text == "Selection centre" && btn.Enabled.Value)
+                       && buttons.Any(btn => btn.Text == "Playfield centre" && btn.Enabled.Value);
+            });
             AddStep("press rotate hotkey", () =>
             {
                 InputManager.PressKey(Key.ControlLeft);
                 InputManager.Key(Key.R);
                 InputManager.ReleaseKey(Key.ControlLeft);
             });
-            AddUntilStep("no popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.Zero);
+            AddUntilStep("no popover present", getPopover, () => Is.Null);
+
+            PreciseRotationPopover? getPopover() => this.ChildrenOfType<PreciseRotationPopover>().SingleOrDefault();
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 6c7733e68aa8..d68cbe6265d1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -178,7 +178,7 @@ public void TestSplitRetainsHitsounds()
 
             AddStep("add hitsounds", () =>
             {
-                if (slider is null) return;
+                if (slider == null) return;
 
                 sample = new HitSampleInfo("hitwhistle", HitSampleInfo.BANK_SOFT, volume: 70);
                 slider.Samples.Add(sample.With());
@@ -228,7 +228,7 @@ private void moveMouseToControlPoint(int index)
         {
             AddStep($"move mouse to control point {index}", () =>
             {
-                if (slider is null || visualiser is null) return;
+                if (slider == null || visualiser == null) return;
 
                 Vector2 position = slider.Path.ControlPoints[index].Position + slider.Position;
                 InputManager.MoveMouseTo(visualiser.Pieces[0].Parent!.ToScreenSpace(position));
@@ -239,7 +239,7 @@ private void addContextMenuItemStep(string contextMenuText)
         {
             AddStep($"click context menu item \"{contextMenuText}\"", () =>
             {
-                if (visualiser is null) return;
+                if (visualiser == null) return;
 
                 MenuItem? item = visualiser.ContextMenuItems?.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 421a32b9eb44..4db66fde4b31 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
@@ -13,6 +14,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
@@ -47,7 +49,7 @@ public void TestLegacySmoothCursorTrail()
         {
             createTest(() =>
             {
-                var skinContainer = new LegacySkinContainer(renderer, false);
+                var skinContainer = new LegacySkinContainer(renderer, provideMiddle: false);
                 var legacyCursorTrail = new LegacyCursorTrail(skinContainer);
 
                 skinContainer.Child = legacyCursorTrail;
@@ -61,7 +63,7 @@ public void TestLegacyDisjointCursorTrail()
         {
             createTest(() =>
             {
-                var skinContainer = new LegacySkinContainer(renderer, true);
+                var skinContainer = new LegacySkinContainer(renderer, provideMiddle: true);
                 var legacyCursorTrail = new LegacyCursorTrail(skinContainer);
 
                 skinContainer.Child = legacyCursorTrail;
@@ -70,6 +72,22 @@ public void TestLegacyDisjointCursorTrail()
             });
         }
 
+        [Test]
+        public void TestLegacyDisjointCursorTrailViaNoCursor()
+        {
+            createTest(() =>
+            {
+                var skinContainer = new LegacySkinContainer(renderer, provideMiddle: false, provideCursor: false);
+                var legacyCursorTrail = new LegacyCursorTrail(skinContainer);
+
+                skinContainer.Child = legacyCursorTrail;
+
+                return skinContainer;
+            });
+
+            AddAssert("trail is disjoint", () => this.ChildrenOfType<LegacyCursorTrail>().Single().DisjointTrail, () => Is.True);
+        }
+
         private void createTest(Func<Drawable> createContent) => AddStep("create trail", () =>
         {
             Clear();
@@ -86,12 +104,14 @@ private void createTest(Func<Drawable> createContent) => AddStep("create trail",
         private partial class LegacySkinContainer : Container, ISkinSource
         {
             private readonly IRenderer renderer;
-            private readonly bool disjoint;
+            private readonly bool provideMiddle;
+            private readonly bool provideCursor;
 
-            public LegacySkinContainer(IRenderer renderer, bool disjoint)
+            public LegacySkinContainer(IRenderer renderer, bool provideMiddle, bool provideCursor = true)
             {
                 this.renderer = renderer;
-                this.disjoint = disjoint;
+                this.provideMiddle = provideMiddle;
+                this.provideCursor = provideCursor;
 
                 RelativeSizeAxes = Axes.Both;
             }
@@ -102,15 +122,14 @@ public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wra
             {
                 switch (componentName)
                 {
-                    case "cursortrail":
-                        var tex = new Texture(renderer.WhitePixel);
+                    case "cursor":
+                        return provideCursor ? new Texture(renderer.WhitePixel) : null;
 
-                        if (disjoint)
-                            tex.ScaleAdjust = 1 / 25f;
-                        return tex;
+                    case "cursortrail":
+                        return new Texture(renderer.WhitePixel);
 
                     case "cursormiddle":
-                        return disjoint ? null : renderer.WhitePixel;
+                        return provideMiddle ? null : renderer.WhitePixel;
                 }
 
                 return null;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index 5bf7c0326a9a..bf0ab8efa0e0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -19,6 +19,7 @@
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Tests.Visual;
@@ -578,6 +579,24 @@ public void TestWithDisallowedUserCursor()
             assertKeyCounter(1, 1);
         }
 
+        [Test]
+        public void TestTouchJudgedCircle()
+        {
+            addHitCircleAt(TouchSource.Touch1);
+            addHitCircleAt(TouchSource.Touch2);
+
+            beginTouch(TouchSource.Touch1);
+            endTouch(TouchSource.Touch1);
+
+            // Hold the second touch (this becomes the primary touch).
+            beginTouch(TouchSource.Touch2);
+
+            // Touch again on the first circle.
+            // Because it's been judged, the cursor should not move here.
+            beginTouch(TouchSource.Touch1);
+            checkPosition(TouchSource.Touch2);
+        }
+
         private void addHitCircleAt(TouchSource source)
         {
             AddStep($"Add circle at {source}", () =>
@@ -590,6 +609,7 @@ private void addHitCircleAt(TouchSource source)
                 {
                     Clock = new FramedClock(new ManualClock()),
                     Position = mainContent.ToLocalSpace(getSanePositionForSource(source)),
+                    CheckHittable = (_, _, _) => ClickAction.Hit
                 });
             });
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResume.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResume.cs
new file mode 100644
index 000000000000..023016c32df5
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResume.cs
@@ -0,0 +1,69 @@
+// 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;
+using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public partial class TestSceneResume : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, false, AllowBackwardsSeeks);
+
+        [Test]
+        public void TestPauseViaKeyboard()
+        {
+            AddStep("move mouse to center", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for gameplay start", () => Player.LocalUserPlaying.Value);
+            AddStep("press escape", () => InputManager.PressKey(Key.Escape));
+            AddUntilStep("wait for pause overlay", () => Player.ChildrenOfType<PauseOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Visible));
+            AddStep("release escape", () => InputManager.ReleaseKey(Key.Escape));
+            AddStep("resume", () =>
+            {
+                InputManager.Key(Key.Down);
+                InputManager.Key(Key.Space);
+            });
+            AddUntilStep("pause overlay present", () => Player.DrawableRuleset.ResumeOverlay.State.Value, () => Is.EqualTo(Visibility.Visible));
+        }
+
+        [Test]
+        public void TestPauseViaKeyboardWhenMouseOutsidePlayfield()
+        {
+            AddStep("move mouse outside playfield", () => InputManager.MoveMouseTo(Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.BottomRight + new Vector2(1)));
+            AddUntilStep("wait for gameplay start", () => Player.LocalUserPlaying.Value);
+            AddStep("press escape", () => InputManager.PressKey(Key.Escape));
+            AddUntilStep("wait for pause overlay", () => Player.ChildrenOfType<PauseOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Visible));
+            AddStep("release escape", () => InputManager.ReleaseKey(Key.Escape));
+            AddStep("resume", () =>
+            {
+                InputManager.Key(Key.Down);
+                InputManager.Key(Key.Space);
+            });
+            AddUntilStep("pause overlay present", () => Player.DrawableRuleset.ResumeOverlay.State.Value, () => Is.EqualTo(Visibility.Visible));
+        }
+
+        [Test]
+        public void TestPauseViaKeyboardWhenMouseOutsideScreen()
+        {
+            AddStep("move mouse outside playfield", () => InputManager.MoveMouseTo(new Vector2(-20)));
+            AddUntilStep("wait for gameplay start", () => Player.LocalUserPlaying.Value);
+            AddStep("press escape", () => InputManager.PressKey(Key.Escape));
+            AddUntilStep("wait for pause overlay", () => Player.ChildrenOfType<PauseOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Visible));
+            AddStep("release escape", () => InputManager.ReleaseKey(Key.Escape));
+            AddStep("resume", () =>
+            {
+                InputManager.Key(Key.Down);
+                InputManager.Key(Key.Space);
+            });
+            AddUntilStep("pause overlay not present", () => Player.DrawableRuleset.ResumeOverlay.State.Value, () => Is.EqualTo(Visibility.Hidden));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
index 05939bb3ab20..f2218a89a755 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
@@ -36,11 +36,12 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current)
             while (rhythmStart < historicalNoteCount - 2 && current.StartTime - current.Previous(rhythmStart).StartTime < history_time_max)
                 rhythmStart++;
 
+            OsuDifficultyHitObject prevObj = (OsuDifficultyHitObject)current.Previous(rhythmStart);
+            OsuDifficultyHitObject lastObj = (OsuDifficultyHitObject)current.Previous(rhythmStart + 1);
+
             for (int i = rhythmStart; i > 0; i--)
             {
                 OsuDifficultyHitObject currObj = (OsuDifficultyHitObject)current.Previous(i - 1);
-                OsuDifficultyHitObject prevObj = (OsuDifficultyHitObject)current.Previous(i);
-                OsuDifficultyHitObject lastObj = (OsuDifficultyHitObject)current.Previous(i + 1);
 
                 double currHistoricalDecay = (history_time_max - (current.StartTime - currObj.StartTime)) / history_time_max; // scales note 0 to 1 from history to now
 
@@ -66,10 +67,10 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current)
                     }
                     else
                     {
-                        if (current.Previous(i - 1).BaseObject is Slider) // bpm change is into slider, this is easy acc window
+                        if (currObj.BaseObject is Slider) // bpm change is into slider, this is easy acc window
                             effectiveRatio *= 0.125;
 
-                        if (current.Previous(i).BaseObject is Slider) // bpm change was from a slider, this is easier typically than circle -> circle
+                        if (prevObj.BaseObject is Slider) // bpm change was from a slider, this is easier typically than circle -> circle
                             effectiveRatio *= 0.25;
 
                         if (previousIslandSize == islandSize) // repeated island size (ex: triplet -> triplet)
@@ -100,6 +101,9 @@ public static double EvaluateDifficultyOf(DifficultyHitObject current)
                     startRatio = effectiveRatio;
                     islandSize = 1;
                 }
+
+                lastObj = prevObj;
+                prevObj = currObj;
             }
 
             return Math.Sqrt(4 + rhythmComplexitySum * rhythm_multiplier) / 2; //produces multiplier that can be applied to strain. range [1, infinity) (not really though)
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index b31f4ff5191d..18a4b8be0caf 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -111,7 +111,7 @@ private double computeAimValue(ScoreInfo score, OsuDifficultyAttributes attribut
 
             if (score.Mods.Any(m => m is OsuModBlinds))
                 aimValue *= 1.3 + (totalHits * (0.0016 / (1 + 2 * effectiveMissCount)) * Math.Pow(accuracy, 16)) * (1 - 0.003 * attributes.DrainRate * attributes.DrainRate);
-            else if (score.Mods.Any(h => h is OsuModHidden))
+            else if (score.Mods.Any(m => m is OsuModHidden || m is OsuModTraceable))
             {
                 // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
                 aimValue *= 1.0 + 0.04 * (12.0 - attributes.ApproachRate);
@@ -162,7 +162,7 @@ private double computeSpeedValue(ScoreInfo score, OsuDifficultyAttributes attrib
                 // Increasing the speed value by object count for Blinds isn't ideal, so the minimum buff is given.
                 speedValue *= 1.12;
             }
-            else if (score.Mods.Any(m => m is OsuModHidden))
+            else if (score.Mods.Any(m => m is OsuModHidden || m is OsuModTraceable))
             {
                 // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
                 speedValue *= 1.0 + 0.04 * (12.0 - attributes.ApproachRate);
@@ -212,7 +212,7 @@ private double computeAccuracyValue(ScoreInfo score, OsuDifficultyAttributes att
             // Increasing the accuracy value by object count for Blinds isn't ideal, so the minimum buff is given.
             if (score.Mods.Any(m => m is OsuModBlinds))
                 accuracyValue *= 1.14;
-            else if (score.Mods.Any(m => m is OsuModHidden))
+            else if (score.Mods.Any(m => m is OsuModHidden || m is OsuModTraceable))
                 accuracyValue *= 1.08;
 
             if (score.Mods.Any(m => m is OsuModFlashlight))
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnection.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnection.cs
new file mode 100644
index 000000000000..5706ed4baf61
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnection.cs
@@ -0,0 +1,63 @@
+// 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.Bindables;
+using osu.Framework.Graphics.Lines;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
+{
+    /// <summary>
+    /// A visualisation of the lines between <see cref="PathControlPointPiece{T}"/>s.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="OsuHitObject"/> which this <see cref="PathControlPointConnection{T}"/> visualises.</typeparam>
+    public partial class PathControlPointConnection<T> : SmoothPath where T : OsuHitObject, IHasPath
+    {
+        private readonly T hitObject;
+
+        private IBindable<Vector2> hitObjectPosition;
+        private IBindable<int> pathVersion;
+        private IBindable<int> stackHeight;
+
+        public PathControlPointConnection(T hitObject)
+        {
+            this.hitObject = hitObject;
+            PathRadius = 1;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            hitObjectPosition = hitObject.PositionBindable.GetBoundCopy();
+            hitObjectPosition.BindValueChanged(_ => Scheduler.AddOnce(updateConnectingPath));
+
+            pathVersion = hitObject.Path.Version.GetBoundCopy();
+            pathVersion.BindValueChanged(_ => Scheduler.AddOnce(updateConnectingPath));
+
+            stackHeight = hitObject.StackHeightBindable.GetBoundCopy();
+            stackHeight.BindValueChanged(_ => updateConnectingPath());
+
+            updateConnectingPath();
+        }
+
+        /// <summary>
+        /// Updates the path connecting this control point to the next one.
+        /// </summary>
+        private void updateConnectingPath()
+        {
+            Position = hitObject.StackedPosition;
+
+            ClearVertices();
+
+            foreach (var controlPoint in hitObject.Path.ControlPoints)
+                AddVertex(controlPoint.Position);
+
+            OriginPosition = PositionInBoundingBox(Vector2.Zero);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
deleted file mode 100644
index 7e7d653dbd03..000000000000
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Lines;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
-
-namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
-{
-    /// <summary>
-    /// A visualisation of the line between two <see cref="PathControlPointPiece{T}"/>s.
-    /// </summary>
-    /// <typeparam name="T">The type of <see cref="OsuHitObject"/> which this <see cref="PathControlPointConnectionPiece{T}"/> visualises.</typeparam>
-    public partial class PathControlPointConnectionPiece<T> : CompositeDrawable where T : OsuHitObject, IHasPath
-    {
-        public readonly PathControlPoint ControlPoint;
-
-        private readonly Path path;
-        private readonly T hitObject;
-        public int ControlPointIndex { get; set; }
-
-        private IBindable<Vector2> hitObjectPosition;
-        private IBindable<int> pathVersion;
-
-        public PathControlPointConnectionPiece(T hitObject, int controlPointIndex)
-        {
-            this.hitObject = hitObject;
-            ControlPointIndex = controlPointIndex;
-
-            Origin = Anchor.Centre;
-            AutoSizeAxes = Axes.Both;
-
-            ControlPoint = hitObject.Path.ControlPoints[controlPointIndex];
-
-            InternalChild = path = new SmoothPath
-            {
-                Anchor = Anchor.Centre,
-                PathRadius = 1
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            hitObjectPosition = hitObject.PositionBindable.GetBoundCopy();
-            hitObjectPosition.BindValueChanged(_ => Scheduler.AddOnce(updateConnectingPath));
-
-            pathVersion = hitObject.Path.Version.GetBoundCopy();
-            pathVersion.BindValueChanged(_ => Scheduler.AddOnce(updateConnectingPath));
-
-            updateConnectingPath();
-        }
-
-        /// <summary>
-        /// Updates the path connecting this control point to the next one.
-        /// </summary>
-        private void updateConnectingPath()
-        {
-            Position = hitObject.StackedPosition + ControlPoint.Position;
-
-            path.ClearVertices();
-
-            int nextIndex = ControlPointIndex + 1;
-            if (nextIndex == 0 || nextIndex >= hitObject.Path.ControlPoints.Count)
-                return;
-
-            path.AddVertex(Vector2.Zero);
-            path.AddVertex(hitObject.Path.ControlPoints[nextIndex].Position - ControlPoint.Position);
-
-            path.OriginPosition = path.PositionInBoundingBox(Vector2.Zero);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index e741d67e3b57..9d819f6cc088 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -8,9 +8,9 @@
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -40,7 +40,7 @@ public partial class PathControlPointPiece<T> : BlueprintPiece<T>, IHasTooltip
         public readonly PathControlPoint ControlPoint;
 
         private readonly T hitObject;
-        private readonly Container marker;
+        private readonly Circle circle;
         private readonly Drawable markerRing;
 
         [Resolved]
@@ -48,6 +48,7 @@ public partial class PathControlPointPiece<T> : BlueprintPiece<T>, IHasTooltip
 
         private IBindable<Vector2> hitObjectPosition;
         private IBindable<float> hitObjectScale;
+        private IBindable<int> stackHeight;
 
         public PathControlPointPiece(T hitObject, PathControlPoint controlPoint)
         {
@@ -59,38 +60,22 @@ public PathControlPointPiece(T hitObject, PathControlPoint controlPoint)
             Origin = Anchor.Centre;
             AutoSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
-                marker = new Container
+                circle = new Circle
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    AutoSizeAxes = Axes.Both,
-                    Children = new[]
-                    {
-                        new Circle
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(20),
-                        },
-                        markerRing = new CircularContainer
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(28),
-                            Masking = true,
-                            BorderThickness = 2,
-                            BorderColour = Color4.White,
-                            Alpha = 0,
-                            Child = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                AlwaysPresent = true
-                            }
-                        }
-                    }
+                    Size = new Vector2(20),
+                },
+                markerRing = new CircularProgress
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(28),
+                    Alpha = 0,
+                    InnerRadius = 0.1f,
+                    Progress = 1
                 }
             };
         }
@@ -105,13 +90,16 @@ protected override void LoadComplete()
             hitObjectScale = hitObject.ScaleBindable.GetBoundCopy();
             hitObjectScale.BindValueChanged(_ => updateMarkerDisplay());
 
+            stackHeight = hitObject.StackHeightBindable.GetBoundCopy();
+            stackHeight.BindValueChanged(_ => updateMarkerDisplay());
+
             IsSelected.BindValueChanged(_ => updateMarkerDisplay());
 
             updateMarkerDisplay();
         }
 
         // The connecting path is excluded from positional input
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => marker.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.ReceivePositionalInputAt(screenSpacePos);
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -205,8 +193,8 @@ private void updateMarkerDisplay()
             if (IsHovered || IsSelected.Value)
                 colour = colour.Lighten(1);
 
-            marker.Colour = colour;
-            marker.Scale = new Vector2(hitObject.Scale);
+            Colour = colour;
+            Scale = new Vector2(hitObject.Scale);
         }
 
         private Color4 getColourFromNodeType()
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index b2d1709531f1..47af16ffa6f4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -37,7 +37,6 @@ public partial class PathControlPointVisualiser<T> : CompositeDrawable, IKeyBind
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true; // allow context menu to appear outside of the playfield.
 
         internal readonly Container<PathControlPointPiece<T>> Pieces;
-        internal readonly Container<PathControlPointConnectionPiece<T>> Connections;
 
         private readonly IBindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
         private readonly T hitObject;
@@ -63,7 +62,7 @@ public PathControlPointVisualiser(T hitObject, bool allowSelection)
 
             InternalChildren = new Drawable[]
             {
-                Connections = new Container<PathControlPointConnectionPiece<T>> { RelativeSizeAxes = Axes.Both },
+                new PathControlPointConnection<T>(hitObject),
                 Pieces = new Container<PathControlPointPiece<T>> { RelativeSizeAxes = Axes.Both }
             };
         }
@@ -78,6 +77,9 @@ protected override void LoadComplete()
             controlPoints.BindTo(hitObject.Path.ControlPoints);
         }
 
+        // Generally all the control points are within the visible area all the time.
+        public override bool UpdateSubTreeMasking() => true;
+
         /// <summary>
         /// Handles correction of invalid path types.
         /// </summary>
@@ -185,17 +187,6 @@ private void onControlPointsChanged(object sender, NotifyCollectionChangedEventA
                 case NotifyCollectionChangedAction.Add:
                     Debug.Assert(e.NewItems != null);
 
-                    // If inserting in the path (not appending),
-                    // update indices of existing connections after insert location
-                    if (e.NewStartingIndex < Pieces.Count)
-                    {
-                        foreach (var connection in Connections)
-                        {
-                            if (connection.ControlPointIndex >= e.NewStartingIndex)
-                                connection.ControlPointIndex += e.NewItems.Count;
-                        }
-                    }
-
                     for (int i = 0; i < e.NewItems.Count; i++)
                     {
                         var point = (PathControlPoint)e.NewItems[i];
@@ -209,8 +200,6 @@ private void onControlPointsChanged(object sender, NotifyCollectionChangedEventA
                             d.DragInProgress = DragInProgress;
                             d.DragEnded = DragEnded;
                         }));
-
-                        Connections.Add(new PathControlPointConnectionPiece<T>(hitObject, e.NewStartingIndex + i));
                     }
 
                     break;
@@ -222,19 +211,6 @@ private void onControlPointsChanged(object sender, NotifyCollectionChangedEventA
                     {
                         foreach (var piece in Pieces.Where(p => p.ControlPoint == point).ToArray())
                             piece.RemoveAndDisposeImmediately();
-                        foreach (var connection in Connections.Where(c => c.ControlPoint == point).ToArray())
-                            connection.RemoveAndDisposeImmediately();
-                    }
-
-                    // If removing before the end of the path,
-                    // update indices of connections after remove location
-                    if (e.OldStartingIndex < Pieces.Count)
-                    {
-                        foreach (var connection in Connections)
-                        {
-                            if (connection.ControlPointIndex >= e.OldStartingIndex)
-                                connection.ControlPointIndex -= e.OldItems.Count;
-                        }
                     }
 
                     break;
@@ -459,10 +435,14 @@ private MenuItem createMenuItemForPathType(PathType? type)
 
             var item = new TernaryStateRadioMenuItem(type?.Description ?? "Inherit", MenuItemType.Standard, _ =>
             {
+                changeHandler?.BeginChange();
+
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
                     updatePathType(p, type);
 
                 EnsureValidPathTypes();
+
+                changeHandler?.EndChange();
             });
 
             if (countOfState == totalCount)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
index 075e9e6aa116..12626a77ed63 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Skinning.Default;
@@ -27,14 +28,16 @@ public partial class SliderBodyPiece : BlueprintPiece<Slider>
 
         public SliderBodyPiece()
         {
-            InternalChild = body = new ManualSliderBody
-            {
-                AccentColour = Color4.Transparent
-            };
+            AutoSizeAxes = Axes.Both;
 
             // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
             // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
             AlwaysPresent = true;
+
+            InternalChild = body = new ManualSliderBody
+            {
+                AccentColour = Color4.Transparent
+            };
         }
 
         [BackgroundDependencyLoader]
@@ -61,7 +64,6 @@ public override void UpdateFrom(Slider hitObject)
                 body.SetVertices(vertices);
             }
 
-            Size = body.Size;
             OriginPosition = body.PathOffset;
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 4d2b980c2329..49fdf12d606c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -311,7 +311,7 @@ private void splitControlPoints(List<PathControlPoint> controlPointsToSplitAt)
 
             foreach (var splitPoint in controlPointsToSplitAt)
             {
-                if (splitPoint == controlPoints[0] || splitPoint == controlPoints[^1] || splitPoint.Type is null)
+                if (splitPoint == controlPoints[0] || splitPoint == controlPoints[^1] || splitPoint.Type == null)
                     continue;
 
                 // Split off the section of slider before this control point so the remaining control points to split are in the latter part of the slider.
@@ -403,7 +403,12 @@ private void convertToStream()
 
         public override MenuItem[] ContextMenuItems => new MenuItem[]
         {
-            new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
+            new OsuMenuItem("Add control point", MenuItemType.Standard, () =>
+            {
+                changeHandler?.BeginChange();
+                addControlPoint(rightClickPosition);
+                changeHandler?.EndChange();
+            }),
             new OsuMenuItem("Convert to stream", MenuItemType.Destructive, convertToStream),
         };
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index b33272968b2d..41d47d31d017 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
@@ -25,33 +24,17 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public partial class OsuSelectionHandler : EditorSelectionHandler
     {
-        [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider? snapProvider { get; set; }
-
-        /// <summary>
-        /// During a transform, the initial path types of a single selected slider are stored so they
-        /// can be maintained throughout the operation.
-        /// </summary>
-        private List<PathType?>? referencePathTypes;
-
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();
 
             Quad quad = selectedMovableObjects.Length > 0 ? GeometryUtils.GetSurroundingQuad(selectedMovableObjects) : new Quad();
 
-            SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
-            SelectionBox.CanFlipY = SelectionBox.CanScaleY = quad.Height > 0;
-            SelectionBox.CanScaleDiagonally = SelectionBox.CanScaleX && SelectionBox.CanScaleY;
+            SelectionBox.CanFlipX = quad.Width > 0;
+            SelectionBox.CanFlipY = quad.Height > 0;
             SelectionBox.CanReverse = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
         }
 
-        protected override void OnOperationEnded()
-        {
-            base.OnOperationEnded();
-            referencePathTypes = null;
-        }
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.Key == Key.M && e.ControlPressed && e.ShiftPressed)
@@ -149,96 +132,9 @@ public override bool HandleFlip(Direction direction, bool flipOverOrigin)
             return didFlip;
         }
 
-        public override bool HandleScale(Vector2 scale, Anchor reference)
-        {
-            adjustScaleFromAnchor(ref scale, reference);
-
-            var hitObjects = selectedMovableObjects;
-
-            // for the time being, allow resizing of slider paths only if the slider is
-            // the only hit object selected. with a group selection, it's likely the user
-            // is not looking to change the duration of the slider but expand the whole pattern.
-            if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
-                scaleSlider(slider, scale);
-            else
-                scaleHitObjects(hitObjects, reference, scale);
-
-            moveSelectionInBounds();
-            return true;
-        }
-
-        private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
-        {
-            // cancel out scale in axes we don't care about (based on which drag handle was used).
-            if ((reference & Anchor.x1) > 0) scale.X = 0;
-            if ((reference & Anchor.y1) > 0) scale.Y = 0;
-
-            // reverse the scale direction if dragging from top or left.
-            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
-            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
-        }
-
         public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler();
 
-        private void scaleSlider(Slider slider, Vector2 scale)
-        {
-            referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type).ToList();
-
-            Quad sliderQuad = GeometryUtils.GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position));
-
-            // Limit minimum distance between control points after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
-            scale = Vector2.ComponentMax(new Vector2(Precision.FLOAT_EPSILON), sliderQuad.Size + scale) - sliderQuad.Size;
-
-            Vector2 pathRelativeDeltaScale = new Vector2(
-                sliderQuad.Width == 0 ? 0 : 1 + scale.X / sliderQuad.Width,
-                sliderQuad.Height == 0 ? 0 : 1 + scale.Y / sliderQuad.Height);
-
-            Queue<Vector2> oldControlPoints = new Queue<Vector2>();
-
-            foreach (var point in slider.Path.ControlPoints)
-            {
-                oldControlPoints.Enqueue(point.Position);
-                point.Position *= pathRelativeDeltaScale;
-            }
-
-            // Maintain the path types in case they were defaulted to bezier at some point during scaling
-            for (int i = 0; i < slider.Path.ControlPoints.Count; ++i)
-                slider.Path.ControlPoints[i].Type = referencePathTypes[i];
-
-            // Snap the slider's length to the current beat divisor
-            // to calculate the final resulting duration / bounding box before the final checks.
-            slider.SnapTo(snapProvider);
-
-            //if sliderhead or sliderend end up outside playfield, revert scaling.
-            Quad scaledQuad = GeometryUtils.GetSurroundingQuad(new OsuHitObject[] { slider });
-            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
-
-            if (xInBounds && yInBounds && slider.Path.HasValidLength)
-                return;
-
-            foreach (var point in slider.Path.ControlPoints)
-                point.Position = oldControlPoints.Dequeue();
-
-            // Snap the slider's length again to undo the potentially-invalid length applied by the previous snap.
-            slider.SnapTo(snapProvider);
-        }
-
-        private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
-        {
-            scale = getClampedScale(hitObjects, reference, scale);
-            Quad selectionQuad = GeometryUtils.GetSurroundingQuad(hitObjects);
-
-            foreach (var h in hitObjects)
-                h.Position = GeometryUtils.GetScaledPosition(reference, scale, selectionQuad, h.Position);
-        }
-
-        private (bool X, bool Y) isQuadInBounds(Quad quad)
-        {
-            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X <= DrawWidth);
-            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y <= DrawHeight);
-
-            return (xInBounds, yInBounds);
-        }
+        public override SelectionScaleHandler CreateScaleHandler() => new OsuSelectionScaleHandler();
 
         private void moveSelectionInBounds()
         {
@@ -262,43 +158,6 @@ private void moveSelectionInBounds()
                 h.Position += delta;
         }
 
-        /// <summary>
-        /// Clamp scale for multi-object-scaling where selection does not exceed playfield bounds or flip.
-        /// </summary>
-        /// <param name="hitObjects">The hitobjects to be scaled</param>
-        /// <param name="reference">The anchor from which the scale operation is performed</param>
-        /// <param name="scale">The scale to be clamped</param>
-        /// <returns>The clamped scale vector</returns>
-        private Vector2 getClampedScale(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
-        {
-            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
-            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
-
-            Quad selectionQuad = GeometryUtils.GetSurroundingQuad(hitObjects);
-
-            //todo: this is not always correct for selections involving sliders. This approximation assumes each point is scaled independently, but sliderends move with the sliderhead.
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-
-            //max Size -> playfield bounds
-            if (scaledQuad.TopLeft.X < 0)
-                scale.X += scaledQuad.TopLeft.X;
-            if (scaledQuad.TopLeft.Y < 0)
-                scale.Y += scaledQuad.TopLeft.Y;
-
-            if (scaledQuad.BottomRight.X > DrawWidth)
-                scale.X -= scaledQuad.BottomRight.X - DrawWidth;
-            if (scaledQuad.BottomRight.Y > DrawHeight)
-                scale.Y -= scaledQuad.BottomRight.Y - DrawHeight;
-
-            //min Size -> almost 0. Less than 0 causes the quad to flip, exactly 0 causes scaling to get stuck at minimum scale.
-            Vector2 scaledSize = selectionQuad.Size + scale;
-            Vector2 minSize = new Vector2(Precision.FLOAT_EPSILON);
-
-            scale = Vector2.ComponentMax(minSize, scaledSize) - selectionQuad.Size;
-
-            return scale;
-        }
-
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
index 21fb8a67de55..d48bc6a90b19 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
@@ -41,7 +41,8 @@ protected override void LoadComplete()
         private void updateState()
         {
             var quad = GeometryUtils.GetSurroundingQuad(selectedMovableObjects);
-            CanRotate.Value = quad.Width > 0 || quad.Height > 0;
+            CanRotateSelectionOrigin.Value = quad.Width > 0 || quad.Height > 0;
+            CanRotatePlayfieldOrigin.Value = selectedMovableObjects.Any();
         }
 
         private OsuHitObject[]? objectsInRotation;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs
new file mode 100644
index 000000000000..af03c4d92514
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionScaleHandler.cs
@@ -0,0 +1,220 @@
+// 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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class OsuSelectionScaleHandler : SelectionScaleHandler
+    {
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider? snapProvider { get; set; }
+
+        private BindableList<HitObject> selectedItems { get; } = new BindableList<HitObject>();
+
+        [BackgroundDependencyLoader]
+        private void load(EditorBeatmap editorBeatmap)
+        {
+            selectedItems.BindTo(editorBeatmap.SelectedHitObjects);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedItems.CollectionChanged += (_, __) => updateState();
+            updateState();
+        }
+
+        private void updateState()
+        {
+            var quad = GeometryUtils.GetSurroundingQuad(selectedMovableObjects);
+
+            CanScaleX.Value = quad.Width > 0;
+            CanScaleY.Value = quad.Height > 0;
+            CanScaleDiagonally.Value = CanScaleX.Value && CanScaleY.Value;
+        }
+
+        private Dictionary<OsuHitObject, OriginalHitObjectState>? objectsInScale;
+        private Vector2? defaultOrigin;
+
+        public override void Begin()
+        {
+            if (objectsInScale != null)
+                throw new InvalidOperationException($"Cannot {nameof(Begin)} a scale operation while another is in progress!");
+
+            changeHandler?.BeginChange();
+
+            objectsInScale = selectedMovableObjects.ToDictionary(ho => ho, ho => new OriginalHitObjectState(ho));
+            OriginalSurroundingQuad = objectsInScale.Count == 1 && objectsInScale.First().Key is Slider slider
+                ? GeometryUtils.GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position))
+                : GeometryUtils.GetSurroundingQuad(objectsInScale.Keys);
+            defaultOrigin = OriginalSurroundingQuad.Value.Centre;
+        }
+
+        public override void Update(Vector2 scale, Vector2? origin = null, Axes adjustAxis = Axes.Both)
+        {
+            if (objectsInScale == null)
+                throw new InvalidOperationException($"Cannot {nameof(Update)} a scale operation without calling {nameof(Begin)} first!");
+
+            Debug.Assert(defaultOrigin != null && OriginalSurroundingQuad != null);
+
+            Vector2 actualOrigin = origin ?? defaultOrigin.Value;
+
+            // for the time being, allow resizing of slider paths only if the slider is
+            // the only hit object selected. with a group selection, it's likely the user
+            // is not looking to change the duration of the slider but expand the whole pattern.
+            if (objectsInScale.Count == 1 && objectsInScale.First().Key is Slider slider)
+            {
+                var originalInfo = objectsInScale[slider];
+                Debug.Assert(originalInfo.PathControlPointPositions != null && originalInfo.PathControlPointTypes != null);
+                scaleSlider(slider, scale, originalInfo.PathControlPointPositions, originalInfo.PathControlPointTypes);
+            }
+            else
+            {
+                scale = getClampedScale(OriginalSurroundingQuad.Value, actualOrigin, scale);
+
+                foreach (var (ho, originalState) in objectsInScale)
+                {
+                    ho.Position = GeometryUtils.GetScaledPosition(scale, actualOrigin, originalState.Position);
+                }
+            }
+
+            moveSelectionInBounds();
+        }
+
+        public override void Commit()
+        {
+            if (objectsInScale == null)
+                throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+            changeHandler?.EndChange();
+
+            objectsInScale = null;
+            OriginalSurroundingQuad = null;
+            defaultOrigin = null;
+        }
+
+        private IEnumerable<OsuHitObject> selectedMovableObjects => selectedItems.Cast<OsuHitObject>()
+                                                                                 .Where(h => h is not Spinner);
+
+        private void scaleSlider(Slider slider, Vector2 scale, Vector2[] originalPathPositions, PathType?[] originalPathTypes)
+        {
+            scale = Vector2.ComponentMax(scale, new Vector2(Precision.FLOAT_EPSILON));
+
+            // Maintain the path types in case they were defaulted to bezier at some point during scaling
+            for (int i = 0; i < slider.Path.ControlPoints.Count; i++)
+            {
+                slider.Path.ControlPoints[i].Position = originalPathPositions[i] * scale;
+                slider.Path.ControlPoints[i].Type = originalPathTypes[i];
+            }
+
+            // Snap the slider's length to the current beat divisor
+            // to calculate the final resulting duration / bounding box before the final checks.
+            slider.SnapTo(snapProvider);
+
+            //if sliderhead or sliderend end up outside playfield, revert scaling.
+            Quad scaledQuad = GeometryUtils.GetSurroundingQuad(new OsuHitObject[] { slider });
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
+
+            if (xInBounds && yInBounds && slider.Path.HasValidLength)
+                return;
+
+            for (int i = 0; i < slider.Path.ControlPoints.Count; i++)
+                slider.Path.ControlPoints[i].Position = originalPathPositions[i];
+
+            // Snap the slider's length again to undo the potentially-invalid length applied by the previous snap.
+            slider.SnapTo(snapProvider);
+        }
+
+        private (bool X, bool Y) isQuadInBounds(Quad quad)
+        {
+            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X <= OsuPlayfield.BASE_SIZE.X);
+            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y <= OsuPlayfield.BASE_SIZE.Y);
+
+            return (xInBounds, yInBounds);
+        }
+
+        /// <summary>
+        /// Clamp scale for multi-object-scaling where selection does not exceed playfield bounds or flip.
+        /// </summary>
+        /// <param name="selectionQuad">The quad surrounding the hitobjects</param>
+        /// <param name="origin">The origin from which the scale operation is performed</param>
+        /// <param name="scale">The scale to be clamped</param>
+        /// <returns>The clamped scale vector</returns>
+        private Vector2 getClampedScale(Quad selectionQuad, Vector2 origin, Vector2 scale)
+        {
+            //todo: this is not always correct for selections involving sliders. This approximation assumes each point is scaled independently, but sliderends move with the sliderhead.
+
+            var tl1 = Vector2.Divide(-origin, selectionQuad.TopLeft - origin);
+            var tl2 = Vector2.Divide(OsuPlayfield.BASE_SIZE - origin, selectionQuad.TopLeft - origin);
+            var br1 = Vector2.Divide(-origin, selectionQuad.BottomRight - origin);
+            var br2 = Vector2.Divide(OsuPlayfield.BASE_SIZE - origin, selectionQuad.BottomRight - origin);
+
+            if (!Precision.AlmostEquals(selectionQuad.TopLeft.X - origin.X, 0))
+                scale.X = selectionQuad.TopLeft.X - origin.X < 0 ? MathHelper.Clamp(scale.X, tl2.X, tl1.X) : MathHelper.Clamp(scale.X, tl1.X, tl2.X);
+            if (!Precision.AlmostEquals(selectionQuad.TopLeft.Y - origin.Y, 0))
+                scale.Y = selectionQuad.TopLeft.Y - origin.Y < 0 ? MathHelper.Clamp(scale.Y, tl2.Y, tl1.Y) : MathHelper.Clamp(scale.Y, tl1.Y, tl2.Y);
+            if (!Precision.AlmostEquals(selectionQuad.BottomRight.X - origin.X, 0))
+                scale.X = selectionQuad.BottomRight.X - origin.X < 0 ? MathHelper.Clamp(scale.X, br2.X, br1.X) : MathHelper.Clamp(scale.X, br1.X, br2.X);
+            if (!Precision.AlmostEquals(selectionQuad.BottomRight.Y - origin.Y, 0))
+                scale.Y = selectionQuad.BottomRight.Y - origin.Y < 0 ? MathHelper.Clamp(scale.Y, br2.Y, br1.Y) : MathHelper.Clamp(scale.Y, br1.Y, br2.Y);
+
+            return Vector2.ComponentMax(scale, new Vector2(Precision.FLOAT_EPSILON));
+        }
+
+        private void moveSelectionInBounds()
+        {
+            Quad quad = GeometryUtils.GetSurroundingQuad(objectsInScale!.Keys);
+
+            Vector2 delta = Vector2.Zero;
+
+            if (quad.TopLeft.X < 0)
+                delta.X -= quad.TopLeft.X;
+            if (quad.TopLeft.Y < 0)
+                delta.Y -= quad.TopLeft.Y;
+
+            if (quad.BottomRight.X > OsuPlayfield.BASE_SIZE.X)
+                delta.X -= quad.BottomRight.X - OsuPlayfield.BASE_SIZE.X;
+            if (quad.BottomRight.Y > OsuPlayfield.BASE_SIZE.Y)
+                delta.Y -= quad.BottomRight.Y - OsuPlayfield.BASE_SIZE.Y;
+
+            foreach (var (h, _) in objectsInScale!)
+                h.Position += delta;
+        }
+
+        private struct OriginalHitObjectState
+        {
+            public Vector2 Position { get; }
+            public Vector2[]? PathControlPointPositions { get; }
+            public PathType?[]? PathControlPointTypes { get; }
+
+            public OriginalHitObjectState(OsuHitObject hitObject)
+            {
+                Position = hitObject.Position;
+                PathControlPointPositions = (hitObject as IHasPath)?.Path.ControlPoints.Select(p => p.Position).ToArray();
+                PathControlPointTypes = (hitObject as IHasPath)?.Path.ControlPoints.Select(p => p.Type).ToArray();
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
index f09d6b78e661..88c3d7414ba0 100644
--- a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
@@ -24,6 +24,8 @@ public partial class PreciseRotationPopover : OsuPopover
         private SliderWithTextBoxInput<float> angleInput = null!;
         private EditorRadioButtonCollection rotationOrigin = null!;
 
+        private RadioButton selectionCentreButton = null!;
+
         public PreciseRotationPopover(SelectionRotationHandler rotationHandler)
         {
             this.rotationHandler = rotationHandler;
@@ -59,13 +61,17 @@ private void load()
                             new RadioButton("Playfield centre",
                                 () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.PlayfieldCentre },
                                 () => new SpriteIcon { Icon = FontAwesome.Regular.Square }),
-                            new RadioButton("Selection centre",
+                            selectionCentreButton = new RadioButton("Selection centre",
                                 () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.SelectionCentre },
                                 () => new SpriteIcon { Icon = FontAwesome.Solid.VectorSquare })
                         }
                     }
                 }
             };
+            selectionCentreButton.Selected.DisabledChanged += isDisabled =>
+            {
+                selectionCentreButton.TooltipText = isDisabled ? "Select more than one object to perform selection-based rotation." : string.Empty;
+            };
         }
 
         protected override void LoadComplete()
@@ -76,6 +82,11 @@ protected override void LoadComplete()
             angleInput.Current.BindValueChanged(angle => rotationInfo.Value = rotationInfo.Value with { Degrees = angle.NewValue });
             rotationOrigin.Items.First().Select();
 
+            rotationHandler.CanRotateSelectionOrigin.BindValueChanged(e =>
+            {
+                selectionCentreButton.Selected.Disabled = !e.NewValue;
+            }, true);
+
             rotationInfo.BindValueChanged(rotation =>
             {
                 rotationHandler.Update(rotation.NewValue.Degrees, rotation.NewValue.Origin == RotationOrigin.PlayfieldCentre ? OsuPlayfield.BASE_SIZE / 2 : null);
diff --git a/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
index 3da9f5b69b80..9499bacade65 100644
--- a/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
@@ -22,6 +22,9 @@ public partial class TransformToolboxGroup : EditorToolboxGroup, IKeyBindingHand
 
         private EditorToolButton rotateButton = null!;
 
+        private Bindable<bool> canRotatePlayfieldOrigin = null!;
+        private Bindable<bool> canRotateSelectionOrigin = null!;
+
         public SelectionRotationHandler RotationHandler { get; init; } = null!;
 
         public TransformToolboxGroup()
@@ -51,9 +54,20 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            // aggregate two values into canRotate
+            canRotatePlayfieldOrigin = RotationHandler.CanRotatePlayfieldOrigin.GetBoundCopy();
+            canRotatePlayfieldOrigin.BindValueChanged(_ => updateCanRotateAggregate());
+
+            canRotateSelectionOrigin = RotationHandler.CanRotateSelectionOrigin.GetBoundCopy();
+            canRotateSelectionOrigin.BindValueChanged(_ => updateCanRotateAggregate());
+
+            void updateCanRotateAggregate()
+            {
+                canRotate.Value = RotationHandler.CanRotatePlayfieldOrigin.Value || RotationHandler.CanRotateSelectionOrigin.Value;
+            }
+
             // bindings to `Enabled` on the buttons are decoupled on purpose
             // due to the weird `OsuButton` behaviour of resetting `Enabled` to `false` when `Action` is set.
-            canRotate.BindTo(RotationHandler.CanRotate);
             canRotate.BindValueChanged(_ => rotateButton.Enabled.Value = canRotate.Value, true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index 9671f53bea47..75ad00e169d8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -19,6 +19,7 @@ public class OsuModTraceable : ModWithVisibilityAdjustment, IRequiresApproachCir
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "Put your faith in the approach circles...";
         public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
 
         public override Type[] IncompatibleMods => new[] { typeof(IHidesApproachCircles), typeof(OsuModDepth) };
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 203e82918005..cc3ffd376e83 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -41,7 +41,7 @@ public double Duration
 
         public Vector2 StackedPositionAt(double t) => StackedPosition + this.CurvePositionAt(t);
 
-        private readonly SliderPath path = new SliderPath();
+        private readonly SliderPath path = new SliderPath { OptimiseCatmull = true };
 
         public SliderPath Path
         {
diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index ceac1989a67f..65bd585e9845 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -47,7 +47,7 @@ public bool CheckScreenSpaceActionPressJudgeable(Vector2 screenSpacePosition) =>
             //
             // Based on user feedback of more nuanced scenarios (where touch doesn't behave as expected),
             // this can be expanded to a more complex implementation, but I'd still want to keep it as simple as we can.
-            NonPositionalInputQueue.OfType<DrawableHitCircle.HitReceptor>().Any(c => c.ReceivePositionalInputAt(screenSpacePosition));
+            NonPositionalInputQueue.OfType<DrawableHitCircle.HitReceptor>().Any(c => c.CanBeHit() && c.ReceivePositionalInputAt(screenSpacePosition));
 
         public OsuInputManager(RulesetInfo ruleset)
             : base(ruleset, 0, SimultaneousBindingMode.Unique)
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponentLookup.cs b/osu.Game.Rulesets.Osu/OsuSkinComponentLookup.cs
index 81d5811f8570..3b3653e1ba1c 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponentLookup.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponentLookup.cs
@@ -11,9 +11,5 @@ public OsuSkinComponentLookup(OsuSkinComponents component)
             : base(component)
         {
         }
-
-        protected override string RulesetPrefix => OsuRuleset.SHORT_NAME;
-
-        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
index d171f56f40a6..127d13730ab0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ManualSliderBody.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Graphics;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
@@ -11,10 +12,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
     /// </summary>
     public partial class ManualSliderBody : SliderBody
     {
-        public new void SetVertices(IReadOnlyList<Vector2> vertices)
+        public ManualSliderBody()
         {
-            base.SetVertices(vertices);
-            Size = Path.Size;
+            AutoSizeAxes = Axes.Both;
         }
+
+        public new void SetVertices(IReadOnlyList<Vector2> vertices) => base.SetVertices(vertices);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index af71e2a5d95a..ca0002d8c009 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -18,7 +18,7 @@ public partial class LegacyCursorTrail : CursorTrail
         private readonly ISkin skin;
         private const double disjoint_trail_time_separation = 1000 / 60.0;
 
-        private bool disjointTrail;
+        public bool DisjointTrail { get; private set; }
         private double lastTrailTime;
 
         private IBindable<float> cursorSize = null!;
@@ -31,14 +31,19 @@ public LegacyCursorTrail(ISkin skin)
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, ISkinSource skinSource)
         {
             cursorSize = config.GetBindable<float>(OsuSetting.GameplayCursorSize).GetBoundCopy();
 
             Texture = skin.GetTexture("cursortrail");
-            disjointTrail = skin.GetTexture("cursormiddle") == null;
 
-            if (disjointTrail)
+            // Cursor and cursor trail components are sourced from potentially different skin sources.
+            // Stable always chooses cursor trail disjoint behaviour based on the cursor texture lookup source, so we need to fetch where that occurred.
+            // See https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/Graphics/Skinning/SkinManager.cs#L269
+            var cursorProvider = skinSource.FindProvider(s => s.GetTexture("cursor") != null);
+            DisjointTrail = cursorProvider?.GetTexture("cursormiddle") == null;
+
+            if (DisjointTrail)
             {
                 bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? true;
 
@@ -57,19 +62,19 @@ private void load(OsuConfigManager config)
             }
         }
 
-        protected override double FadeDuration => disjointTrail ? 150 : 500;
+        protected override double FadeDuration => DisjointTrail ? 150 : 500;
         protected override float FadeExponent => 1;
 
-        protected override bool InterpolateMovements => !disjointTrail;
+        protected override bool InterpolateMovements => !DisjointTrail;
 
         protected override float IntervalMultiplier => 1 / Math.Max(cursorSize.Value, 1);
-        protected override bool AvoidDrawingNearCursor => !disjointTrail;
+        protected override bool AvoidDrawingNearCursor => !DisjointTrail;
 
         protected override void Update()
         {
             base.Update();
 
-            if (!disjointTrail || !currentPosition.HasValue)
+            if (!DisjointTrail || !currentPosition.HasValue)
                 return;
 
             if (Time.Current - lastTrailTime >= disjoint_trail_time_separation)
@@ -81,7 +86,7 @@ protected override void Update()
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            if (!disjointTrail)
+            if (!DisjointTrail)
                 return base.OnMouseMove(e);
 
             currentPosition = e.ScreenSpaceMousePosition;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 4933eb404179..93c345090411 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -8,7 +8,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -37,7 +36,7 @@ public partial class OsuPlayfield : Playfield
 
         // For osu! gameplay, everything is always on screen.
         // Skipping masking calculations improves performance in intense beatmaps (ie. https://osu.ppy.sh/beatmapsets/150945#osu/372245)
-        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => false;
+        public override bool UpdateSubTreeMasking() => false;
 
         public SmokeContainer Smoke { get; }
         public FollowPointRenderer FollowPoints { get; }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index adc7bd97ff8c..a04ea806403e 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -1,8 +1,6 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
@@ -12,6 +10,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osuTK.Graphics;
 
@@ -19,15 +18,18 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public partial class OsuResumeOverlay : ResumeOverlay
     {
-        private Container cursorScaleContainer;
-        private OsuClickToResumeCursor clickToResumeCursor;
+        private Container cursorScaleContainer = null!;
+        private OsuClickToResumeCursor clickToResumeCursor = null!;
 
-        private OsuCursorContainer localCursorContainer;
+        private OsuCursorContainer? localCursorContainer;
 
-        public override CursorContainer LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
+        public override CursorContainer? LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
 
         protected override LocalisableString Message => "Click the orange cursor to resume";
 
+        [Resolved]
+        private DrawableRuleset? drawableRuleset { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -40,7 +42,7 @@ private void load()
         protected override void PopIn()
         {
             // Can't display if the cursor is outside the window.
-            if (GameplayCursor.LastFrameState == Visibility.Hidden || !Contains(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre))
+            if (GameplayCursor.LastFrameState == Visibility.Hidden || drawableRuleset?.Contains(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre) == false)
             {
                 Resume();
                 return;
@@ -71,8 +73,8 @@ public partial class OsuClickToResumeCursor : OsuCursor, IKeyBindingHandler<OsuA
         {
             public override bool HandlePositionalInput => true;
 
-            public Action ResumeRequested;
-            private Container scaleTransitionContainer;
+            public Action? ResumeRequested;
+            private Container scaleTransitionContainer = null!;
 
             public OsuClickToResumeCursor()
             {
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
index 3c7a97c864e0..217bb8139c1a 100644
--- a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
@@ -26,12 +26,5 @@ protected override void LoadComplete()
 
             ShowSpeedChanges.BindValueChanged(showChanges => VisualisationMethod = showChanges.NewValue ? ScrollVisualisationMethod.Overlapping : ScrollVisualisationMethod.Constant, true);
         }
-
-        protected override double ComputeTimeRange()
-        {
-            // Adjust when we're using constant algorithm to not be sluggish.
-            double multiplier = ShowSpeedChanges.Value ? 1 : 4;
-            return base.ComputeTimeRange() / multiplier;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModConstantSpeed.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModConstantSpeed.cs
new file mode 100644
index 000000000000..81973e65ccb4
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModConstantSpeed.cs
@@ -0,0 +1,29 @@
+// 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.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModConstantSpeed : Mod, IApplicableToDrawableRuleset<TaikoHitObject>
+    {
+        public override string Name => "Constant Speed";
+        public override string Acronym => "CS";
+        public override double ScoreMultiplier => 0.9;
+        public override LocalisableString Description => "No more tricky speed changes!";
+        public override IconUsage? Icon => FontAwesome.Solid.Equals;
+        public override ModType Type => ModType.Conversion;
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
+        {
+            var taikoRuleset = (DrawableTaikoRuleset)drawableRuleset;
+            taikoRuleset.VisualisationMethod = ScrollVisualisationMethod.Constant;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs
index 623243e9e157..9877efa12797 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyKiaiGlow.cs
@@ -30,7 +30,7 @@ private void load(ISkinSource skin, HealthProcessor? healthProcessor)
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
                 Alpha = 0,
-                Scale = new Vector2(0.7f),
+                Scale = new Vector2(TaikoLegacyHitTarget.SCALE),
                 Colour = new Colour4(255, 228, 0, 255),
             };
 
@@ -58,8 +58,8 @@ private void onNewJudgement(JudgementResult result)
             if (!result.IsHit || !isKiaiActive)
                 return;
 
-            sprite.ScaleTo(0.85f).Then()
-                  .ScaleTo(0.7f, 80, Easing.OutQuad);
+            sprite.ScaleTo(TaikoLegacyHitTarget.SCALE + 0.15f).Then()
+                  .ScaleTo(TaikoLegacyHitTarget.SCALE, 80, Easing.OutQuad);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
index 0b43f1c8453d..2a008d81d971 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacyHitTarget.cs
@@ -12,6 +12,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public partial class TaikoLegacyHitTarget : CompositeDrawable
     {
+        /// <summary>
+        /// In stable this is 0.7f (see https://github.com/peppy/osu-stable-reference/blob/7519cafd1823f1879c0d9c991ba0e5c7fd3bfa02/osu!/GameModes/Play/Rulesets/Taiko/RulesetTaiko.cs#L592)
+        /// but for whatever reason this doesn't match visually.
+        /// </summary>
+        public const float SCALE = 0.8f;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
@@ -22,7 +28,7 @@ private void load(ISkinSource skin)
                 new Sprite
                 {
                     Texture = skin.GetTexture("approachcircle"),
-                    Scale = new Vector2(0.83f),
+                    Scale = new Vector2(SCALE + 0.03f),
                     Alpha = 0.47f, // eyeballed to match stable
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -30,7 +36,7 @@ private void load(ISkinSource skin)
                 new Sprite
                 {
                     Texture = skin.GetTexture("taikobigcircle"),
-                    Scale = new Vector2(0.8f),
+                    Scale = new Vector2(SCALE),
                     Alpha = 0.22f, // eyeballed to match stable
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index d7184bce60e6..13501c6192bb 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -150,6 +150,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                         new TaikoModClassic(),
                         new TaikoModSwap(),
                         new TaikoModSingleTap(),
+                        new TaikoModConstantSpeed(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponentLookup.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponentLookup.cs
index c35971e9fd24..8841c3d3cade 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponentLookup.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponentLookup.cs
@@ -11,9 +11,5 @@ public TaikoSkinComponentLookup(TaikoSkinComponents component)
             : base(component)
         {
         }
-
-        protected override string RulesetPrefix => TaikoRuleset.SHORT_NAME;
-
-        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index a235c08b8439..64ea9d88cdae 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -82,7 +82,12 @@ protected override void Update()
             TimeRange.Value = ComputeTimeRange();
         }
 
-        protected virtual double ComputeTimeRange() => PlayfieldAdjustmentContainer.ComputeTimeRange();
+        protected virtual double ComputeTimeRange()
+        {
+            // Adjust when we're using constant algorithm to not be sluggish.
+            double multiplier = VisualisationMethod == ScrollVisualisationMethod.Constant ? 4 * Beatmap.Difficulty.SliderMultiplier : 1;
+            return PlayfieldAdjustmentContainer.ComputeTimeRange() / multiplier;
+        }
 
         protected override void UpdateAfterChildren()
         {
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 0510f0806898..bdcb341fb4ef 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -7,7 +7,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
@@ -345,7 +344,7 @@ private partial class ProxyContainer : LifetimeManagementContainer
         {
             public void Add(Drawable proxy) => AddInternal(proxy);
 
-            public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds)
+            public override bool UpdateSubTreeMasking()
             {
                 // DrawableHitObject disables masking.
                 // Hitobject content is proxied and unproxied based on hit status and the IsMaskedAway value could get stuck because of this.
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 02432a1935ba..a4cd88882396 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1188,5 +1188,36 @@ public void TestSliderConversionWithCustomDistance([Values("taiko", "mania")] st
                 Assert.That(beatmap.HitObjects[0].GetEndTime(), Is.EqualTo(3153));
             }
         }
+
+        [Test]
+        public void TestBeatmapDifficultyIsClamped()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("out-of-range-difficulties.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var decoded = decoder.Decode(stream).Difficulty;
+                Assert.That(decoded.DrainRate, Is.EqualTo(10));
+                Assert.That(decoded.CircleSize, Is.EqualTo(10));
+                Assert.That(decoded.OverallDifficulty, Is.EqualTo(10));
+                Assert.That(decoded.ApproachRate, Is.EqualTo(10));
+                Assert.That(decoded.SliderMultiplier, Is.EqualTo(3.6));
+                Assert.That(decoded.SliderTickRate, Is.EqualTo(8));
+            }
+        }
+
+        [Test]
+        public void TestManiaBeatmapDifficultyCircleSizeClamp()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("out-of-range-difficulties-mania.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var decoded = decoder.Decode(stream).Difficulty;
+                Assert.That(decoded.CircleSize, Is.EqualTo(14));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index e847b61fbee0..b9318968985b 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -25,6 +25,7 @@
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Skinning;
+using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
 using osuTK;
 
@@ -37,6 +38,22 @@ public class LegacyBeatmapEncoderTest
 
         private static IEnumerable<string> allBeatmaps = beatmaps_resource_store.GetAvailableResources().Where(res => res.EndsWith(".osu", StringComparison.Ordinal));
 
+        [Test]
+        public void TestUnsupportedStoryboardEvents()
+        {
+            const string name = "Resources/storyboard_only_video.osu";
+
+            var decoded = decodeFromLegacy(beatmaps_resource_store.GetStream(name), name);
+            Assert.That(decoded.beatmap.UnhandledEventLines.Count, Is.EqualTo(1));
+            Assert.That(decoded.beatmap.UnhandledEventLines.Single(), Is.EqualTo("Video,0,\"video.avi\""));
+
+            var memoryStream = encodeToLegacy(decoded);
+
+            var storyboard = new LegacyStoryboardDecoder().Decode(new LineBufferedReader(memoryStream));
+            StoryboardLayer video = storyboard.Layers.Single(l => l.Name == "Video");
+            Assert.That(video.Elements.Count, Is.EqualTo(1));
+        }
+
         [TestCaseSource(nameof(allBeatmaps))]
         public void TestEncodeDecodeStability(string name)
         {
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index 43e471320e6f..c986a48d8d57 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -14,6 +14,7 @@
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.IO.Legacy;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
@@ -31,6 +32,7 @@
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Beatmaps.Formats
 {
@@ -224,6 +226,12 @@ public void TestSoloScoreData()
                 new OsuModDoubleTime { SpeedChange = { Value = 1.1 } }
             };
             scoreInfo.OnlineID = 123123;
+            scoreInfo.User = new APIUser
+            {
+                Username = "spaceman_atlas",
+                Id = 3035836,
+                CountryCode = CountryCode.PL
+            };
             scoreInfo.ClientVersion = "2023.1221.0";
 
             var beatmap = new TestBeatmap(ruleset);
@@ -248,6 +256,7 @@ public void TestSoloScoreData()
                 Assert.That(decodedAfterEncode.ScoreInfo.MaximumStatistics, Is.EqualTo(scoreInfo.MaximumStatistics));
                 Assert.That(decodedAfterEncode.ScoreInfo.Mods, Is.EqualTo(scoreInfo.Mods));
                 Assert.That(decodedAfterEncode.ScoreInfo.ClientVersion, Is.EqualTo("2023.1221.0"));
+                Assert.That(decodedAfterEncode.ScoreInfo.RealmUser.OnlineID, Is.EqualTo(3035836));
             });
         }
 
@@ -352,6 +361,7 @@ public void AccuracyRankAndTotalScoreOfLazerScorePreserved()
                 [HitResult.Great] = 200,
                 [HitResult.LargeTickHit] = 1,
             };
+            scoreInfo.Rank = ScoreRank.A;
 
             var beatmap = new TestBeatmap(ruleset);
             var score = new Score
@@ -412,6 +422,80 @@ public void AccuracyAndRankOfLazerScoreWithoutLegacyReplaySoloScoreInfoUsesBestE
             });
         }
 
+        [Test]
+        public void TestTotalScoreWithoutModsReadIfPresent()
+        {
+            var ruleset = new OsuRuleset().RulesetInfo;
+
+            var scoreInfo = TestResources.CreateTestScoreInfo(ruleset);
+            scoreInfo.Mods = new Mod[]
+            {
+                new OsuModDoubleTime { SpeedChange = { Value = 1.1 } }
+            };
+            scoreInfo.OnlineID = 123123;
+            scoreInfo.ClientVersion = "2023.1221.0";
+            scoreInfo.TotalScoreWithoutMods = 1_000_000;
+            scoreInfo.TotalScore = 1_020_000;
+
+            var beatmap = new TestBeatmap(ruleset);
+            var score = new Score
+            {
+                ScoreInfo = scoreInfo,
+                Replay = new Replay
+                {
+                    Frames = new List<ReplayFrame>
+                    {
+                        new OsuReplayFrame(2000, OsuPlayfield.BASE_SIZE / 2, OsuAction.LeftButton)
+                    }
+                }
+            };
+
+            var decodedAfterEncode = encodeThenDecode(LegacyBeatmapDecoder.LATEST_VERSION, score, beatmap);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(decodedAfterEncode.ScoreInfo.TotalScoreWithoutMods, Is.EqualTo(1_000_000));
+                Assert.That(decodedAfterEncode.ScoreInfo.TotalScore, Is.EqualTo(1_020_000));
+            });
+        }
+
+        [Test]
+        public void TestTotalScoreWithoutModsBackwardsPopulatedIfMissing()
+        {
+            var ruleset = new OsuRuleset().RulesetInfo;
+
+            var scoreInfo = TestResources.CreateTestScoreInfo(ruleset);
+            scoreInfo.Mods = new Mod[]
+            {
+                new OsuModDoubleTime { SpeedChange = { Value = 1.1 } }
+            };
+            scoreInfo.OnlineID = 123123;
+            scoreInfo.ClientVersion = "2023.1221.0";
+            scoreInfo.TotalScoreWithoutMods = 0;
+            scoreInfo.TotalScore = 1_020_000;
+
+            var beatmap = new TestBeatmap(ruleset);
+            var score = new Score
+            {
+                ScoreInfo = scoreInfo,
+                Replay = new Replay
+                {
+                    Frames = new List<ReplayFrame>
+                    {
+                        new OsuReplayFrame(2000, OsuPlayfield.BASE_SIZE / 2, OsuAction.LeftButton)
+                    }
+                }
+            };
+
+            var decodedAfterEncode = encodeThenDecode(LegacyBeatmapDecoder.LATEST_VERSION, score, beatmap);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(decodedAfterEncode.ScoreInfo.TotalScoreWithoutMods, Is.EqualTo(1_000_000));
+                Assert.That(decodedAfterEncode.ScoreInfo.TotalScore, Is.EqualTo(1_020_000));
+            });
+        }
+
         private static Score encodeThenDecode(int beatmapVersion, Score score, TestBeatmap beatmap)
         {
             var encodeStream = new MemoryStream();
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreEncoderTest.cs
index 806f538249fa..1e57bd76cf6f 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreEncoderTest.cs
@@ -20,7 +20,7 @@ public class LegacyScoreEncoderTest
         [TestCase(1, 3)]
         [TestCase(1, 0)]
         [TestCase(0, 3)]
-        public void CatchMergesFruitAndDropletMisses(int missCount, int largeTickMissCount)
+        public void TestCatchMergesFruitAndDropletMisses(int missCount, int largeTickMissCount)
         {
             var ruleset = new CatchRuleset().RulesetInfo;
             var scoreInfo = TestResources.CreateTestScoreInfo(ruleset);
@@ -41,7 +41,22 @@ public void CatchMergesFruitAndDropletMisses(int missCount, int largeTickMissCou
         }
 
         [Test]
-        public void ScoreWithMissIsNotPerfect()
+        public void TestFailPreserved()
+        {
+            var ruleset = new OsuRuleset().RulesetInfo;
+            var scoreInfo = TestResources.CreateTestScoreInfo();
+            var beatmap = new TestBeatmap(ruleset);
+
+            scoreInfo.Rank = ScoreRank.F;
+
+            var score = new Score { ScoreInfo = scoreInfo };
+            var decodedAfterEncode = encodeThenDecode(LegacyBeatmapDecoder.LATEST_VERSION, score, beatmap);
+
+            Assert.That(decodedAfterEncode.ScoreInfo.Rank, Is.EqualTo(ScoreRank.F));
+        }
+
+        [Test]
+        public void TestScoreWithMissIsNotPerfect()
         {
             var ruleset = new OsuRuleset().RulesetInfo;
             var scoreInfo = TestResources.CreateTestScoreInfo(ruleset);
diff --git a/osu.Game.Tests/Editing/Checks/CheckHitsoundsFormatTest.cs b/osu.Game.Tests/Editing/Checks/CheckHitsoundsFormatTest.cs
new file mode 100644
index 000000000000..cb1cf21734ee
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckHitsoundsFormatTest.cs
@@ -0,0 +1,128 @@
+// 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.IO;
+using System.Linq;
+using ManagedBass;
+using Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osuTK.Audio;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckHitsoundsFormatTest
+    {
+        private CheckHitsoundsFormat check = null!;
+
+        private IBeatmap beatmap = null!;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckHitsoundsFormat();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = { CheckTestHelpers.CreateMockFile("wav") }
+                    }
+                }
+            };
+
+            // 0 = No output device. This still allows decoding.
+            if (!Bass.Init(0) && Bass.LastError != Errors.Already)
+                throw new AudioException("Could not initialize Bass.");
+        }
+
+        [Test]
+        public void TestMp3Audio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/test-sample-cut.mp3"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckHitsoundsFormat.IssueTemplateIncorrectFormat);
+            }
+        }
+
+        [Test]
+        public void TestOggAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/test-sample.ogg"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(0));
+            }
+        }
+
+        [Test]
+        public void TestWavAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/hitsound-delay.wav"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(0));
+            }
+        }
+
+        [Test]
+        public void TestWebmAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/test-sample.webm"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckHitsoundsFormat.IssueTemplateFormatUnsupported);
+            }
+        }
+
+        [Test]
+        public void TestNotAnAudioFile()
+        {
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = { CheckTestHelpers.CreateMockFile("png") }
+                    }
+                }
+            };
+
+            using (var resourceStream = TestResources.OpenResource("Textures/test-image.png"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(0));
+            }
+        }
+
+        [Test]
+        public void TestCorruptAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/corrupt.wav"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckHitsoundsFormat.IssueTemplateFormatUnsupported);
+            }
+        }
+
+        private BeatmapVerifierContext getContext(Stream? resourceStream)
+        {
+            var mockWorkingBeatmap = new Mock<TestWorkingBeatmap>(beatmap, null, null);
+            mockWorkingBeatmap.Setup(w => w.GetStream(It.IsAny<string>())).Returns(resourceStream);
+
+            return new BeatmapVerifierContext(beatmap, mockWorkingBeatmap.Object);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Editing/Checks/CheckSongFormatTest.cs b/osu.Game.Tests/Editing/Checks/CheckSongFormatTest.cs
new file mode 100644
index 000000000000..98a4e1f9e95b
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckSongFormatTest.cs
@@ -0,0 +1,112 @@
+// 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.IO;
+using System.Linq;
+using ManagedBass;
+using Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osuTK.Audio;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public partial class CheckSongFormatTest
+    {
+        private CheckSongFormat check = null!;
+
+        private IBeatmap beatmap = null!;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckSongFormat();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = { CheckTestHelpers.CreateMockFile("mp3") }
+                    }
+                }
+            };
+
+            // 0 = No output device. This still allows decoding.
+            if (!Bass.Init(0) && Bass.LastError != Errors.Already)
+                throw new AudioException("Could not initialize Bass.");
+        }
+
+        [Test]
+        public void TestMp3Audio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/test-sample-cut.mp3"))
+            {
+                beatmap.Metadata.AudioFile = "abc123.mp3";
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(0));
+            }
+        }
+
+        [Test]
+        public void TestOggAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/test-sample.ogg"))
+            {
+                beatmap.Metadata.AudioFile = "abc123.mp3";
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(0));
+            }
+        }
+
+        [Test]
+        public void TestWavAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/hitsound-delay.wav"))
+            {
+                beatmap.Metadata.AudioFile = "abc123.mp3";
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckSongFormat.IssueTemplateIncorrectFormat);
+            }
+        }
+
+        [Test]
+        public void TestWebmAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/test-sample.webm"))
+            {
+                beatmap.Metadata.AudioFile = "abc123.mp3";
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckSongFormat.IssueTemplateFormatUnsupported);
+            }
+        }
+
+        [Test]
+        public void TestCorruptAudio()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/corrupt.wav"))
+            {
+                beatmap.Metadata.AudioFile = "abc123.mp3";
+                var issues = check.Run(getContext(resourceStream)).ToList();
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckSongFormat.IssueTemplateFormatUnsupported);
+            }
+        }
+
+        private BeatmapVerifierContext getContext(Stream? resourceStream)
+        {
+            var mockWorkingBeatmap = new Mock<TestWorkingBeatmap>(beatmap, null, null);
+            mockWorkingBeatmap.Setup(w => w.GetStream(It.IsAny<string>())).Returns(resourceStream);
+
+            return new BeatmapVerifierContext(beatmap, mockWorkingBeatmap.Object);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Editing/Checks/CheckTooShortAudioFilesTest.cs b/osu.Game.Tests/Editing/Checks/CheckTooShortAudioFilesTest.cs
index 491836946028..b646e639556f 100644
--- a/osu.Game.Tests/Editing/Checks/CheckTooShortAudioFilesTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckTooShortAudioFilesTest.cs
@@ -95,18 +95,6 @@ public void TestMissingAudioFile()
             }
         }
 
-        [Test]
-        public void TestCorruptAudioFile()
-        {
-            using (var resourceStream = TestResources.OpenResource("Samples/corrupt.wav"))
-            {
-                var issues = check.Run(getContext(resourceStream)).ToList();
-
-                Assert.That(issues, Has.Count.EqualTo(1));
-                Assert.That(issues.Single().Template is CheckTooShortAudioFiles.IssueTemplateBadFormat);
-            }
-        }
-
         private BeatmapVerifierContext getContext(Stream? resourceStream)
         {
             var mockWorkingBeatmap = new Mock<TestWorkingBeatmap>(beatmap, null, null);
diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index c7a32ebbc4a6..10e0e46f4c5d 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -1,10 +1,13 @@
 // 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.Generic;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Filter;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
@@ -309,8 +312,10 @@ public CustomCriteria(bool shouldMatch)
                 match = shouldMatch;
             }
 
-            public bool Matches(BeatmapInfo beatmapInfo) => match;
+            public bool Matches(BeatmapInfo beatmapInfo, FilterCriteria criteria) => match;
             public bool TryParseCustomKeywordCriteria(string key, Operator op, string value) => false;
+
+            public bool FilterMayChangeFromMods(ValueChangedEvent<IReadOnlyList<Mod>> mods) => false;
         }
     }
 }
diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index ea14412f5567..7897b3d8c0f9 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Filter;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
@@ -502,7 +505,7 @@ private class CustomFilterCriteria : IRulesetFilterCriteria
         {
             public string? CustomValue { get; set; }
 
-            public bool Matches(BeatmapInfo beatmapInfo) => true;
+            public bool Matches(BeatmapInfo beatmapInfo, FilterCriteria criteria) => true;
 
             public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
             {
@@ -514,6 +517,8 @@ public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
 
                 return false;
             }
+
+            public bool FilterMayChangeFromMods(ValueChangedEvent<IReadOnlyList<Mod>> mods) => false;
         }
 
         private static readonly object[] correct_date_query_examples =
diff --git a/osu.Game.Tests/NonVisual/TestSceneTimedDifficultyCalculation.cs b/osu.Game.Tests/NonVisual/TestSceneTimedDifficultyCalculation.cs
new file mode 100644
index 000000000000..1a75f735ef95
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/TestSceneTimedDifficultyCalculation.cs
@@ -0,0 +1,235 @@
+// 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.Linq;
+using System.Threading;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class TestSceneTimedDifficultyCalculation
+    {
+        [Test]
+        public void TestAttributesGeneratedForAllNonSkippedObjects()
+        {
+            var beatmap = new Beatmap<TestHitObject>
+            {
+                HitObjects =
+                {
+                    new TestHitObject { StartTime = 1 },
+                    new TestHitObject
+                    {
+                        StartTime = 2,
+                        Nested = 1
+                    },
+                    new TestHitObject { StartTime = 3 },
+                }
+            };
+
+            List<TimedDifficultyAttributes> attribs = new TestDifficultyCalculator(new TestWorkingBeatmap(beatmap)).CalculateTimed();
+
+            Assert.That(attribs.Count, Is.EqualTo(4));
+            assertEquals(attribs[0], beatmap.HitObjects[0]);
+            assertEquals(attribs[1], beatmap.HitObjects[0], beatmap.HitObjects[1]);
+            assertEquals(attribs[2], beatmap.HitObjects[0], beatmap.HitObjects[1]); // From the nested object.
+            assertEquals(attribs[3], beatmap.HitObjects[0], beatmap.HitObjects[1], beatmap.HitObjects[2]);
+        }
+
+        [Test]
+        public void TestAttributesNotGeneratedForSkippedObjects()
+        {
+            var beatmap = new Beatmap<TestHitObject>
+            {
+                HitObjects =
+                {
+                    // The first object is usually skipped in all implementations
+                    new TestHitObject
+                    {
+                        StartTime = 1,
+                        Skip = true
+                    },
+                    // An intermediate skipped object.
+                    new TestHitObject
+                    {
+                        StartTime = 2,
+                        Skip = true
+                    },
+                    new TestHitObject { StartTime = 3 },
+                }
+            };
+
+            List<TimedDifficultyAttributes> attribs = new TestDifficultyCalculator(new TestWorkingBeatmap(beatmap)).CalculateTimed();
+
+            Assert.That(attribs.Count, Is.EqualTo(1));
+            assertEquals(attribs[0], beatmap.HitObjects[0], beatmap.HitObjects[1], beatmap.HitObjects[2]);
+        }
+
+        [Test]
+        public void TestNestedObjectOnlyAddsParentOnce()
+        {
+            var beatmap = new Beatmap<TestHitObject>
+            {
+                HitObjects =
+                {
+                    new TestHitObject
+                    {
+                        StartTime = 1,
+                        Skip = true,
+                        Nested = 2
+                    },
+                }
+            };
+
+            List<TimedDifficultyAttributes> attribs = new TestDifficultyCalculator(new TestWorkingBeatmap(beatmap)).CalculateTimed();
+
+            Assert.That(attribs.Count, Is.EqualTo(2));
+            assertEquals(attribs[0], beatmap.HitObjects[0]);
+            assertEquals(attribs[1], beatmap.HitObjects[0]);
+        }
+
+        [Test]
+        public void TestSkippedLastObjectAddedInLastIteration()
+        {
+            var beatmap = new Beatmap<TestHitObject>
+            {
+                HitObjects =
+                {
+                    new TestHitObject { StartTime = 1 },
+                    new TestHitObject
+                    {
+                        StartTime = 2,
+                        Skip = true
+                    },
+                    new TestHitObject
+                    {
+                        StartTime = 3,
+                        Skip = true
+                    },
+                }
+            };
+
+            List<TimedDifficultyAttributes> attribs = new TestDifficultyCalculator(new TestWorkingBeatmap(beatmap)).CalculateTimed();
+
+            Assert.That(attribs.Count, Is.EqualTo(1));
+            assertEquals(attribs[0], beatmap.HitObjects[0], beatmap.HitObjects[1], beatmap.HitObjects[2]);
+        }
+
+        private void assertEquals(TimedDifficultyAttributes attribs, params HitObject[] expected)
+        {
+            Assert.That(((TestDifficultyAttributes)attribs.Attributes).Objects, Is.EquivalentTo(expected));
+        }
+
+        private class TestHitObject : HitObject
+        {
+            /// <summary>
+            /// Whether to skip generating a difficulty representation for this object.
+            /// </summary>
+            public bool Skip { get; set; }
+
+            /// <summary>
+            /// Whether to generate nested difficulty representations for this object, and if so, how many.
+            /// </summary>
+            public int Nested { get; set; }
+
+            protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+            {
+                for (int i = 0; i < Nested; i++)
+                    AddNested(new TestHitObject { StartTime = StartTime + 0.1 * i });
+            }
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) => Enumerable.Empty<Mod>();
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => throw new NotImplementedException();
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new PassThroughBeatmapConverter(beatmap);
+
+            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new TestDifficultyCalculator(beatmap);
+
+            public override string Description => string.Empty;
+            public override string ShortName => string.Empty;
+
+            private class PassThroughBeatmapConverter : IBeatmapConverter
+            {
+                public event Action<HitObject, IEnumerable<HitObject>>? ObjectConverted
+                {
+                    add { }
+                    remove { }
+                }
+
+                public IBeatmap Beatmap { get; }
+
+                public PassThroughBeatmapConverter(IBeatmap beatmap)
+                {
+                    Beatmap = beatmap;
+                }
+
+                public bool CanConvert() => true;
+
+                public IBeatmap Convert(CancellationToken cancellationToken = default) => Beatmap;
+            }
+        }
+
+        private class TestDifficultyCalculator : DifficultyCalculator
+        {
+            public TestDifficultyCalculator(IWorkingBeatmap beatmap)
+                : base(new TestRuleset().RulesetInfo, beatmap)
+            {
+            }
+
+            protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+                => new TestDifficultyAttributes { Objects = beatmap.HitObjects.ToArray() };
+
+            protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
+            {
+                List<DifficultyHitObject> objects = new List<DifficultyHitObject>();
+
+                foreach (var obj in beatmap.HitObjects.OfType<TestHitObject>())
+                {
+                    if (!obj.Skip)
+                        objects.Add(new DifficultyHitObject(obj, obj, clockRate, objects, objects.Count));
+
+                    foreach (var nested in obj.NestedHitObjects)
+                        objects.Add(new DifficultyHitObject(nested, nested, clockRate, objects, objects.Count));
+                }
+
+                return objects;
+            }
+
+            protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => new Skill[] { new PassThroughSkill(mods) };
+
+            private class PassThroughSkill : Skill
+            {
+                public PassThroughSkill(Mod[] mods)
+                    : base(mods)
+                {
+                }
+
+                public override void Process(DifficultyHitObject current)
+                {
+                }
+
+                public override double DifficultyValue() => 1;
+            }
+        }
+
+        private class TestDifficultyAttributes : DifficultyAttributes
+        {
+            public HitObject[] Objects = Array.Empty<HitObject>();
+        }
+    }
+}
diff --git a/osu.Game.Tests/Resources/Archives/japanese-filename.osz b/osu.Game.Tests/Resources/Archives/japanese-filename.osz
new file mode 100644
index 000000000000..4825c88179bb
Binary files /dev/null and b/osu.Game.Tests/Resources/Archives/japanese-filename.osz differ
diff --git a/osu.Game.Tests/Resources/Samples/test-sample.ogg b/osu.Game.Tests/Resources/Samples/test-sample.ogg
new file mode 100644
index 000000000000..b33119cfaf89
Binary files /dev/null and b/osu.Game.Tests/Resources/Samples/test-sample.ogg differ
diff --git a/osu.Game.Tests/Resources/Samples/test-sample.webm b/osu.Game.Tests/Resources/Samples/test-sample.webm
new file mode 100644
index 000000000000..3964d248f4dc
Binary files /dev/null and b/osu.Game.Tests/Resources/Samples/test-sample.webm differ
diff --git a/osu.Game.Tests/Resources/out-of-range-difficulties-mania.osu b/osu.Game.Tests/Resources/out-of-range-difficulties-mania.osu
new file mode 100644
index 000000000000..7dc2e51ad963
--- /dev/null
+++ b/osu.Game.Tests/Resources/out-of-range-difficulties-mania.osu
@@ -0,0 +1,5 @@
+[General]
+Mode: 3
+
+[Difficulty]
+CircleSize:14
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/out-of-range-difficulties.osu b/osu.Game.Tests/Resources/out-of-range-difficulties.osu
new file mode 100644
index 000000000000..5029395614eb
--- /dev/null
+++ b/osu.Game.Tests/Resources/out-of-range-difficulties.osu
@@ -0,0 +1,10 @@
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:25
+CircleSize:25
+OverallDifficulty:25
+ApproachRate:30
+SliderMultiplier:30
+SliderTickRate:30
\ No newline at end of file
diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index ebbc329b9da0..9c72804a6bc8 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -15,6 +15,7 @@
 using osu.Game.Database;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -23,6 +24,7 @@
 using osu.Game.Scoring;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Scores.IO
 {
@@ -284,6 +286,272 @@ public void TestOnlineScoreIsAvailableLocally()
             }
         }
 
+        [Test]
+        public void TestUserLookedUpByUsernameForOnlineScoreIfUserIDMissing()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    var api = (DummyAPIAccess)osu.API;
+                    api.HandleRequest = req =>
+                    {
+                        switch (req)
+                        {
+                            case GetUserRequest userRequest:
+                                if (userRequest.Lookup != "Test user")
+                                    return false;
+
+                                userRequest.TriggerSuccess(new APIUser
+                                {
+                                    Username = "Test user",
+                                    CountryCode = CountryCode.JP,
+                                    Id = 1234
+                                });
+                                return true;
+
+                            default:
+                                return false;
+                        }
+                    };
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser { Username = "Test user" },
+                        Date = DateTimeOffset.Now,
+                        OnlineID = 12345,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmap.Beatmaps.First()
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+                    Assert.AreEqual(toImport.User.Username, imported.RealmUser.Username);
+                    Assert.AreEqual(1234, imported.RealmUser.OnlineID);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestUserLookedUpByUsernameForLegacyOnlineScore()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    var api = (DummyAPIAccess)osu.API;
+                    api.HandleRequest = req =>
+                    {
+                        switch (req)
+                        {
+                            case GetUserRequest userRequest:
+                                if (userRequest.Lookup != "Test user")
+                                    return false;
+
+                                userRequest.TriggerSuccess(new APIUser
+                                {
+                                    Username = "Test user",
+                                    CountryCode = CountryCode.JP,
+                                    Id = 1234
+                                });
+                                return true;
+
+                            default:
+                                return false;
+                        }
+                    };
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser { Username = "Test user" },
+                        Date = DateTimeOffset.Now,
+                        LegacyOnlineID = 12345,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmap.Beatmaps.First()
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+                    Assert.AreEqual(toImport.User.Username, imported.RealmUser.Username);
+                    Assert.AreEqual(1234, imported.RealmUser.OnlineID);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestUserNotLookedUpForOfflineScoreIfUserIDMissing()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    var api = (DummyAPIAccess)osu.API;
+                    api.HandleRequest = req =>
+                    {
+                        switch (req)
+                        {
+                            case GetUserRequest userRequest:
+                                if (userRequest.Lookup != "Test user")
+                                    return false;
+
+                                userRequest.TriggerSuccess(new APIUser
+                                {
+                                    Username = "Test user",
+                                    CountryCode = CountryCode.JP,
+                                    Id = 1234
+                                });
+                                return true;
+
+                            default:
+                                return false;
+                        }
+                    };
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser { Username = "Test user" },
+                        Date = DateTimeOffset.Now,
+                        OnlineID = -1,
+                        LegacyOnlineID = -1,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmap.Beatmaps.First()
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+                    Assert.AreEqual(toImport.User.Username, imported.RealmUser.Username);
+                    Assert.That(imported.RealmUser.OnlineID, Is.LessThanOrEqualTo(1));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public void TestUserLookedUpByOnlineIDIfPresent([Values] bool isOnlineScore)
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    var api = (DummyAPIAccess)osu.API;
+                    api.HandleRequest = req =>
+                    {
+                        switch (req)
+                        {
+                            case GetUserRequest userRequest:
+                                if (userRequest.Lookup != "5555")
+                                    return false;
+
+                                userRequest.TriggerSuccess(new APIUser
+                                {
+                                    Username = "Some other guy",
+                                    CountryCode = CountryCode.DE,
+                                    Id = 5555
+                                });
+                                return true;
+
+                            default:
+                                return false;
+                        }
+                    };
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser { Id = 5555 },
+                        Date = DateTimeOffset.Now,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmap.Beatmaps.First()
+                    };
+                    if (isOnlineScore)
+                        toImport.OnlineID = 12345;
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+                    Assert.AreEqual("Some other guy", imported.RealmUser.Username);
+                    Assert.AreEqual(5555, imported.RealmUser.OnlineID);
+                    Assert.AreEqual(CountryCode.DE, imported.RealmUser.CountryCode);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         public static ScoreInfo LoadScoreIntoOsu(OsuGameBase osu, ScoreInfo score, ArchiveReader archive = null)
         {
             // clone to avoid attaching the input score to realm.
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
index d9212386c34c..5086b644331a 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -1,6 +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 System.IO;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
@@ -12,6 +13,7 @@
 using osu.Game.Database;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
+using MemoryStream = System.IO.MemoryStream;
 
 namespace osu.Game.Tests.Skins
 {
@@ -21,6 +23,52 @@ public partial class TestSceneBeatmapSkinResources : OsuTestScene
         [Resolved]
         private BeatmapManager beatmaps { get; set; } = null!;
 
+        [Test]
+        public void TestRetrieveAndLegacyExportJapaneseFilename()
+        {
+            IWorkingBeatmap beatmap = null!;
+            MemoryStream outStream = null!;
+
+            // Ensure importer encoding is correct
+            AddStep("import beatmap", () => beatmap = importBeatmapFromArchives(@"japanese-filename.osz"));
+            AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo(@"見本")) != null);
+
+            // Ensure exporter encoding is correct (round trip)
+            AddStep("export", () =>
+            {
+                outStream = new MemoryStream();
+
+                new LegacyBeatmapExporter(LocalStorage)
+                    .ExportToStream((BeatmapSetInfo)beatmap.BeatmapInfo.BeatmapSet!, outStream, null);
+            });
+
+            AddStep("import beatmap again", () => beatmap = importBeatmapFromStream(outStream));
+            AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo(@"見本")) != null);
+        }
+
+        [Test]
+        public void TestRetrieveAndNonLegacyExportJapaneseFilename()
+        {
+            IWorkingBeatmap beatmap = null!;
+            MemoryStream outStream = null!;
+
+            // Ensure importer encoding is correct
+            AddStep("import beatmap", () => beatmap = importBeatmapFromArchives(@"japanese-filename.osz"));
+            AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo(@"見本")) != null);
+
+            // Ensure exporter encoding is correct (round trip)
+            AddStep("export", () =>
+            {
+                outStream = new MemoryStream();
+
+                new BeatmapExporter(LocalStorage)
+                    .ExportToStream((BeatmapSetInfo)beatmap.BeatmapInfo.BeatmapSet!, outStream, null);
+            });
+
+            AddStep("import beatmap again", () => beatmap = importBeatmapFromStream(outStream));
+            AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo(@"見本")) != null);
+        }
+
         [Test]
         public void TestRetrieveOggAudio()
         {
@@ -45,6 +93,12 @@ public void TestRetrievalWithConflictingFilenames()
             AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo(@"spinner-osu")) != null);
         }
 
+        private IWorkingBeatmap importBeatmapFromStream(Stream stream)
+        {
+            var imported = beatmaps.Import(new ImportTask(stream, "filename.osz")).GetResultSafely();
+            return imported.AsNonNull().PerformRead(s => beatmaps.GetWorkingBeatmap(s.Beatmaps[0]));
+        }
+
         private IWorkingBeatmap importBeatmapFromArchives(string filename)
         {
             var imported = beatmaps.Import(new ImportTask(TestResources.OpenResource($@"Archives/{filename}"), filename)).GetResultSafely();
diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs
index f44fe2b90c02..f5f9d121cc34 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs
@@ -34,7 +34,7 @@ public void TestThumbnailPreview()
                 var beatmapSet = CreateAPIBeatmapSet(Ruleset.Value);
                 beatmapSet.OnlineID = 241526; // ID hardcoded to ensure that the preview track exists online.
 
-                Child = thumbnail = new BeatmapCardThumbnail(beatmapSet)
+                Child = thumbnail = new BeatmapCardThumbnail(beatmapSet, beatmapSet)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index f6637d0e80a3..6bd6c4a8c4cf 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -10,9 +10,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Input;
 
@@ -26,9 +28,13 @@ public partial class TestSceneComposeSelectBox : OsuManualInputManagerTestScene
         [Cached(typeof(SelectionRotationHandler))]
         private TestSelectionRotationHandler rotationHandler;
 
+        [Cached(typeof(SelectionScaleHandler))]
+        private TestSelectionScaleHandler scaleHandler;
+
         public TestSceneComposeSelectBox()
         {
             rotationHandler = new TestSelectionRotationHandler(() => selectionArea);
+            scaleHandler = new TestSelectionScaleHandler(() => selectionArea);
         }
 
         [SetUp]
@@ -45,13 +51,8 @@ public void SetUp() => Schedule(() =>
                     {
                         RelativeSizeAxes = Axes.Both,
 
-                        CanScaleX = true,
-                        CanScaleY = true,
-                        CanScaleDiagonally = true,
                         CanFlipX = true,
                         CanFlipY = true,
-
-                        OnScale = handleScale
                     }
                 }
             };
@@ -60,27 +61,6 @@ public void SetUp() => Schedule(() =>
             InputManager.ReleaseButton(MouseButton.Left);
         });
 
-        private bool handleScale(Vector2 amount, Anchor reference)
-        {
-            if ((reference & Anchor.y1) == 0)
-            {
-                int directionY = (reference & Anchor.y0) > 0 ? -1 : 1;
-                if (directionY < 0)
-                    selectionArea.Y += amount.Y;
-                selectionArea.Height += directionY * amount.Y;
-            }
-
-            if ((reference & Anchor.x1) == 0)
-            {
-                int directionX = (reference & Anchor.x0) > 0 ? -1 : 1;
-                if (directionX < 0)
-                    selectionArea.X += amount.X;
-                selectionArea.Width += directionX * amount.X;
-            }
-
-            return true;
-        }
-
         private partial class TestSelectionRotationHandler : SelectionRotationHandler
         {
             private readonly Func<Container> getTargetContainer;
@@ -89,7 +69,7 @@ public TestSelectionRotationHandler(Func<Container> getTargetContainer)
             {
                 this.getTargetContainer = getTargetContainer;
 
-                CanRotate.Value = true;
+                CanRotateSelectionOrigin.Value = true;
             }
 
             [CanBeNull]
@@ -125,6 +105,51 @@ public override void Commit()
             }
         }
 
+        private partial class TestSelectionScaleHandler : SelectionScaleHandler
+        {
+            private readonly Func<Container> getTargetContainer;
+
+            public TestSelectionScaleHandler(Func<Container> getTargetContainer)
+            {
+                this.getTargetContainer = getTargetContainer;
+
+                CanScaleX.Value = true;
+                CanScaleY.Value = true;
+                CanScaleDiagonally.Value = true;
+            }
+
+            [CanBeNull]
+            private Container targetContainer;
+
+            public override void Begin()
+            {
+                if (targetContainer != null)
+                    throw new InvalidOperationException($"Cannot {nameof(Begin)} a scale operation while another is in progress!");
+
+                targetContainer = getTargetContainer();
+                OriginalSurroundingQuad = new Quad(targetContainer!.X, targetContainer.Y, targetContainer.Width, targetContainer.Height);
+            }
+
+            public override void Update(Vector2 scale, Vector2? origin = null, Axes adjustAxis = Axes.Both)
+            {
+                if (targetContainer == null)
+                    throw new InvalidOperationException($"Cannot {nameof(Update)} a scale operation without calling {nameof(Begin)} first!");
+
+                Vector2 actualOrigin = origin ?? Vector2.Zero;
+
+                targetContainer.Position = GeometryUtils.GetScaledPosition(scale, actualOrigin, OriginalSurroundingQuad!.Value.TopLeft);
+                targetContainer.Size = OriginalSurroundingQuad!.Value.Size * scale;
+            }
+
+            public override void Commit()
+            {
+                if (targetContainer == null)
+                    throw new InvalidOperationException($"Cannot {nameof(Commit)} a scale operation without calling {nameof(Begin)} first!");
+
+                targetContainer = null;
+            }
+        }
+
         [Test]
         public void TestRotationHandleShownOnHover()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs
index 12e00c448528..d4bd77642ce5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDifficultyDelete.cs
@@ -12,6 +12,7 @@
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Edit;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK.Input;
@@ -83,6 +84,49 @@ public void TestDeleteDifficulties()
             }
         }
 
+        [Test]
+        public void TestDeleteDifficultyWithPendingChanges()
+        {
+            Guid deletedDifficultyID = Guid.Empty;
+            int countBeforeDeletion = 0;
+            string beatmapSetHashBefore = string.Empty;
+
+            AddUntilStep("wait for editor to load", () => Editor?.ReadyForUse == true);
+
+            AddStep("store selected difficulty", () =>
+            {
+                deletedDifficultyID = EditorBeatmap.BeatmapInfo.ID;
+                countBeforeDeletion = Beatmap.Value.BeatmapSetInfo.Beatmaps.Count;
+                beatmapSetHashBefore = Beatmap.Value.BeatmapSetInfo.Hash;
+            });
+
+            AddStep("make change to difficulty", () =>
+            {
+                EditorBeatmap.BeginChange();
+                EditorBeatmap.BeatmapInfo.DifficultyName = "changin' things";
+                EditorBeatmap.EndChange();
+            });
+
+            AddStep("click File", () => this.ChildrenOfType<DrawableOsuMenuItem>().First().TriggerClick());
+
+            AddStep("click delete", () => getDeleteMenuItem().TriggerClick());
+            AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog != null);
+            AddAssert("dialog is deletion confirmation dialog", () => DialogOverlay.CurrentDialog, Is.InstanceOf<DeleteDifficultyConfirmationDialog>);
+            AddStep("confirm", () => InputManager.Key(Key.Number1));
+
+            AddUntilStep("no next dialog", () => DialogOverlay.CurrentDialog == null);
+            AddUntilStep("switched to different difficulty",
+                () => this.ChildrenOfType<EditorBeatmap>().SingleOrDefault() != null && EditorBeatmap.BeatmapInfo.ID != deletedDifficultyID);
+
+            AddAssert("difficulty is unattached from set",
+                () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Select(b => b.ID), () => Does.Not.Contain(deletedDifficultyID));
+            AddAssert("beatmap set difficulty count decreased by one",
+                () => Beatmap.Value.BeatmapSetInfo.Beatmaps.Count, () => Is.EqualTo(countBeforeDeletion - 1));
+            AddAssert("set hash changed", () => Beatmap.Value.BeatmapSetInfo.Hash, () => Is.Not.EqualTo(beatmapSetHashBefore));
+            AddAssert("difficulty is deleted from realm",
+                () => Realm.Run(r => r.Find<BeatmapInfo>(deletedDifficultyID)), () => Is.Null);
+        }
+
         private DrawableOsuMenuItem getDeleteMenuItem() => this.ChildrenOfType<DrawableOsuMenuItem>()
                                                                .Single(item => item.ChildrenOfType<SpriteText>().Any(text => text.Text.ToString().StartsWith("Delete", StringComparison.Ordinal)));
     }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
index 1415ff4b0f00..0e12ed68e4ac 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSampleAdjustments.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using Humanizer;
 using NUnit.Framework;
+using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -396,7 +397,7 @@ private void setBankViaPopover(string bank) => AddStep($"set bank {bank} via pop
             textBox.Current.Value = bank;
             // force a commit via keyboard.
             // this is needed when testing attempting to set empty bank - which should revert to the previous value, but only on commit.
-            InputManager.ChangeFocus(textBox);
+            ((IFocusManager)InputManager).ChangeFocus(textBox);
             InputManager.Key(Key.Enter);
         });
 
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneLabelledTimeSignature.cs b/osu.Game.Tests/Visual/Editing/TestSceneLabelledTimeSignature.cs
index e91596b8728f..3d7d0797d4a7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneLabelledTimeSignature.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneLabelledTimeSignature.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Graphics.UserInterface;
@@ -62,12 +63,12 @@ public void TestChangeNumerator()
             createLabelledTimeSignature(TimeSignature.SimpleQuadruple);
             AddAssert("current is 4/4", () => timeSignature.Current.Value.Equals(TimeSignature.SimpleQuadruple));
 
-            AddStep("focus text box", () => InputManager.ChangeFocus(numeratorTextBox));
+            AddStep("focus text box", () => ((IFocusManager)InputManager).ChangeFocus(numeratorTextBox));
 
             AddStep("set numerator to 7", () => numeratorTextBox.Current.Value = "7");
             AddAssert("current is 4/4", () => timeSignature.Current.Value.Equals(TimeSignature.SimpleQuadruple));
 
-            AddStep("drop focus", () => InputManager.ChangeFocus(null));
+            AddStep("drop focus", () => ((IFocusManager)InputManager).ChangeFocus(null));
             AddAssert("current is 7/4", () => timeSignature.Current.Value.Equals(new TimeSignature(7)));
         }
 
@@ -77,12 +78,12 @@ public void TestInvalidChangeRollbackOnCommit()
             createLabelledTimeSignature(TimeSignature.SimpleQuadruple);
             AddAssert("current is 4/4", () => timeSignature.Current.Value.Equals(TimeSignature.SimpleQuadruple));
 
-            AddStep("focus text box", () => InputManager.ChangeFocus(numeratorTextBox));
+            AddStep("focus text box", () => ((IFocusManager)InputManager).ChangeFocus(numeratorTextBox));
 
             AddStep("set numerator to 0", () => numeratorTextBox.Current.Value = "0");
             AddAssert("current is 4/4", () => timeSignature.Current.Value.Equals(TimeSignature.SimpleQuadruple));
 
-            AddStep("drop focus", () => InputManager.ChangeFocus(null));
+            AddStep("drop focus", () => ((IFocusManager)InputManager).ChangeFocus(null));
             AddAssert("current is 4/4", () => timeSignature.Current.Value.Equals(TimeSignature.SimpleQuadruple));
             AddAssert("numerator is 4", () => numeratorTextBox.Current.Value == "4");
         }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneMetadataSection.cs b/osu.Game.Tests/Visual/Editing/TestSceneMetadataSection.cs
index a9f8e19e3083..8b6f31d599e2 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneMetadataSection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneMetadataSection.cs
@@ -3,17 +3,22 @@
 
 #nullable disable
 
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Setup;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
-    public partial class TestSceneMetadataSection : OsuTestScene
+    public partial class TestSceneMetadataSection : OsuManualInputManagerTestScene
     {
         [Cached]
         private EditorBeatmap editorBeatmap = new EditorBeatmap(new Beatmap
@@ -26,6 +31,81 @@ public partial class TestSceneMetadataSection : OsuTestScene
 
         private TestMetadataSection metadataSection;
 
+        [Test]
+        public void TestUpdateViaTextBoxOnFocusLoss()
+        {
+            AddStep("set metadata", () =>
+            {
+                editorBeatmap.Metadata.Artist = "Example Artist";
+                editorBeatmap.Metadata.ArtistUnicode = string.Empty;
+            });
+
+            createSection();
+
+            TextBox textbox;
+
+            AddStep("focus first textbox", () =>
+            {
+                textbox = metadataSection.ChildrenOfType<TextBox>().First();
+                InputManager.MoveMouseTo(textbox);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("simulate changing textbox", () =>
+            {
+                // Can't simulate text input but this should work.
+                InputManager.Keys(PlatformAction.SelectAll);
+                InputManager.Keys(PlatformAction.Copy);
+                InputManager.Keys(PlatformAction.Paste);
+                InputManager.Keys(PlatformAction.Paste);
+            });
+
+            assertArtistMetadata("Example Artist");
+
+            // It's important values are committed immediately on focus loss so the editor exit sequence detects them.
+            AddAssert("value immediately changed on focus loss", () =>
+            {
+                ((IFocusManager)InputManager).TriggerFocusContention(metadataSection);
+                return editorBeatmap.Metadata.Artist;
+            }, () => Is.EqualTo("Example ArtistExample Artist"));
+        }
+
+        [Test]
+        public void TestUpdateViaTextBoxOnCommit()
+        {
+            AddStep("set metadata", () =>
+            {
+                editorBeatmap.Metadata.Artist = "Example Artist";
+                editorBeatmap.Metadata.ArtistUnicode = string.Empty;
+            });
+
+            createSection();
+
+            TextBox textbox;
+
+            AddStep("focus first textbox", () =>
+            {
+                textbox = metadataSection.ChildrenOfType<TextBox>().First();
+                InputManager.MoveMouseTo(textbox);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("simulate changing textbox", () =>
+            {
+                // Can't simulate text input but this should work.
+                InputManager.Keys(PlatformAction.SelectAll);
+                InputManager.Keys(PlatformAction.Copy);
+                InputManager.Keys(PlatformAction.Paste);
+                InputManager.Keys(PlatformAction.Paste);
+            });
+
+            assertArtistMetadata("Example Artist");
+
+            AddStep("commit", () => InputManager.Key(Key.Enter));
+
+            assertArtistMetadata("Example ArtistExample Artist");
+        }
+
         [Test]
         public void TestMinimalMetadata()
         {
@@ -40,7 +120,7 @@ public void TestMinimalMetadata()
 
             createSection();
 
-            assertArtist("Example Artist");
+            assertArtistTextBox("Example Artist");
             assertRomanisedArtist("Example Artist", false);
 
             assertTitle("Example Title");
@@ -61,7 +141,7 @@ public void TestInitialisationFromNonRomanisedVariant()
 
             createSection();
 
-            assertArtist("＊なみりん");
+            assertArtistTextBox("＊なみりん");
             assertRomanisedArtist(string.Empty, true);
 
             assertTitle("コイシテイク・プラネット");
@@ -82,7 +162,7 @@ public void TestInitialisationPreservesOriginalValues()
 
             createSection();
 
-            assertArtist("＊なみりん");
+            assertArtistTextBox("＊なみりん");
             assertRomanisedArtist("*namirin", true);
 
             assertTitle("コイシテイク・プラネット");
@@ -104,11 +184,11 @@ public void TestValueTransfer()
             createSection();
 
             AddStep("set romanised artist name", () => metadataSection.ArtistTextBox.Current.Value = "*namirin");
-            assertArtist("*namirin");
+            assertArtistTextBox("*namirin");
             assertRomanisedArtist("*namirin", false);
 
             AddStep("set native artist name", () => metadataSection.ArtistTextBox.Current.Value = "＊なみりん");
-            assertArtist("＊なみりん");
+            assertArtistTextBox("＊なみりん");
             assertRomanisedArtist("*namirin", true);
 
             AddStep("set romanised title", () => metadataSection.TitleTextBox.Current.Value = "Hitokoto no kyori");
@@ -123,21 +203,24 @@ public void TestValueTransfer()
         private void createSection()
             => AddStep("create metadata section", () => Child = metadataSection = new TestMetadataSection());
 
-        private void assertArtist(string expected)
-            => AddAssert($"artist is {expected}", () => metadataSection.ArtistTextBox.Current.Value == expected);
+        private void assertArtistMetadata(string expected)
+            => AddAssert($"artist metadata is {expected}", () => editorBeatmap.Metadata.Artist, () => Is.EqualTo(expected));
+
+        private void assertArtistTextBox(string expected)
+            => AddAssert($"artist textbox is {expected}", () => metadataSection.ArtistTextBox.Current.Value, () => Is.EqualTo(expected));
 
         private void assertRomanisedArtist(string expected, bool editable)
         {
-            AddAssert($"romanised artist is {expected}", () => metadataSection.RomanisedArtistTextBox.Current.Value == expected);
+            AddAssert($"romanised artist is {expected}", () => metadataSection.RomanisedArtistTextBox.Current.Value, () => Is.EqualTo(expected));
             AddAssert($"romanised artist is {(editable ? "" : "not ")}editable", () => metadataSection.RomanisedArtistTextBox.ReadOnly == !editable);
         }
 
         private void assertTitle(string expected)
-            => AddAssert($"title is {expected}", () => metadataSection.TitleTextBox.Current.Value == expected);
+            => AddAssert($"title is {expected}", () => metadataSection.TitleTextBox.Current.Value, () => Is.EqualTo(expected));
 
         private void assertRomanisedTitle(string expected, bool editable)
         {
-            AddAssert($"romanised title is {expected}", () => metadataSection.RomanisedTitleTextBox.Current.Value == expected);
+            AddAssert($"romanised title is {expected}", () => metadataSection.RomanisedTitleTextBox.Current.Value, () => Is.EqualTo(expected));
             AddAssert($"romanised title is {(editable ? "" : "not ")}editable", () => metadataSection.RomanisedTitleTextBox.ReadOnly == !editable);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index 32693c2bb241..800857c97376 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -10,6 +10,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
@@ -40,7 +41,7 @@ public void TestSkinSpriteDisallowedByDefault()
             AddStep("disallow all lookups", () =>
             {
                 storyboard.UseSkinSprites = false;
-                storyboard.AlwaysProvideTexture = false;
+                storyboard.ProvideResources = false;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -55,7 +56,7 @@ public void TestLookupFromStoryboard()
             AddStep("allow storyboard lookup", () =>
             {
                 storyboard.UseSkinSprites = false;
-                storyboard.AlwaysProvideTexture = true;
+                storyboard.ProvideResources = true;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -67,13 +68,48 @@ public void TestLookupFromStoryboard()
             assertStoryboardSourced();
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestVideo(bool scaleTransformProvided)
+        {
+            AddStep("allow storyboard lookup", () =>
+            {
+                storyboard.ProvideResources = true;
+            });
+
+            AddStep("create video", () => SetContents(_ =>
+            {
+                var layer = storyboard.GetLayer("Video");
+
+                var sprite = new StoryboardVideo("Videos/test-video.mp4", Time.Current);
+
+                if (scaleTransformProvided)
+                {
+                    sprite.Commands.AddScale(Easing.None, Time.Current, Time.Current + 1000, 1, 2);
+                    sprite.Commands.AddScale(Easing.None, Time.Current + 1000, Time.Current + 2000, 2, 1);
+                }
+
+                layer.Elements.Clear();
+                layer.Add(sprite);
+
+                return new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        storyboard.CreateDrawable()
+                    }
+                };
+            }));
+        }
+
         [Test]
         public void TestSkinLookupPreferredOverStoryboard()
         {
             AddStep("allow all lookups", () =>
             {
                 storyboard.UseSkinSprites = true;
-                storyboard.AlwaysProvideTexture = true;
+                storyboard.ProvideResources = true;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -91,7 +127,7 @@ public void TestAllowLookupFromSkin()
             AddStep("allow skin lookup", () =>
             {
                 storyboard.UseSkinSprites = true;
-                storyboard.AlwaysProvideTexture = false;
+                storyboard.ProvideResources = false;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -109,7 +145,7 @@ public void TestFlippedSprite()
             AddStep("allow all lookups", () =>
             {
                 storyboard.UseSkinSprites = true;
-                storyboard.AlwaysProvideTexture = true;
+                storyboard.ProvideResources = true;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -127,7 +163,7 @@ public void TestZeroScale()
             AddStep("allow all lookups", () =>
             {
                 storyboard.UseSkinSprites = true;
-                storyboard.AlwaysProvideTexture = true;
+                storyboard.ProvideResources = true;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -142,7 +178,7 @@ public void TestNegativeScale()
             AddStep("allow all lookups", () =>
             {
                 storyboard.UseSkinSprites = true;
-                storyboard.AlwaysProvideTexture = true;
+                storyboard.ProvideResources = true;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -156,7 +192,7 @@ public void TestNegativeScaleWithFlippedSprite()
             AddStep("allow all lookups", () =>
             {
                 storyboard.UseSkinSprites = true;
-                storyboard.AlwaysProvideTexture = true;
+                storyboard.ProvideResources = true;
             });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
@@ -170,17 +206,25 @@ public void TestNegativeScaleWithFlippedSprite()
             AddAssert("origin back", () => sprites.All(s => s.Origin == Anchor.TopLeft));
         }
 
-        private DrawableStoryboard createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
+        private Drawable createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
         {
             var layer = storyboard.GetLayer("Background");
 
             var sprite = new StoryboardSprite(lookupName, origin, initialPosition);
-            sprite.AddLoop(Time.Current, 100).Alpha.Add(Easing.None, 0, 10000, 1, 1);
+            var loop = sprite.AddLoopingGroup(Time.Current, 100);
+            loop.AddAlpha(Easing.None, 0, 10000, 1, 1);
 
             layer.Elements.Clear();
             layer.Add(sprite);
 
-            return storyboard.CreateDrawable().With(s => s.RelativeSizeAxes = Axes.Both);
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    storyboard.CreateDrawable()
+                }
+            };
         }
 
         private void assertStoryboardSourced()
@@ -202,42 +246,52 @@ public override DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = nul
                 return new TestDrawableStoryboard(this, mods);
             }
 
-            public bool AlwaysProvideTexture { get; set; }
+            public bool ProvideResources { get; set; }
 
-            public override string GetStoragePathFromStoryboardPath(string path) => AlwaysProvideTexture ? path : string.Empty;
+            public override string GetStoragePathFromStoryboardPath(string path) => ProvideResources ? path : string.Empty;
 
             private partial class TestDrawableStoryboard : DrawableStoryboard
             {
-                private readonly bool alwaysProvideTexture;
+                private readonly bool provideResources;
 
                 public TestDrawableStoryboard(TestStoryboard storyboard, IReadOnlyList<Mod>? mods)
                     : base(storyboard, mods)
                 {
-                    alwaysProvideTexture = storyboard.AlwaysProvideTexture;
+                    provideResources = storyboard.ProvideResources;
                 }
 
-                protected override IResourceStore<byte[]> CreateResourceLookupStore() => alwaysProvideTexture
-                    ? new AlwaysReturnsTextureStore()
+                protected override IResourceStore<byte[]> CreateResourceLookupStore() => provideResources
+                    ? new ResourcesTextureStore()
                     : new ResourceStore<byte[]>();
 
-                internal class AlwaysReturnsTextureStore : IResourceStore<byte[]>
+                internal class ResourcesTextureStore : IResourceStore<byte[]>
                 {
-                    private const string test_image = "Resources/Textures/test-image.png";
-
                     private readonly DllResourceStore store;
 
-                    public AlwaysReturnsTextureStore()
+                    public ResourcesTextureStore()
                     {
                         store = TestResources.GetStore();
                     }
 
                     public void Dispose() => store.Dispose();
 
-                    public byte[] Get(string name) => store.Get(test_image);
+                    public byte[] Get(string name) => store.Get(map(name));
 
-                    public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) => store.GetAsync(test_image, cancellationToken);
+                    public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) => store.GetAsync(map(name), cancellationToken);
 
-                    public Stream GetStream(string name) => store.GetStream(test_image);
+                    public Stream GetStream(string name) => store.GetStream(map(name));
+
+                    private string map(string name)
+                    {
+                        switch (name)
+                        {
+                            case lookup_name:
+                                return "Resources/Textures/test-image.png";
+
+                            default:
+                                return $"Resources/{name}";
+                        }
+                    }
 
                     public IEnumerable<string> GetAvailableResources() => store.GetAvailableResources();
                 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
index dadf3ca65fef..5a71369976a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
@@ -47,7 +47,7 @@ public void TestStoryboardProducesCorrectStartTimeSimpleAlpha(double firstStoryb
 
             var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
 
-            sprite.TimelineGroup.Alpha.Add(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1);
+            sprite.Commands.AddAlpha(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1);
 
             storyboard.GetLayer("Background").Add(sprite);
 
@@ -73,17 +73,17 @@ public void TestStoryboardProducesCorrectStartTimeFadeInAfterOtherEvents(double
             var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
 
             // these should be ignored as we have an alpha visibility blocker proceeding this command.
-            sprite.TimelineGroup.Scale.Add(Easing.None, loop_start_time, -18000, 0, 1);
-            var loopGroup = sprite.AddLoop(loop_start_time, 50);
-            loopGroup.Scale.Add(Easing.None, loop_start_time, -18000, 0, 1);
+            sprite.Commands.AddScale(Easing.None, loop_start_time, -18000, 0, 1);
+            var loopGroup = sprite.AddLoopingGroup(loop_start_time, 50);
+            loopGroup.AddScale(Easing.None, loop_start_time, -18000, 0, 1);
 
-            var target = addEventToLoop ? loopGroup : sprite.TimelineGroup;
+            var target = addEventToLoop ? loopGroup : sprite.Commands;
             double loopRelativeOffset = addEventToLoop ? -loop_start_time : 0;
-            target.Alpha.Add(Easing.None, loopRelativeOffset + firstStoryboardEvent, loopRelativeOffset + firstStoryboardEvent + 500, 0, 1);
+            target.AddAlpha(Easing.None, loopRelativeOffset + firstStoryboardEvent, loopRelativeOffset + firstStoryboardEvent + 500, 0, 1);
 
             // these should be ignored due to being in the future.
-            sprite.TimelineGroup.Alpha.Add(Easing.None, 18000, 20000, 0, 1);
-            loopGroup.Alpha.Add(Easing.None, 38000, 40000, 0, 1);
+            sprite.Commands.AddAlpha(Easing.None, 18000, 20000, 0, 1);
+            loopGroup.AddAlpha(Easing.None, 38000, 40000, 0, 1);
 
             storyboard.GetLayer("Background").Add(sprite);
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardCommands.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardCommands.cs
new file mode 100644
index 000000000000..4af3d234635b
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardCommands.cs
@@ -0,0 +1,264 @@
+// 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.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Storyboards;
+using osu.Game.Storyboards.Drawables;
+using osu.Game.Tests.Resources;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneStoryboardCommands : OsuTestScene
+    {
+        [Cached(typeof(Storyboard))]
+        private TestStoryboard storyboard { get; set; } = new TestStoryboard
+        {
+            UseSkinSprites = false,
+            AlwaysProvideTexture = true,
+        };
+
+        private readonly ManualClock manualClock = new ManualClock { Rate = 1, IsRunning = true };
+        private int clockDirection;
+
+        private const string lookup_name = "hitcircleoverlay";
+        private const double clock_limit = 2500;
+
+        protected override Container<Drawable> Content => content;
+
+        private Container content = null!;
+        private SpriteText timelineText = null!;
+        private Box timelineMarker = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            base.Content.Children = new Drawable[]
+            {
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                timelineText = new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Margin = new MarginPadding { Bottom = 60 },
+                },
+                timelineMarker = new Box
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomCentre,
+                    RelativePositionAxes = Axes.X,
+                    Size = new Vector2(2, 50),
+                },
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("start clock", () => clockDirection = 1);
+            AddStep("pause clock", () => clockDirection = 0);
+            AddStep("set clock = 0", () => manualClock.CurrentTime = 0);
+        }
+
+        [Test]
+        public void TestNormalCommandPlayback()
+        {
+            AddStep("create storyboard", () => Child = createStoryboard(s =>
+            {
+                s.Commands.AddY(Easing.OutBounce, 500, 900, 100, 240);
+                s.Commands.AddY(Easing.OutQuint, 1100, 1500, 240, 100);
+            }));
+
+            assert(0, 100);
+            assert(500, 100);
+            assert(1000, 240);
+            assert(1500, 100);
+            assert(clock_limit, 100);
+            assert(1500, 100);
+            assert(1000, 240);
+            assert(500, 100);
+            assert(0, 100);
+
+            void assert(double time, double y)
+            {
+                AddStep($"set clock = {time}", () => manualClock.CurrentTime = time);
+                AddAssert($"sprite y = {y} at t = {time}", () => this.ChildrenOfType<DrawableStoryboardSprite>().Single().Y == y);
+            }
+        }
+
+        [Test]
+        public void TestLoopingCommandsPlayback()
+        {
+            AddStep("create storyboard", () => Child = createStoryboard(s =>
+            {
+                var loop = s.AddLoopingGroup(250, 1);
+                loop.AddY(Easing.OutBounce, 0, 400, 100, 240);
+                loop.AddY(Easing.OutQuint, 600, 1000, 240, 100);
+            }));
+
+            assert(0, 100);
+            assert(250, 100);
+            assert(850, 240);
+            assert(1250, 100);
+            assert(1850, 240);
+            assert(2250, 100);
+            assert(clock_limit, 100);
+            assert(2250, 100);
+            assert(1850, 240);
+            assert(1250, 100);
+            assert(850, 240);
+            assert(250, 100);
+            assert(0, 100);
+
+            void assert(double time, double y)
+            {
+                AddStep($"set clock = {time}", () => manualClock.CurrentTime = time);
+                AddAssert($"sprite y = {y} at t = {time}", () => this.ChildrenOfType<DrawableStoryboardSprite>().Single().Y == y);
+            }
+        }
+
+        [Test]
+        public void TestLoopManyTimes()
+        {
+            AddStep("create storyboard", () => Child = createStoryboard(s =>
+            {
+                var loop = s.AddLoopingGroup(500, 10000);
+                loop.AddY(Easing.OutBounce, 0, 60, 100, 240);
+                loop.AddY(Easing.OutQuint, 80, 120, 240, 100);
+            }));
+        }
+
+        [Test]
+        public void TestParameterTemporaryEffect()
+        {
+            AddStep("create storyboard", () => Child = createStoryboard(s =>
+            {
+                s.Commands.AddFlipV(Easing.None, 1000, 1500, true, false);
+            }));
+
+            AddAssert("sprite not flipped at t = 0", () => !this.ChildrenOfType<DrawableStoryboardSprite>().Single().FlipV);
+
+            AddStep("set clock = 1250", () => manualClock.CurrentTime = 1250);
+            AddAssert("sprite flipped at t = 1250", () => this.ChildrenOfType<DrawableStoryboardSprite>().Single().FlipV);
+
+            AddStep("set clock = 2000", () => manualClock.CurrentTime = 2000);
+            AddAssert("sprite not flipped at t = 2000", () => !this.ChildrenOfType<DrawableStoryboardSprite>().Single().FlipV);
+
+            AddStep("resume clock", () => clockDirection = 1);
+        }
+
+        [Test]
+        public void TestParameterPermanentEffect()
+        {
+            AddStep("create storyboard", () => Child = createStoryboard(s =>
+            {
+                s.Commands.AddFlipV(Easing.None, 1000, 1000, true, true);
+            }));
+
+            AddAssert("sprite flipped at t = 0", () => this.ChildrenOfType<DrawableStoryboardSprite>().Single().FlipV);
+
+            AddStep("set clock = 1250", () => manualClock.CurrentTime = 1250);
+            AddAssert("sprite flipped at t = 1250", () => this.ChildrenOfType<DrawableStoryboardSprite>().Single().FlipV);
+
+            AddStep("set clock = 2000", () => manualClock.CurrentTime = 2000);
+            AddAssert("sprite flipped at t = 2000", () => this.ChildrenOfType<DrawableStoryboardSprite>().Single().FlipV);
+
+            AddStep("resume clock", () => clockDirection = 1);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (manualClock.CurrentTime > clock_limit || manualClock.CurrentTime < 0)
+                clockDirection = -clockDirection;
+
+            manualClock.CurrentTime += Time.Elapsed * clockDirection;
+            timelineText.Text = $"Time: {manualClock.CurrentTime:0}ms";
+            timelineMarker.X = (float)(manualClock.CurrentTime / clock_limit);
+        }
+
+        private DrawableStoryboard createStoryboard(Action<StoryboardSprite>? addCommands = null)
+        {
+            var layer = storyboard.GetLayer("Background");
+
+            var sprite = new StoryboardSprite(lookup_name, Anchor.Centre, new Vector2(320, 240));
+            sprite.Commands.AddScale(Easing.None, 0, clock_limit, 0.5f, 0.5f);
+            sprite.Commands.AddAlpha(Easing.None, 0, clock_limit, 1, 1);
+            addCommands?.Invoke(sprite);
+
+            layer.Elements.Clear();
+            layer.Add(sprite);
+
+            return storyboard.CreateDrawable().With(c => c.Clock = new FramedClock(manualClock));
+        }
+
+        private partial class TestStoryboard : Storyboard
+        {
+            public override DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null)
+            {
+                return new TestDrawableStoryboard(this, mods);
+            }
+
+            public bool AlwaysProvideTexture { get; set; }
+
+            public override string GetStoragePathFromStoryboardPath(string path) => AlwaysProvideTexture ? path : string.Empty;
+
+            private partial class TestDrawableStoryboard : DrawableStoryboard
+            {
+                private readonly bool alwaysProvideTexture;
+
+                public TestDrawableStoryboard(TestStoryboard storyboard, IReadOnlyList<Mod>? mods)
+                    : base(storyboard, mods)
+                {
+                    alwaysProvideTexture = storyboard.AlwaysProvideTexture;
+                }
+
+                protected override IResourceStore<byte[]> CreateResourceLookupStore() => alwaysProvideTexture
+                    ? new AlwaysReturnsTextureStore()
+                    : new ResourceStore<byte[]>();
+
+                internal class AlwaysReturnsTextureStore : IResourceStore<byte[]>
+                {
+                    private const string test_image = "Resources/Textures/test-image.png";
+
+                    private readonly DllResourceStore store;
+
+                    public AlwaysReturnsTextureStore()
+                    {
+                        store = TestResources.GetStore();
+                    }
+
+                    public void Dispose() => store.Dispose();
+
+                    public byte[] Get(string name) => store.Get(test_image);
+
+                    public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) => store.GetAsync(test_image, cancellationToken);
+
+                    public Stream GetStream(string name) => store.GetStream(test_image);
+
+                    public IEnumerable<string> GetAvailableResources() => store.GetAvailableResources();
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithIntro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithIntro.cs
new file mode 100644
index 000000000000..ee6a6938a917
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithIntro.cs
@@ -0,0 +1,89 @@
+// 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;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Play;
+using osu.Game.Storyboards;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneStoryboardWithIntro : PlayerTestScene
+    {
+        protected override bool HasCustomSteps => true;
+        protected override bool AllowFail => true;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap();
+            beatmap.HitObjects.Add(new HitCircle { StartTime = firstObjectStartTime });
+            return beatmap;
+        }
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
+        {
+            return base.CreateWorkingBeatmap(beatmap, createStoryboard(storyboardStartTime));
+        }
+
+        private Storyboard createStoryboard(double startTime)
+        {
+            var storyboard = new Storyboard();
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+            sprite.Commands.AddAlpha(Easing.None, startTime, 0, 0, 1);
+            storyboard.GetLayer("Background").Add(sprite);
+            return storyboard;
+        }
+
+        private double firstObjectStartTime;
+        private double storyboardStartTime;
+
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
+            AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
+            AddStep("reset first hitobject time", () => firstObjectStartTime = 0);
+            AddStep("reset storyboard start time", () => storyboardStartTime = 0);
+        }
+
+        [TestCase(-5000, 0)]
+        [TestCase(-5000, 30000)]
+        public void TestStoryboardSingleSkip(double storyboardStart, double firstObject)
+        {
+            AddStep($"set storyboard start time to {storyboardStart}", () => storyboardStartTime = storyboardStart);
+            AddStep($"set first object start time to {firstObject}", () => firstObjectStartTime = firstObject);
+            CreateTest();
+
+            AddStep("skip", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("skip performed", () => Player.ChildrenOfType<SkipOverlay>().Any(s => s.SkipCount == 1));
+            AddUntilStep("gameplay clock advanced", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(firstObject - 2000));
+        }
+
+        [Test]
+        public void TestStoryboardDoubleSkip()
+        {
+            AddStep("set storyboard start time to -11000", () => storyboardStartTime = -11000);
+            AddStep("set first object start time to 11000", () => firstObjectStartTime = 11000);
+            CreateTest();
+
+            AddStep("skip", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("skip performed", () => Player.ChildrenOfType<SkipOverlay>().Any(s => s.SkipCount == 1));
+            AddUntilStep("gameplay clock advanced", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+
+            AddStep("skip", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("skip performed", () => Player.ChildrenOfType<SkipOverlay>().Any(s => s.SkipCount == 2));
+            AddUntilStep("gameplay clock advanced", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(9000));
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index f532921d634b..aff6139c08fa 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -216,7 +216,7 @@ private Storyboard createStoryboard(double duration)
         {
             var storyboard = new Storyboard();
             var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
-            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, duration, 1, 0);
+            sprite.Commands.AddAlpha(Easing.None, 0, duration, 1, 0);
             storyboard.GetLayer("Background").Add(sprite);
             return storyboard;
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
index 4ffccdbf0e18..98242e2d929f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
@@ -69,8 +69,9 @@ public void TestMultipleStatuses()
                         }),
                         createLoungeRoom(new Room
                         {
-                            Name = { Value = "Multiplayer room" },
-                            Status = { Value = new RoomStatusOpen() },
+                            Name = { Value = "Private room" },
+                            Status = { Value = new RoomStatusOpenPrivate() },
+                            HasPassword = { Value = true },
                             EndDate = { Value = DateTimeOffset.Now.AddDays(1) },
                             Type = { Value = MatchType.HeadToHead },
                             Playlist =
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 6446ebd35f34..bd62a8b1311f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -16,6 +16,7 @@
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
@@ -317,13 +318,13 @@ public void TestSelectableMouseHandling()
                 p.RequestResults = _ => resultsRequested = true;
             });
 
+            AddUntilStep("wait for load", () => playlist.ChildrenOfType<DrawableLinkCompiler>().Any() && playlist.ChildrenOfType<BeatmapCardThumbnail>().First().DrawWidth > 0);
             AddStep("move mouse to first item title", () =>
             {
                 var drawQuad = playlist.ChildrenOfType<LinkFlowContainer>().First().ScreenSpaceDrawQuad;
                 var location = (drawQuad.TopLeft + drawQuad.BottomLeft) / 2 + new Vector2(drawQuad.Width * 0.2f, 0);
                 InputManager.MoveMouseTo(location);
             });
-            AddUntilStep("wait for text load", () => playlist.ChildrenOfType<DrawableLinkCompiler>().Any());
             AddAssert("first item title not hovered", () => playlist.ChildrenOfType<DrawableLinkCompiler>().First().IsHovered, () => Is.False);
             AddStep("click left mouse", () => InputManager.Click(MouseButton.Left));
             AddUntilStep("first item selected", () => playlist.ChildrenOfType<DrawableRoomPlaylistItem>().First().IsSelectedItem, () => Is.True);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index cebc75f90cef..2b17f91e687b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -424,7 +424,7 @@ public void TestPlayersLeaveWhileSpectating()
         public void TestIntroStoryboardElement() => testLeadIn(b =>
         {
             var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
-            sprite.TimelineGroup.Alpha.Add(Easing.None, -2000, 0, 0, 1);
+            sprite.Commands.AddAlpha(Easing.None, -2000, 0, 0, 1);
             b.Storyboard.GetLayer("Background").Add(sprite);
         });
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 9930349b1bfd..e3a8e575f840 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -7,6 +7,7 @@
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -17,6 +18,7 @@
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.GameplayTest;
+using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
@@ -27,6 +29,59 @@ namespace osu.Game.Tests.Visual.Navigation
 {
     public partial class TestSceneBeatmapEditorNavigation : OsuGameTestScene
     {
+        [Test]
+        public void TestChangeMetadataExitWhileTextboxFocusedPromptsSave()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+            AddStep("switch ruleset", () => Game.Ruleset.Value = new ManiaRuleset().RulesetInfo);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddStep("change to song setup", () => InputManager.Key(Key.F4));
+
+            TextBox textbox = null!;
+
+            AddUntilStep("wait for metadata section", () =>
+            {
+                var t = Game.ChildrenOfType<MetadataSection>().SingleOrDefault().ChildrenOfType<TextBox>().FirstOrDefault();
+
+                if (t == null)
+                    return false;
+
+                textbox = t;
+                return true;
+            });
+
+            AddStep("focus textbox", () =>
+            {
+                InputManager.MoveMouseTo(textbox);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("simulate changing textbox", () =>
+            {
+                // Can't simulate text input but this should work.
+                InputManager.Keys(PlatformAction.SelectAll);
+                InputManager.Keys(PlatformAction.Copy);
+                InputManager.Keys(PlatformAction.Paste);
+                InputManager.Keys(PlatformAction.Paste);
+            });
+
+            AddStep("exit", () => Game.ChildrenOfType<Editor>().Single().Exit());
+
+            AddUntilStep("save dialog displayed", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault()?.CurrentDialog is PromptForSaveDialog);
+        }
+
         [Test]
         public void TestEditorGameplayTestAlwaysUsesOriginalRuleset()
         {
diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
index 6590339311b8..2c2335de13cd 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
@@ -1,8 +1,6 @@
 // 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 System.Linq;
 using NUnit.Framework;
@@ -26,7 +24,7 @@ namespace osu.Game.Tests.Visual.Navigation
 {
     public partial class TestScenePresentScore : OsuGameTestScene
     {
-        private BeatmapSetInfo beatmap;
+        private BeatmapSetInfo beatmap = null!;
 
         [SetUpSteps]
         public new void SetUpSteps()
@@ -64,7 +62,7 @@ public partial class TestScenePresentScore : OsuGameTestScene
                             Ruleset = new OsuRuleset().RulesetInfo
                         },
                     }
-                })?.Value;
+                })!.Value;
             });
         }
 
@@ -145,6 +143,40 @@ public void TestFromSongSelectDifferentRuleset([Values] ScorePresentType type)
             presentAndConfirm(secondImport, type);
         }
 
+        [Test]
+        public void TestPresentTwoImportsWithSameOnlineIDButDifferentHashes([Values] ScorePresentType type)
+        {
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo?.Invoke());
+            AddUntilStep("song select is current", () => Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect && songSelect.BeatmapSetsLoaded);
+
+            var firstImport = importScore(1);
+            presentAndConfirm(firstImport, type);
+
+            var secondImport = importScore(1);
+            presentAndConfirm(secondImport, type);
+        }
+
+        [Test]
+        public void TestScoreRefetchIgnoresEmptyHash()
+        {
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo?.Invoke());
+            AddUntilStep("song select is current", () => Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect && songSelect.BeatmapSetsLoaded);
+
+            importScore(-1, hash: string.Empty);
+            importScore(3, hash: @"deadbeef");
+
+            // oftentimes a `PresentScore()` call will be given a `ScoreInfo` which is converted from an online score,
+            // in which cases the hash will generally not be available.
+            AddStep("present score", () => Game.PresentScore(new ScoreInfo { OnlineID = 3, Hash = string.Empty }));
+
+            AddUntilStep("wait for results", () => lastWaitedScreen != Game.ScreenStack.CurrentScreen && Game.ScreenStack.CurrentScreen is ResultsScreen);
+            AddUntilStep("correct score displayed", () =>
+            {
+                var score = ((ResultsScreen)Game.ScreenStack.CurrentScreen).Score!;
+                return score.OnlineID == 3 && score.Hash == "deadbeef";
+            });
+        }
+
         private void returnToMenu()
         {
             // if we don't pause, there's a chance the track may change at the main menu out of our control (due to reaching the end of the track).
@@ -158,31 +190,31 @@ private void returnToMenu()
             AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
         }
 
-        private Func<ScoreInfo> importScore(int i, RulesetInfo ruleset = null)
+        private Func<ScoreInfo> importScore(int i, RulesetInfo? ruleset = null, string? hash = null)
         {
-            ScoreInfo imported = null;
+            ScoreInfo? imported = null;
             AddStep($"import score {i}", () =>
             {
                 imported = Game.ScoreManager.Import(new ScoreInfo
                 {
-                    Hash = Guid.NewGuid().ToString(),
+                    Hash = hash ?? Guid.NewGuid().ToString(),
                     OnlineID = i,
                     BeatmapInfo = beatmap.Beatmaps.First(),
                     Ruleset = ruleset ?? new OsuRuleset().RulesetInfo,
                     User = new GuestUser(),
-                }).Value;
+                })!.Value;
             });
 
             AddAssert($"import {i} succeeded", () => imported != null);
 
-            return () => imported;
+            return () => imported!;
         }
 
         /// <summary>
         /// Some tests test waiting for a particular screen twice in a row, but expect a new instance each time.
         /// There's a case where they may succeed incorrectly if we don't compare against the previous instance.
         /// </summary>
-        private IScreen lastWaitedScreen;
+        private IScreen lastWaitedScreen = null!;
 
         private void presentAndConfirm(Func<ScoreInfo> getImport, ScorePresentType type)
         {
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 9c180d43da58..38fb2846aaab 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -321,6 +322,30 @@ public void TestRulesetInputDisabledWhenSkinEditorOpen()
             AddUntilStep("nested input disabled", () => ((Player)Game.ScreenStack.CurrentScreen).ChildrenOfType<PassThroughInputManager>().All(manager => !manager.UseParentInput));
         }
 
+        [Test]
+        public void TestSkinSavesOnChange()
+        {
+            advanceToSongSelect();
+            openSkinEditor();
+
+            Guid editedSkinId = Guid.Empty;
+            AddStep("save skin id", () => editedSkinId = Game.Dependencies.Get<SkinManager>().CurrentSkinInfo.Value.ID);
+            AddStep("add skinnable component", () =>
+            {
+                skinEditor.ChildrenOfType<SkinComponentToolbox.ToolboxComponentButton>().First().TriggerClick();
+            });
+
+            AddStep("change to triangles skin", () => Game.Dependencies.Get<SkinManager>().SetSkinFromConfiguration(SkinInfo.TRIANGLES_SKIN.ToString()));
+            AddUntilStep("components loaded", () => Game.ChildrenOfType<SkinComponentsContainer>().All(c => c.ComponentsLoaded));
+            // sort of implicitly relies on song select not being skinnable.
+            // TODO: revisit if the above ever changes
+            AddUntilStep("skin changed", () => !skinEditor.ChildrenOfType<SkinBlueprint>().Any());
+
+            AddStep("change back to modified skin", () => Game.Dependencies.Get<SkinManager>().SetSkinFromConfiguration(editedSkinId.ToString()));
+            AddUntilStep("components loaded", () => Game.ChildrenOfType<SkinComponentsContainer>().All(c => c.ComponentsLoaded));
+            AddUntilStep("changes saved", () => skinEditor.ChildrenOfType<SkinBlueprint>().Any());
+        }
+
         private void advanceToSongSelect()
         {
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 9f7726313a24..02a321d22f86 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -104,6 +104,21 @@ public void TestPPShownAsProvisionalWhenUnrankedModsArePresent()
             });
         }
 
+        [Test]
+        public void TestPPNotShownAsProvisionalIfClassicModIsPresentDueToLegacyScore()
+        {
+            AddStep("show example score", () =>
+            {
+                var score = TestResources.CreateTestScoreInfo(createTestBeatmap(new RealmUser()));
+                score.PP = 400;
+                score.Mods = score.Mods.Append(new OsuModClassic()).ToArray();
+                score.IsLegacyScore = true;
+                showPanel(score);
+            });
+
+            AddAssert("pp display faded out", () => this.ChildrenOfType<PerformanceStatistic>().Single().Alpha == 1);
+        }
+
         [Test]
         public void TestWithDefaultDate()
         {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 325a53573186..3e38b660292d 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -82,6 +82,14 @@ public void TestVariousTypesOfHitResult()
             }).ToList());
         }
 
+        [Test]
+        public void TestNonBasicHitResultsAreIgnored()
+        {
+            createTest(CreateDistributedHitEvents(0, 50)
+                       .Select(h => new HitEvent(h.TimeOffset, 1.0, h.TimeOffset > 0 ? HitResult.Ok : HitResult.LargeTickHit, placeholder_object, placeholder_object, null))
+                       .ToList());
+        }
+
         [Test]
         public void TestMultipleWindowsOfHitResult()
         {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index ffc5dbc8fb14..fca1d0f82ab9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -424,7 +424,7 @@ protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresC
                     scores.Add(score);
                 }
 
-                scoresCallback?.Invoke(scores);
+                scoresCallback.Invoke(scores);
 
                 return null;
             }
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 57c9770c9a89..86008a56a464 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -296,7 +296,7 @@ public void TestFilteringHidesResetSectionButtons()
         }
 
         [Test]
-        public void TestBindingConflictResolvedByRollback()
+        public void TestBindingConflictResolvedByRollbackViaMouse()
         {
             AddStep("reset taiko section to default", () =>
             {
@@ -315,7 +315,7 @@ public void TestBindingConflictResolvedByRollback()
         }
 
         [Test]
-        public void TestBindingConflictResolvedByOverwrite()
+        public void TestBindingConflictResolvedByOverwriteViaMouse()
         {
             AddStep("reset taiko section to default", () =>
             {
@@ -333,6 +333,46 @@ public void TestBindingConflictResolvedByOverwrite()
             checkBinding("Left (rim)", "M1");
         }
 
+        [Test]
+        public void TestBindingConflictResolvedByRollbackViaKeyboard()
+        {
+            AddStep("reset taiko & global sections to default", () =>
+            {
+                panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset))
+                     .ChildrenOfType<ResetButton>().Single().TriggerClick();
+
+                panel.ChildrenOfType<ResetButton>().First().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
+
+            AddUntilStep("wait for popover", () => panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("press Esc", () => InputManager.Key(Key.Escape));
+            checkBinding("Left (centre)", "M1");
+            checkBinding("Left (rim)", "M2");
+        }
+
+        [Test]
+        public void TestBindingConflictResolvedByOverwriteViaKeyboard()
+        {
+            AddStep("reset taiko & global sections to default", () =>
+            {
+                panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset))
+                     .ChildrenOfType<ResetButton>().Single().TriggerClick();
+
+                panel.ChildrenOfType<ResetButton>().First().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
+
+            AddUntilStep("wait for popover", () => panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("press Enter", () => InputManager.Key(Key.Enter));
+            checkBinding("Left (centre)", InputSettingsStrings.ActionHasNoKeyBinding.ToString());
+            checkBinding("Left (rim)", "M1");
+        }
+
         [Test]
         public void TestBindingConflictCausedByResetToDefaultOfSingleRow()
         {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index ce241f3676ea..6581ce03232d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -29,6 +29,7 @@
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -86,6 +87,105 @@ public override void SetUpSteps()
             AddStep("delete all beatmaps", () => manager.Delete());
         }
 
+        [Test]
+        public void TestSpeedChange()
+        {
+            createSongSelect();
+            changeMods();
+
+            decreaseModSpeed();
+            AddAssert("half time activated at 0.95x", () => songSelect!.Mods.Value.OfType<ModHalfTime>().Single().SpeedChange.Value, () => Is.EqualTo(0.95).Within(0.005));
+
+            decreaseModSpeed();
+            AddAssert("half time speed changed to 0.9x", () => songSelect!.Mods.Value.OfType<ModHalfTime>().Single().SpeedChange.Value, () => Is.EqualTo(0.9).Within(0.005));
+
+            increaseModSpeed();
+            AddAssert("half time speed changed to 0.95x", () => songSelect!.Mods.Value.OfType<ModHalfTime>().Single().SpeedChange.Value, () => Is.EqualTo(0.95).Within(0.005));
+
+            increaseModSpeed();
+            AddAssert("no mods selected", () => songSelect!.Mods.Value.Count == 0);
+
+            increaseModSpeed();
+            AddAssert("double time activated at 1.05x", () => songSelect!.Mods.Value.OfType<ModDoubleTime>().Single().SpeedChange.Value, () => Is.EqualTo(1.05).Within(0.005));
+
+            increaseModSpeed();
+            AddAssert("double time speed changed to 1.1x", () => songSelect!.Mods.Value.OfType<ModDoubleTime>().Single().SpeedChange.Value, () => Is.EqualTo(1.1).Within(0.005));
+
+            decreaseModSpeed();
+            AddAssert("double time speed changed to 1.05x", () => songSelect!.Mods.Value.OfType<ModDoubleTime>().Single().SpeedChange.Value, () => Is.EqualTo(1.05).Within(0.005));
+
+            OsuModNightcore nc = new OsuModNightcore
+            {
+                SpeedChange = { Value = 1.05 }
+            };
+            changeMods(nc);
+
+            increaseModSpeed();
+            AddAssert("nightcore speed changed to 1.1x", () => songSelect!.Mods.Value.OfType<ModNightcore>().Single().SpeedChange.Value, () => Is.EqualTo(1.1).Within(0.005));
+
+            decreaseModSpeed();
+            AddAssert("nightcore speed changed to 1.05x", () => songSelect!.Mods.Value.OfType<ModNightcore>().Single().SpeedChange.Value, () => Is.EqualTo(1.05).Within(0.005));
+
+            decreaseModSpeed();
+            AddAssert("no mods selected", () => songSelect!.Mods.Value.Count == 0);
+
+            decreaseModSpeed();
+            AddAssert("daycore activated at 0.95x", () => songSelect!.Mods.Value.OfType<ModDaycore>().Single().SpeedChange.Value, () => Is.EqualTo(0.95).Within(0.005));
+
+            decreaseModSpeed();
+            AddAssert("daycore activated at 0.95x", () => songSelect!.Mods.Value.OfType<ModDaycore>().Single().SpeedChange.Value, () => Is.EqualTo(0.9).Within(0.005));
+
+            increaseModSpeed();
+            AddAssert("daycore activated at 0.95x", () => songSelect!.Mods.Value.OfType<ModDaycore>().Single().SpeedChange.Value, () => Is.EqualTo(0.95).Within(0.005));
+
+            OsuModDoubleTime dt = new OsuModDoubleTime
+            {
+                SpeedChange = { Value = 1.02 },
+                AdjustPitch = { Value = true },
+            };
+            changeMods(dt);
+
+            decreaseModSpeed();
+            AddAssert("half time activated at 0.97x", () => songSelect!.Mods.Value.OfType<ModHalfTime>().Single().SpeedChange.Value, () => Is.EqualTo(0.97).Within(0.005));
+            AddAssert("adjust pitch preserved", () => songSelect!.Mods.Value.OfType<ModHalfTime>().Single().AdjustPitch.Value, () => Is.True);
+
+            OsuModHalfTime ht = new OsuModHalfTime
+            {
+                SpeedChange = { Value = 0.97 },
+                AdjustPitch = { Value = true },
+            };
+            Mod[] modlist = { ht, new OsuModHardRock(), new OsuModHidden() };
+            changeMods(modlist);
+
+            increaseModSpeed();
+            AddAssert("double time activated at 1.02x", () => songSelect!.Mods.Value.OfType<ModDoubleTime>().Single().SpeedChange.Value, () => Is.EqualTo(1.02).Within(0.005));
+            AddAssert("double time activated at 1.02x", () => songSelect!.Mods.Value.OfType<ModDoubleTime>().Single().AdjustPitch.Value, () => Is.True);
+            AddAssert("HD still enabled", () => songSelect!.Mods.Value.OfType<ModHidden>().SingleOrDefault(), () => Is.Not.Null);
+            AddAssert("HR still enabled", () => songSelect!.Mods.Value.OfType<ModHardRock>().SingleOrDefault(), () => Is.Not.Null);
+
+            changeMods(new ModWindUp());
+            increaseModSpeed();
+            AddAssert("windup still active", () => songSelect!.Mods.Value.First() is ModWindUp);
+
+            changeMods(new ModAdaptiveSpeed());
+            increaseModSpeed();
+            AddAssert("adaptive speed still active", () => songSelect!.Mods.Value.First() is ModAdaptiveSpeed);
+
+            void increaseModSpeed() => AddStep("increase mod speed", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Up);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            void decreaseModSpeed() => AddStep("decrease mod speed", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Down);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+        }
+
         [Test]
         public void TestPlaceholderBeatmapPresence()
         {
@@ -1147,6 +1247,62 @@ public void TestCutInFilterTextBox()
             AddAssert("filter text cleared", () => songSelect!.FilterControl.ChildrenOfType<FilterControl.FilterControlTextBox>().First().Text, () => Is.Empty);
         }
 
+        [Test]
+        public void TestNonFilterableModChange()
+        {
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            // Mod that is guaranteed to never re-filter.
+            AddStep("add non-filterable mod", () => SelectedMods.Value = new Mod[] { new OsuModCinema() });
+            AddAssert("filter count is 1", () => songSelect!.FilterCount, () => Is.EqualTo(1));
+
+            // Removing the mod should still not re-filter.
+            AddStep("remove non-filterable mod", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddAssert("filter count is 1", () => songSelect!.FilterCount, () => Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestFilterableModChange()
+        {
+            addRulesetImportStep(3);
+
+            createSongSelect();
+
+            // Change to mania ruleset.
+            AddStep("filter to mania ruleset", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.OnlineID == 3));
+            AddAssert("filter count is 2", () => songSelect!.FilterCount, () => Is.EqualTo(2));
+
+            // Apply a mod, but this should NOT re-filter because there's no search text.
+            AddStep("add filterable mod", () => SelectedMods.Value = new Mod[] { new ManiaModKey3() });
+            AddAssert("filter count is 2", () => songSelect!.FilterCount, () => Is.EqualTo(2));
+
+            // Set search text. Should re-filter.
+            AddStep("set search text to match mods", () => songSelect!.FilterControl.CurrentTextSearch.Value = "keys=3");
+            AddAssert("filter count is 3", () => songSelect!.FilterCount, () => Is.EqualTo(3));
+
+            // Change filterable mod. Should re-filter.
+            AddStep("change new filterable mod", () => SelectedMods.Value = new Mod[] { new ManiaModKey5() });
+            AddAssert("filter count is 4", () => songSelect!.FilterCount, () => Is.EqualTo(4));
+
+            // Add non-filterable mod. Should NOT re-filter.
+            AddStep("apply non-filterable mod", () => SelectedMods.Value = new Mod[] { new ManiaModNoFail(), new ManiaModKey5() });
+            AddAssert("filter count is 4", () => songSelect!.FilterCount, () => Is.EqualTo(4));
+
+            // Remove filterable mod. Should re-filter.
+            AddStep("remove filterable mod", () => SelectedMods.Value = new Mod[] { new ManiaModNoFail() });
+            AddAssert("filter count is 5", () => songSelect!.FilterCount, () => Is.EqualTo(5));
+
+            // Remove non-filterable mod. Should NOT re-filter.
+            AddStep("remove filterable mod", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddAssert("filter count is 5", () => songSelect!.FilterCount, () => Is.EqualTo(5));
+
+            // Add filterable mod. Should re-filter.
+            AddStep("add filterable mod", () => SelectedMods.Value = new Mod[] { new ManiaModKey3() });
+            AddAssert("filter count is 6", () => songSelect!.FilterCount, () => Is.EqualTo(6));
+        }
+
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs
index 7b8054985450..2a2f267fc8af 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs
@@ -77,21 +77,21 @@ private static MenuItem[] makeMenu()
                 new OsuMenuItem(@"Some option"),
                 new OsuMenuItem(@"Highlighted option", MenuItemType.Highlighted),
                 new OsuMenuItem(@"Another option"),
-                new OsuMenuItem(@"Nested option >")
+                new OsuMenuItem(@"Nested option")
                 {
                     Items = new MenuItem[]
                     {
                         new OsuMenuItem(@"Sub-One"),
                         new OsuMenuItem(@"Sub-Two"),
                         new OsuMenuItem(@"Sub-Three"),
-                        new OsuMenuItem(@"Sub-Nested option >")
+                        new OsuMenuItem(@"Sub-Nested option")
                         {
                             Items = new MenuItem[]
                             {
                                 new OsuMenuItem(@"Double Sub-One"),
                                 new OsuMenuItem(@"Double Sub-Two"),
                                 new OsuMenuItem(@"Double Sub-Three"),
-                                new OsuMenuItem(@"Sub-Sub-Nested option >")
+                                new OsuMenuItem(@"Sub-Sub-Nested option")
                                 {
                                     Items = new MenuItem[]
                                     {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 529874b71e38..e2fe10fa746d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -104,7 +104,7 @@ private void load() => Schedule(() =>
                         Files = { new RealmNamedFileUsage(new RealmFile { Hash = $"{i}" }, string.Empty) }
                     };
 
-                    importedScores.Add(scoreManager.Import(score).Value);
+                    importedScores.Add(scoreManager.Import(score)!.Value);
                 }
             });
         });
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneMainMenuButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneMainMenuButton.cs
new file mode 100644
index 000000000000..5914898cb1c1
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneMainMenuButton.cs
@@ -0,0 +1,83 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Localisation;
+using osu.Game.Online.API;
+using osu.Game.Online.Metadata;
+using osu.Game.Online.Rooms;
+using osu.Game.Screens.Menu;
+using osuTK.Input;
+using Color4 = osuTK.Graphics.Color4;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public partial class TestSceneMainMenuButton : OsuTestScene
+    {
+        [Resolved]
+        private MetadataClient metadataClient { get; set; } = null!;
+
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        [Test]
+        public void TestStandardButton()
+        {
+            AddStep("add button", () => Child = new MainMenuButton(
+                ButtonSystemStrings.Solo, @"button-default-select", OsuIcon.Player, new Color4(102, 68, 204, 255), _ => { }, 0, Key.P)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                ButtonSystemState = ButtonSystemState.TopLevel,
+            });
+        }
+
+        [Test]
+        public void TestDailyChallengeButton()
+        {
+            AddStep("beatmap of the day not active", () => metadataClient.DailyChallengeUpdated(null));
+
+            AddStep("set up API", () => dummyAPI.HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case GetRoomRequest getRoomRequest:
+                        if (getRoomRequest.RoomId != 1234)
+                            return false;
+
+                        var beatmap = CreateAPIBeatmap();
+                        beatmap.OnlineID = 1001;
+                        getRoomRequest.TriggerSuccess(new Room
+                        {
+                            RoomID = { Value = 1234 },
+                            Playlist =
+                            {
+                                new PlaylistItem(beatmap)
+                            },
+                            EndDate = { Value = DateTimeOffset.Now.AddSeconds(30) }
+                        });
+                        return true;
+
+                    default:
+                        return false;
+                }
+            });
+
+            AddStep("add button", () => Child = new DailyChallengeButton(@"button-default-select", new Color4(102, 68, 204, 255), _ => { }, 0, Key.D)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                ButtonSystemState = ButtonSystemState.TopLevel,
+            });
+
+            AddStep("beatmap of the day active", () => metadataClient.DailyChallengeUpdated(new DailyChallengeInfo
+            {
+                RoomID = 1234,
+            }));
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
index c79cbd36918e..f87d8e0d2b38 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
@@ -123,6 +123,43 @@ public void TestActivatingPresetTogglesIncludedMods()
             assertSelectedModsEquivalentTo(new Mod[] { new OsuModTouchDevice(), new OsuModHardRock(), new OsuModDoubleTime { SpeedChange = { Value = 1.5 } } });
         }
 
+        [Test]
+        public void TestSystemModsNotPreservedIfIncompatibleWithPresetMods()
+        {
+            ModPresetPanel? panel = null;
+
+            AddStep("create panel", () => Child = panel = new ModPresetPanel(new ModPreset
+            {
+                Name = "Autopilot included",
+                Description = "no way",
+                Mods = new Mod[]
+                {
+                    new OsuModAutopilot()
+                },
+                Ruleset = new OsuRuleset().RulesetInfo
+            }.ToLiveUnmanaged())
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 0.5f
+            });
+
+            AddStep("Add touch device to selected mods", () => SelectedMods.Value = new Mod[] { new OsuModTouchDevice() });
+            AddStep("activate panel", () => panel.AsNonNull().TriggerClick());
+
+            // touch device should be removed due to incompatibility with autopilot.
+            assertSelectedModsEquivalentTo(new Mod[] { new OsuModAutopilot() });
+
+            AddStep("deactivate panel", () => panel.AsNonNull().TriggerClick());
+            assertSelectedModsEquivalentTo(Array.Empty<Mod>());
+
+            // just for test purposes, can't/shouldn't happen in reality
+            AddStep("Add score v2 to selected mod", () => SelectedMods.Value = new Mod[] { new ModScoreV2() });
+            AddStep("activate panel", () => panel.AsNonNull().TriggerClick());
+
+            assertSelectedModsEquivalentTo(new Mod[] { new OsuModAutopilot(), new ModScoreV2() });
+        }
+
         private void assertSelectedModsEquivalentTo(IEnumerable<Mod> mods)
             => AddAssert("selected mods changed correctly", () => new HashSet<Mod>(SelectedMods.Value).SetEquals(mods));
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 6c75530a6e47..a1452ddb31bd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -10,6 +10,7 @@
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -612,6 +613,23 @@ public void TestTextSearchNotActiveByDefault()
             AddAssert("search text box unfocused", () => !modSelectOverlay.SearchTextBox.HasFocus);
         }
 
+        [Test]
+        public void TestSearchBoxFocusToggleRespondsToExternalChanges()
+        {
+            AddStep("text search does not start active", () => configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, false));
+            createScreen();
+
+            AddUntilStep("search text box not focused", () => !modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddAssert("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("unfocus search text box externally", () => ((IFocusManager)InputManager).ChangeFocus(null));
+
+            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddAssert("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+        }
+
         [Test]
         public void TestTextSearchDoesNotBlockCustomisationPanelKeyboardInteractions()
         {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index d07b90025fbf..d84089fb6f39 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -5,7 +5,9 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Osu;
 
@@ -20,9 +22,9 @@ public partial class TestSceneNowPlayingOverlay : OsuTestScene
         private NowPlayingOverlay nowPlayingOverlay;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(FrameworkConfigManager frameworkConfig)
         {
-            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            AddToggleStep("toggle unicode", v => frameworkConfig.SetValue(FrameworkSetting.ShowUnicode, v));
 
             nowPlayingOverlay = new NowPlayingOverlay
             {
@@ -37,9 +39,38 @@ private void load()
         [Test]
         public void TestShowHideDisable()
         {
+            AddStep(@"set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo));
             AddStep(@"show", () => nowPlayingOverlay.Show());
             AddToggleStep(@"toggle beatmap lock", state => Beatmap.Disabled = state);
             AddStep(@"hide", () => nowPlayingOverlay.Hide());
         }
+
+        [Test]
+        public void TestLongMetadata()
+        {
+            AddStep(@"set metadata within tolerance", () => Beatmap.Value = CreateWorkingBeatmap(new Beatmap
+            {
+                Metadata =
+                {
+                    Artist = "very very very very very very very very very very verry long artist",
+                    ArtistUnicode = "very very very very very very very very very very verry long artist unicode",
+                    Title = "very very very very very verry long title",
+                    TitleUnicode = "very very very very very verry long title unicode",
+                }
+            }));
+
+            AddStep(@"set metadata outside bounds", () => Beatmap.Value = CreateWorkingBeatmap(new Beatmap
+            {
+                Metadata =
+                {
+                    Artist = "very very very very very very very very very very verrry long artist",
+                    ArtistUnicode = "not very long artist unicode",
+                    Title = "very very very very very verrry long title",
+                    TitleUnicode = "not very long title unicode",
+                }
+            }));
+
+            AddStep(@"show", () => nowPlayingOverlay.Show());
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs
similarity index 58%
rename from osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs
index 013bad55bcf1..162609df7004 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs
@@ -1,6 +1,8 @@
 // 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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -10,16 +12,19 @@
 using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Select.FooterV2;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Footer;
+using osu.Game.Screens.SelectV2.Footer;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.SongSelect
+namespace osu.Game.Tests.Visual.UserInterface
 {
-    public partial class TestSceneSongSelectFooterV2 : OsuManualInputManagerTestScene
+    public partial class TestSceneScreenFooter : OsuManualInputManagerTestScene
     {
-        private FooterButtonRandomV2 randomButton = null!;
-        private FooterButtonModsV2 modsButton = null!;
+        private ScreenFooterButtonRandom randomButton = null!;
+        private ScreenFooterButtonMods modsButton = null!;
 
         private bool nextRandomCalled;
         private bool previousRandomCalled;
@@ -35,25 +40,25 @@ public void SetUp() => Schedule(() =>
             nextRandomCalled = false;
             previousRandomCalled = false;
 
-            FooterV2 footer;
+            ScreenFooter footer;
 
             Children = new Drawable[]
             {
                 new PopoverContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = footer = new FooterV2(),
+                    Child = footer = new ScreenFooter(),
                 },
                 overlay = new DummyOverlay()
             };
 
-            footer.AddButton(modsButton = new FooterButtonModsV2(), overlay);
-            footer.AddButton(randomButton = new FooterButtonRandomV2
+            footer.AddButton(modsButton = new ScreenFooterButtonMods { Current = SelectedMods }, overlay);
+            footer.AddButton(randomButton = new ScreenFooterButtonRandom
             {
                 NextRandom = () => nextRandomCalled = true,
                 PreviousRandom = () => previousRandomCalled = true
             });
-            footer.AddButton(new FooterButtonOptionsV2());
+            footer.AddButton(new ScreenFooterButtonOptions());
 
             overlay.Hide();
         });
@@ -61,15 +66,40 @@ public void SetUp() => Schedule(() =>
         [SetUpSteps]
         public void SetUpSteps()
         {
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
             AddStep("set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)));
         }
 
+        [Test]
+        public void TestMods()
+        {
+            AddStep("one mod", () => SelectedMods.Value = new List<Mod> { new OsuModHidden() });
+            AddStep("two mods", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock() });
+            AddStep("three mods", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime() });
+            AddStep("four mods", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime(), new OsuModClassic() });
+            AddStep("five mods", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime(), new OsuModClassic(), new OsuModDifficultyAdjust() });
+
+            AddStep("modified", () => SelectedMods.Value = new List<Mod> { new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } });
+            AddStep("modified + one", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } });
+            AddStep("modified + two", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } });
+            AddStep("modified + three", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModClassic(), new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } });
+            AddStep("modified + four", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModClassic(), new OsuModDifficultyAdjust(), new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } });
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddWaitStep("wait", 3);
+            AddStep("one mod", () => SelectedMods.Value = new List<Mod> { new OsuModHidden() });
+
+            AddStep("clear mods", () => SelectedMods.Value = Array.Empty<Mod>());
+            AddWaitStep("wait", 3);
+            AddStep("five mods", () => SelectedMods.Value = new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime(), new OsuModClassic(), new OsuModDifficultyAdjust() });
+        }
+
         [Test]
         public void TestShowOptions()
         {
             AddStep("enable options", () =>
             {
-                var optionsButton = this.ChildrenOfType<FooterButtonV2>().Last();
+                var optionsButton = this.ChildrenOfType<ScreenFooterButton>().Last();
 
                 optionsButton.Enabled.Value = true;
                 optionsButton.TriggerClick();
@@ -79,7 +109,7 @@ public void TestShowOptions()
         [Test]
         public void TestState()
         {
-            AddToggleStep("set options enabled state", state => this.ChildrenOfType<FooterButtonV2>().Last().Enabled.Value = state);
+            AddToggleStep("set options enabled state", state => this.ChildrenOfType<ScreenFooterButton>().Last().Enabled.Value = state);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooterButtonMods.cs
new file mode 100644
index 000000000000..df2109ace812
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooterButtonMods.cs
@@ -0,0 +1,120 @@
+// 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.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.SelectV2.Footer;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneScreenFooterButtonMods : OsuTestScene
+    {
+        private readonly TestScreenFooterButtonMods footerButtonMods;
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        public TestSceneScreenFooterButtonMods()
+        {
+            Add(footerButtonMods = new TestScreenFooterButtonMods
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.CentreLeft,
+                X = -100,
+                Action = () => { },
+            });
+        }
+
+        [Test]
+        public void TestDisplay()
+        {
+            AddStep("one mod", () => changeMods(new List<Mod> { new OsuModHidden() }));
+            AddStep("two mods", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModHardRock() }));
+            AddStep("three mods", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime() }));
+            AddStep("four mods", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime(), new OsuModClassic() }));
+            AddStep("five mods", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime(), new OsuModClassic(), new OsuModDifficultyAdjust() }));
+
+            AddStep("modified", () => changeMods(new List<Mod> { new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } }));
+            AddStep("modified + one", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } }));
+            AddStep("modified + two", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime { SpeedChange = { Value = 1.2 } } }));
+
+            AddStep("clear mods", () => changeMods(Array.Empty<Mod>()));
+            AddWaitStep("wait", 3);
+            AddStep("one mod", () => changeMods(new List<Mod> { new OsuModHidden() }));
+
+            AddStep("clear mods", () => changeMods(Array.Empty<Mod>()));
+            AddWaitStep("wait", 3);
+            AddStep("five mods", () => changeMods(new List<Mod> { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime(), new OsuModClassic(), new OsuModDifficultyAdjust() }));
+        }
+
+        [Test]
+        public void TestIncrementMultiplier()
+        {
+            var hiddenMod = new Mod[] { new OsuModHidden() };
+            AddStep(@"Add Hidden", () => changeMods(hiddenMod));
+            AddAssert(@"Check Hidden multiplier", () => assertModsMultiplier(hiddenMod));
+
+            var hardRockMod = new Mod[] { new OsuModHardRock() };
+            AddStep(@"Add HardRock", () => changeMods(hardRockMod));
+            AddAssert(@"Check HardRock multiplier", () => assertModsMultiplier(hardRockMod));
+
+            var doubleTimeMod = new Mod[] { new OsuModDoubleTime() };
+            AddStep(@"Add DoubleTime", () => changeMods(doubleTimeMod));
+            AddAssert(@"Check DoubleTime multiplier", () => assertModsMultiplier(doubleTimeMod));
+
+            var multipleIncrementMods = new Mod[] { new OsuModDoubleTime(), new OsuModHidden(), new OsuModHardRock() };
+            AddStep(@"Add multiple Mods", () => changeMods(multipleIncrementMods));
+            AddAssert(@"Check multiple mod multiplier", () => assertModsMultiplier(multipleIncrementMods));
+        }
+
+        [Test]
+        public void TestDecrementMultiplier()
+        {
+            var easyMod = new Mod[] { new OsuModEasy() };
+            AddStep(@"Add Easy", () => changeMods(easyMod));
+            AddAssert(@"Check Easy multiplier", () => assertModsMultiplier(easyMod));
+
+            var noFailMod = new Mod[] { new OsuModNoFail() };
+            AddStep(@"Add NoFail", () => changeMods(noFailMod));
+            AddAssert(@"Check NoFail multiplier", () => assertModsMultiplier(noFailMod));
+
+            var multipleDecrementMods = new Mod[] { new OsuModEasy(), new OsuModNoFail() };
+            AddStep(@"Add Multiple Mods", () => changeMods(multipleDecrementMods));
+            AddAssert(@"Check multiple mod multiplier", () => assertModsMultiplier(multipleDecrementMods));
+        }
+
+        [Test]
+        public void TestUnrankedBadge()
+        {
+            AddStep(@"Add unranked mod", () => changeMods(new[] { new OsuModDeflate() }));
+            AddUntilStep("Unranked badge shown", () => footerButtonMods.ChildrenOfType<ScreenFooterButtonMods.UnrankedBadge>().Single().Alpha == 1);
+            AddStep(@"Clear selected mod", () => changeMods(Array.Empty<Mod>()));
+            AddUntilStep("Unranked badge not shown", () => footerButtonMods.ChildrenOfType<ScreenFooterButtonMods.UnrankedBadge>().Single().Alpha == 0);
+        }
+
+        private void changeMods(IReadOnlyList<Mod> mods) => footerButtonMods.Current.Value = mods;
+
+        private bool assertModsMultiplier(IEnumerable<Mod> mods)
+        {
+            double multiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            string expectedValue = ModUtils.FormatScoreMultiplier(multiplier).ToString();
+
+            return expectedValue == footerButtonMods.MultiplierText.Current.Value;
+        }
+
+        private partial class TestScreenFooterButtonMods : ScreenFooterButtonMods
+        {
+            public new OsuSpriteText MultiplierText => base.MultiplierText;
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index d23fcebae3ee..06b9623508f5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -42,7 +43,7 @@ public void TestNonInstantaneousMode()
         {
             AddStep("set instantaneous to false", () => sliderWithTextBoxInput.Instantaneous = false);
 
-            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("focus textbox", () => ((IFocusManager)InputManager).ChangeFocus(textBox));
             AddStep("change text", () => textBox.Text = "3");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.Zero);
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.Zero);
@@ -61,7 +62,7 @@ public void TestNonInstantaneousMode()
             AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
 
-            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("focus textbox", () => ((IFocusManager)InputManager).ChangeFocus(textBox));
             AddStep("set text to invalid", () => textBox.Text = "garbage");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
@@ -71,12 +72,12 @@ public void TestNonInstantaneousMode()
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
 
-            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("focus textbox", () => ((IFocusManager)InputManager).ChangeFocus(textBox));
             AddStep("set text to invalid", () => textBox.Text = "garbage");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
 
-            AddStep("lose focus", () => InputManager.ChangeFocus(null));
+            AddStep("lose focus", () => ((IFocusManager)InputManager).ChangeFocus(null));
             AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
@@ -87,7 +88,7 @@ public void TestInstantaneousMode()
         {
             AddStep("set instantaneous to true", () => sliderWithTextBoxInput.Instantaneous = true);
 
-            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("focus textbox", () => ((IFocusManager)InputManager).ChangeFocus(textBox));
             AddStep("change text", () => textBox.Text = "3");
             AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
             AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
@@ -106,7 +107,7 @@ public void TestInstantaneousMode()
             AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
 
-            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("focus textbox", () => ((IFocusManager)InputManager).ChangeFocus(textBox));
             AddStep("set text to invalid", () => textBox.Text = "garbage");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
@@ -116,12 +117,12 @@ public void TestInstantaneousMode()
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
 
-            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("focus textbox", () => ((IFocusManager)InputManager).ChangeFocus(textBox));
             AddStep("set text to invalid", () => textBox.Text = "garbage");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
 
-            AddStep("lose focus", () => InputManager.ChangeFocus(null));
+            AddStep("lose focus", () => ((IFocusManager)InputManager).ChangeFocus(null));
             AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index 88187f180813..63497040db1b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -114,6 +114,51 @@ void checkState(TernaryState expected)
                 => AddAssert($"state is {expected}", () => state.Value == expected);
         }
 
+        [Test]
+        public void TestItemRespondsToRightClick()
+        {
+            OsuMenu menu = null;
+
+            Bindable<TernaryState> state = new Bindable<TernaryState>(TernaryState.Indeterminate);
+
+            AddStep("create menu", () =>
+            {
+                state.Value = TernaryState.Indeterminate;
+
+                Child = menu = new OsuMenu(Direction.Vertical, true)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Items = new[]
+                    {
+                        new TernaryStateToggleMenuItem("First"),
+                        new TernaryStateToggleMenuItem("Second") { State = { BindTarget = state } },
+                        new TernaryStateToggleMenuItem("Third") { State = { Value = TernaryState.True } },
+                    }
+                };
+            });
+
+            checkState(TernaryState.Indeterminate);
+
+            click();
+            checkState(TernaryState.True);
+
+            click();
+            checkState(TernaryState.False);
+
+            AddStep("change state via bindable", () => state.Value = TernaryState.True);
+
+            void click() =>
+                AddStep("click", () =>
+                {
+                    InputManager.MoveMouseTo(menu.ScreenSpaceDrawQuad.Centre);
+                    InputManager.Click(MouseButton.Right);
+                });
+
+            void checkState(TernaryState expected)
+                => AddAssert($"state is {expected}", () => state.Value == expected);
+        }
+
         [Test]
         public void TestCustomState()
         {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 9f0fa1991595..08ed81525324 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -58,7 +58,7 @@ private void load()
             editorInfo.Selected.ValueChanged += selection =>
             {
                 // ensure any ongoing edits are committed out to the *current* selection before changing to a new one.
-                GetContainingInputManager().TriggerFocusContention(null);
+                GetContainingFocusManager().TriggerFocusContention(null);
 
                 // Required to avoid cyclic failure in BindableWithCurrent (TriggerChange called during the Current_Set process).
                 // Arguable a framework issue but since we haven't hit it anywhere else a local workaround seems best.
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
index 3a2db4fc71e2..111dede815c3 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs
@@ -22,7 +22,7 @@ public partial class LadderDragContainer : Container
 
         protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
 
-        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => false;
+        public override bool UpdateSubTreeMasking() => false;
 
         protected override void OnDrag(DragEvent e)
         {
diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 6db9febf366a..ae77e4adcfe5 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -63,6 +63,8 @@ public Beatmap()
 
         public List<BreakPeriod> Breaks { get; set; } = new List<BreakPeriod>();
 
+        public List<string> UnhandledEventLines { get; set; } = new List<string>();
+
         [JsonIgnore]
         public double TotalBreakTime => Breaks.Sum(b => b.Duration);
 
diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index c7c244bf0e47..b68c80d4b350 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -66,6 +66,7 @@ protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original, CancellationToken
             beatmap.ControlPointInfo = original.ControlPointInfo;
             beatmap.HitObjects = convertHitObjects(original.HitObjects, original, cancellationToken).OrderBy(s => s.StartTime).ToList();
             beatmap.Breaks = original.Breaks;
+            beatmap.UnhandledEventLines = original.UnhandledEventLines;
 
             return beatmap;
         }
diff --git a/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs b/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs
index 21ab1b78ea8a..3aa34a558085 100644
--- a/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs
+++ b/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.RegularExpressions;
 using osu.Framework.Allocation;
@@ -21,6 +22,8 @@
 
 namespace osu.Game.Beatmaps.Drawables
 {
+    [SuppressMessage("ReSharper", "StringLiteralTypo")]
+    [SuppressMessage("ReSharper", "CommentTypo")]
     public partial class BundledBeatmapDownloader : CompositeDrawable
     {
         private readonly bool shouldPostNotifications;
@@ -50,7 +53,7 @@ public BundledBeatmapDownloader(bool onlyTutorial, bool shouldPostNotifications
             {
                 queueDownloads(always_bundled_beatmaps);
 
-                queueDownloads(bundled_osu, 8);
+                queueDownloads(bundled_osu, 6);
                 queueDownloads(bundled_taiko, 3);
                 queueDownloads(bundled_catch, 3);
                 queueDownloads(bundled_mania, 3);
@@ -128,6 +131,26 @@ public BundledBeatmapDownloadRequest(IBeatmapSetInfo beatmapSetInfo, bool minimi
             }
         }
 
+        /*
+         * criteria for bundled maps (managed by pishifat)
+         *
+         *  auto:
+         *  - licensed song
+         *  - includes ENHI diffs
+         *  - between 60s and 240s
+         *
+         *  manual:
+         *  - bg is explicitly permitted as okay to use. lots of artists say some variation of "it's ok for personal use/non-commercial use/with credit"
+         *    (which is prob fine when maps are presented as user-generated content), but for a new osu! player, it's easy to assume bundled maps are
+         *     commercial content like other rhythm games, so it's best to be cautious about using not-explicitly-permitted artwork.
+         *
+         *  - no ai/thirst bgs
+         *  - no controversial/explicit song content or titles
+         *  - no repeating bundled songs (within each mode)
+         *  - no songs that are relatively low production value
+         *  - no songs with limited accessibility (annoying high pitch vocals, noise rock, etc)
+         */
+
         private const string tutorial_filename = "1011011 nekodex - new beginnings.osz";
 
         /// <summary>
@@ -135,215 +158,312 @@ public BundledBeatmapDownloadRequest(IBeatmapSetInfo beatmapSetInfo, bool minimi
         /// </summary>
         private static readonly string[] always_bundled_beatmaps =
         {
-            // This thing is 40mb, I'm not sure we want it here...
+            // winner of https://osu.ppy.sh/home/news/2013-09-06-osu-monthly-beatmapping-contest-1
+            @"123593 Rostik - Liquid (Paul Rosenthal Remix).osz",
+            // winner of https://osu.ppy.sh/home/news/2013-10-28-monthly-beatmapping-contest-2-submissions-open
+            @"140662 cYsmix feat. Emmy - Tear Rain.osz",
+            // winner of https://osu.ppy.sh/home/news/2013-12-15-monthly-beatmapping-contest-3-submissions-open
+            @"151878 Chasers - Lost.osz",
+            // winner of https://osu.ppy.sh/home/news/2014-02-14-monthly-beatmapping-contest-4-submissions-now
+            @"163112 Kuba Oms - My Love.osz",
+            // winner of https://osu.ppy.sh/home/news/2014-05-07-monthly-beatmapping-contest-5-submissions-now
+            @"190390 Rameses B - Flaklypa.osz",
+            // winner of https://osu.ppy.sh/home/news/2014-09-24-monthly-beatmapping-contest-7
+            @"241526 Soleily - Renatus.osz",
+            // winner of https://osu.ppy.sh/home/news/2015-02-11-monthly-beatmapping-contest-8
+            @"299224 raja - the light.osz",
+            // winner of https://osu.ppy.sh/home/news/2015-04-13-monthly-beatmapping-contest-9-taiko-only
+            @"319473 Furries in a Blender - Storm World.osz",
+            // winner of https://osu.ppy.sh/home/news/2015-06-15-monthly-beatmapping-contest-10-ctb-only
+            @"342751 Hylian Lemon - Foresight Is for Losers.osz",
+            // winner of https://osu.ppy.sh/home/news/2015-08-22-monthly-beatmapping-contest-11-mania-only
+            @"385056 Toni Leys - Dragon Valley (Toni Leys Remix feat. Esteban Bellucci).osz",
+            // winner of https://osu.ppy.sh/home/news/2016-03-04-beatmapping-contest-12-osu
+            @"456054 IAHN - Candy Luv (Short Ver.).osz",
+            // winner of https://osu.ppy.sh/home/news/2020-11-30-a-labour-of-love
+            // (this thing is 40mb, I'm not sure if we want it here...)
             @"1388906 Raphlesia & BilliumMoto - My Love.osz",
-            // Winner of Triangles mapping competition: https://osu.ppy.sh/home/news/2022-10-06-results-triangles
+            // winner of https://osu.ppy.sh/home/news/2022-05-31-triangles
             @"1841885 cYsmix - triangles.osz",
+            // winner of https://osu.ppy.sh/home/news/2023-02-01-twin-trials-contest-beatmapping-phase
+            @"1971987 James Landino - Aresene's Bazaar.osz",
         };
 
         private static readonly string[] bundled_osu =
         {
-            "682286 Yuyoyuppe - Emerald Galaxy.osz",
-            "682287 baker - For a Dead Girl+.osz",
-            "682289 Hige Driver - I Wanna Feel Your Love (feat. shully).osz",
-            "682290 Hige Driver - Miracle Sugite Yabai (feat. shully).osz",
-            "682416 Hige Driver - Palette.osz",
-            "682595 baker - Kimi ga Kimi ga -vocanico remix-.osz",
-            "716211 yuki. - Spring Signal.osz",
-            "716213 dark cat - BUBBLE TEA (feat. juu & cinders).osz",
-            "716215 LukHash - CLONED.osz",
-            "716219 IAHN - Snowdrop.osz",
-            "716249 *namirin - Senaka Awase no Kuukyo (with Kakichoco).osz",
-            "716390 sakuraburst - SHA.osz",
-            "716441 Fractal Dreamers - Paradigm Shift.osz",
-            "729808 Thaehan - Leprechaun.osz",
-            "751771 Cranky - Hanaarashi.osz",
-            "751772 Cranky - Ran.osz",
-            "751773 Cranky - Feline, the White....osz",
-            "751774 Function Phantom - Variable.osz",
-            "751779 Rin - Daishibyo set 14 ~ Sado no Futatsuiwa.osz",
-            "751782 Fractal Dreamers - Fata Morgana.osz",
-            "751785 Cranky - Chandelier - King.osz",
-            "751846 Fractal Dreamers - Celestial Horizon.osz",
-            "751866 Rin - Moriya set 08 ReEdit ~ Youkai no Yama.osz",
-            "751894 Fractal Dreamers - Blue Haven.osz",
-            "751896 Cranky - Rave 2 Rave.osz",
-            "751932 Cranky - La fuite des jours.osz",
-            "751972 Cranky - CHASER.osz",
-            "779173 Thaehan - Superpower.osz",
-            "780932 VINXIS - A Centralized View.osz",
-            "785572 S3RL - I'll See You Again (feat. Chi Chi).osz",
-            "785650 yuki. feat. setsunan - Hello! World.osz",
-            "785677 Dictate - Militant.osz",
-            "785731 S3RL - Catchit (Radio Edit).osz",
-            "785774 LukHash - GLITCH.osz",
-            "786498 Trial & Error - Tokoyami no keiyaku KEGARETA-SHOUJO feat. GUMI.osz",
-            "789374 Pulse - LP.osz",
-            "789528 James Portland - Sky.osz",
-            "789529 Lexurus - Gravity.osz",
-            "789544 Andromedik - Invasion.osz",
-            "789905 Gourski x Himmes - Silence.osz",
-            "791667 cYsmix - Babaroque (Short Ver.).osz",
-            "791798 cYsmix - Behind the Walls.osz",
-            "791845 cYsmix - Little Knight.osz",
-            "792241 cYsmix - Eden.osz",
-            "792396 cYsmix - The Ballad of a Mindless Girl.osz",
-            "795432 Phonetic - Journey.osz",
-            "831322 DJ'TEKINA//SOMETHING - Hidamari no Uta.osz",
-            "847764 Cranky - Crocus.osz",
-            "847776 Culprate & Joe Ford - Gaucho.osz",
-            "847812 J. Pachelbel - Canon (Cranky Remix).osz",
-            "847900 Cranky - Time Alter.osz",
-            "847930 LukHash - 8BIT FAIRY TALE.osz",
-            "848003 Culprate - Aurora.osz",
-            "848068 nanobii - popsicle beach.osz",
-            "848090 Trial & Error - DAI*TAN SENSATION feat. Nanahira, Mii, Aitsuki Nakuru (Short Ver.).osz",
-            "848259 Culprate & Skorpion - Jester.osz",
-            "848976 Dictate - Treason.osz",
-            "851543 Culprate - Florn.osz",
-            "864748 Thaehan - Angry Birds Epic (Remix).osz",
-            "873667 OISHII - ONIGIRI FREEWAY.osz",
-            "876227 Culprate, Keota & Sophie Meiers - Mechanic Heartbeat.osz",
-            "880487 cYsmix - Peer Gynt.osz",
-            "883088 Wisp X - Somewhere I'd Rather Be.osz",
-            "891333 HyuN - White Aura.osz",
-            "891334 HyuN - Wild Card.osz",
-            "891337 HyuN feat. LyuU - Cross Over.osz",
-            "891338 HyuN & Ritoru - Apocalypse in Love.osz",
-            "891339 HyuN feat. Ato - Asu wa Ame ga Yamukara.osz",
-            "891345 HyuN - Infinity Heaven.osz",
-            "891348 HyuN - Guitian.osz",
-            "891356 HyuN - Legend of Genesis.osz",
-            "891366 HyuN - Illusion of Inflict.osz",
-            "891417 HyuN feat. Yu-A - My life is for you.osz",
-            "891441 HyuN - You'Re aRleAdY dEAd.osz",
-            "891632 HyuN feat. YURI - Disorder.osz",
-            "891712 HyuN - Tokyo's Starlight.osz",
-            "901091 *namirin - Ciel etoile.osz",
-            "916990 *namirin - Koishiteiku Planet.osz",
-            "929284 tieff - Sense of Nostalgia.osz",
-            "933940 Ben Briggs - Yes (Maybe).osz",
-            "934415 Ben Briggs - Fearless Living.osz",
-            "934627 Ben Briggs - New Game Plus.osz",
-            "934666 Ben Briggs - Wave Island.osz",
-            "936126 siromaru + cranky - conflict.osz",
-            "940377 onumi - ARROGANCE.osz",
-            "940597 tieff - Take Your Swimsuit.osz",
-            "941085 tieff - Our Story.osz",
-            "949297 tieff - Sunflower.osz",
-            "952380 Ben Briggs - Why Are We Yelling.osz",
-            "954272 *namirin - Kanzen Shouri*Esper Girl.osz",
-            "955866 KIRA & Heartbreaker - B.B.F (feat. Hatsune Miku & Kagamine Rin).osz",
-            "961320 Kuba Oms - All In All.osz",
-            "964553 The Flashbulb - You Take the World's Weight Away.osz",
-            "965651 Fractal Dreamers - Ad Astra.osz",
-            "966225 The Flashbulb - Passage D.osz",
-            "966324 DJ'TEKINA//SOMETHING - Hidamari no Uta.osz",
-            "972810 James Landino & Kabuki - Birdsong.osz",
-            "972932 James Landino - Hide And Seek.osz",
-            "977276 The Flashbulb - Mellann.osz",
-            "981616 *namirin - Mizutamari Tobikoete (with Nanahira).osz",
-            "985788 Loki - Wizard's Tower.osz",
-            "996628 OISHII - ONIGIRI FREEWAY.osz",
-            "996898 HyuN - White Aura.osz",
-            "1003554 yuki. - Nadeshiko Sensation.osz",
-            "1014936 Thaehan - Bwa !.osz",
-            "1019827 UNDEAD CORPORATION - Sad Dream.osz",
-            "1020213 Creo - Idolize.osz",
-            "1021450 Thaehan - Chiptune & Baroque.osz",
+            @"682286 Yuyoyuppe - Emerald Galaxy.osz",
+            @"682287 baker - For a Dead Girl+.osz",
+            @"682595 baker - Kimi ga Kimi ga -vocanico remix-.osz",
+            @"1048705 Thaehan - Never Give Up.osz",
+            @"1050185 Carpool Tunnel - Hooked Again.osz",
+            @"1052846 Carpool Tunnel - Impressions.osz",
+            @"1062477 Ricky Montgomery - Line Without a Hook.osz",
+            @"1081119 Celldweller - Pulsar.osz",
+            @"1086289 Frums - 24eeev0-$.osz",
+            @"1133317 PUP - Free At Last.osz",
+            @"1171188 PUP - Full Blown Meltdown.osz",
+            @"1177043 PUP - My Life Is Over And I Couldn't Be Happier.osz",
+            @"1250387 Circle of Dust - Humanarchy (Cut Ver.).osz",
+            @"1255411 Wisp X - Somewhere I'd Rather Be.osz",
+            @"1320298 nekodex - Little Drummer Girl.osz",
+            @"1323877 Masahiro ""Godspeed"" Aoki - Blaze.osz",
+            @"1342280 Minagu feat. Aitsuki Nakuru - Theater Endroll.osz",
+            @"1356447 SECONDWALL - Boku wa Boku de shika Nakute.osz",
+            @"1368054 SECONDWALL - Shooting Star.osz",
+            @"1398580 La priere - Senjou no Utahime.osz",
+            @"1403962 m108 - Sunflower.osz",
+            @"1405913 fiend - FEVER DREAM (feat. yzzyx).osz",
+            @"1409184 Omoi - Hey William (New Translation).osz",
+            @"1413418 URBANGARDE - KAMING OUT (Cut Ver.).osz",
+            @"1417793 P4koo (NONE) - Sogaikan Utopia.osz",
+            @"1428384 DUAL ALTER WORLD - Veracila.osz",
+            @"1442963 PUP - DVP.osz",
+            @"1460370 Sound Souler - Empty Stars.osz",
+            @"1485184 Koven - Love Wins Again.osz",
+            @"1496811 T & Sugah - Wicked Days (Cut Ver.).osz",
+            @"1501511 Masahiro ""Godspeed"" Aoki - Frostbite (Cut Ver.).osz",
+            @"1511518 T & Sugah X Zazu - Lost On My Own (Cut Ver.).osz",
+            @"1516617 wotoha - Digital Life Hacker.osz",
+            @"1524273 Michael Cera Palin - Admiral.osz",
+            @"1564234 P4koo - Fly High (feat. rerone).osz",
+            @"1572918 Lexurus - Take Me Away (Cut Ver.).osz",
+            @"1577313 Kurubukko - The 84th Flight.osz",
+            @"1587839 Amidst - Droplet.osz",
+            @"1595193 BlackY - Sakura Ranman Cleopatra.osz",
+            @"1667560 xi - FREEDOM DiVE.osz",
+            @"1668789 City Girl - L2M (feat. Kelsey Kuan).osz",
+            @"1672934 xi - Parousia.osz",
+            @"1673457 Boom Kitty - Any Other Way (feat. Ivy Marie).osz",
+            @"1685122 xi - Time files.osz",
+            @"1689372 NIWASHI - Y.osz",
+            @"1729551 JOYLESS - Dream.osz",
+            @"1742868 Ritorikal - Synergy.osz",
+            @"1757511 KINEMA106 - KARASU.osz",
+            @"1778169 Ricky Montgomery - Cabo.osz",
+            @"1848184 FRASER EDWARDS - Ruination.osz",
+            @"1862574 Pegboard Nerds - Try This (Cut Ver.).osz",
+            @"1873680 happy30 - You spin my world.osz",
+            @"1890055 A.SAKA - Mutsuki Akari no Yuki.osz",
+            @"1911933 Marmalade butcher - Waltz for Chroma (feat. Natsushiro Takaaki).osz",
+            @"1940007 Mili - Ga1ahad and Scientific Witchery.osz",
+            @"1948970 Shadren - You're Here Forever.osz",
+            @"1967856 Annabel - alpine blue.osz",
+            @"1969316 Silentroom - NULCTRL.osz",
+            @"1978614 Krimek - Idyllic World.osz",
+            @"1991315 Feint - Tower Of Heaven (You Are Slaves) (Cut Ver.).osz",
+            @"1997470 tephe - Genjitsu Escape.osz",
+            @"1999116 soowamisu - .vaporcore.osz",
+            @"2010589 Junk - Yellow Smile (bms edit).osz",
+            @"2022054 Yokomin - STINGER.osz",
+            @"2025686 Aice room - For U.osz",
+            @"2035357 C-Show feat. Ishizawa Yukari - Border Line.osz",
+            @"2039403 SECONDWALL - Freedom.osz",
+            @"2046487 Rameses B - Against the Grain (feat. Veela).osz",
+            @"2052201 ColBreakz & Vizzen - Remember.osz",
+            @"2055535 Sephid - Thunderstrike 1988.osz",
+            @"2057584 SAMString - Ataraxia.osz",
+            @"2067270 Blue Stahli - The Fall.osz",
+            @"2075039 garlagan - Skyless.osz",
+            @"2079089 Hamu feat. yuiko - Innocent Letter.osz",
+            @"2082895 FATE GEAR - Heart's Grave.osz",
+            @"2085974 HoneyComeBear - Twilight.osz",
+            @"2094934 F.O.O.L & Laura Brehm - Waking Up.osz",
+            @"2097481 Mameyudoufu - Wave feat. Aitsuki Nakuru.osz",
+            @"2106075 MYUKKE. - The 89's Momentum.osz",
+            @"2117392 t+pazolite & Komiya Mao - Elustametat.osz",
+            @"2123533 LeaF - Calamity Fortune.osz",
+            @"2143876 Alkome - Your Voice.osz",
+            @"2145826 Sephid - Cross-D Skyline.osz",
+            @"2153172 Emiru no Aishita Tsukiyo ni Dai San Gensou Kyoku wo - Eternal Bliss.osz",
         };
 
         private static readonly string[] bundled_taiko =
         {
-            "707824 Fractal Dreamers - Fortuna Redux.osz",
-            "789553 Cranky - Ran.osz",
-            "827822 Function Phantom - Neuronecia.osz",
-            "847323 Nakanojojo - Bittersweet (feat. Kuishinboakachan a.k.a Kiato).osz",
-            "847433 Trial & Error - Tokoyami no keiyaku KEGARETA-SHOUJO feat. GUMI.osz",
-            "847576 dark cat - hot chocolate.osz",
-            "847957 Wisp X - Final Moments.osz",
-            "876282 VINXIS - Greetings.osz",
-            "876648 Thaehan - Angry Birds Epic (Remix).osz",
-            "877069 IAHN - Transform (Original Mix).osz",
-            "877496 Thaehan - Leprechaun.osz",
-            "877935 Thaehan - Overpowered.osz",
-            "878344 yuki. - Be Your Light.osz",
-            "918446 VINXIS - Facade.osz",
-            "918903 LukHash - Ghosts.osz",
-            "919251 *namirin - Hitokoto no Kyori.osz",
-            "919704 S3RL - I Will Pick You Up (feat. Tamika).osz",
-            "921535 SOOOO - Raven Haven.osz",
-            "927206 *namirin - Kanzen Shouri*Esper Girl.osz",
-            "927544 Camellia feat. Nanahira - Kansoku Eisei.osz",
-            "930806 Nakanojojo - Pararara (feat. Amekoya).osz",
-            "931741 Camellia - Quaoar.osz",
-            "935699 Rin - Mythic set ~ Heart-Stirring Urban Legends.osz",
-            "935732 Thaehan - Yuujou.osz",
-            "941145 Function Phantom - Euclid.osz",
-            "942334 Dictate - Cauldron.osz",
-            "946540 nanobii - astral blast.osz",
-            "948844 Rin - Kishinjou set 01 ~ Mist Lake.osz",
-            "949122 Wisp X - Petal.osz",
-            "951618 Rin - Kishinjou set 02 ~ Mermaid from the Uncharted Land.osz",
-            "957412 Rin - Lunatic set 16 ~ The Space Shrine Maiden Returns Home.osz",
-            "961335 Thaehan - Insert Coin.osz",
-            "965178 The Flashbulb - DIDJ PVC.osz",
-            "966087 The Flashbulb - Creep.osz",
-            "966277 The Flashbulb - Amen Iraq.osz",
-            "966407 LukHash - ROOM 12.osz",
-            "966451 The Flashbulb - Six Acid Strings.osz",
-            "972301 BilliumMoto - four veiled stars.osz",
-            "973173 nanobii - popsicle beach.osz",
-            "973954 BilliumMoto - Rocky Buinne (Short Ver.).osz",
-            "975435 BilliumMoto - life flashes before weeb eyes.osz",
-            "978759 L. V. Beethoven - Moonlight Sonata (Cranky Remix).osz",
-            "982559 BilliumMoto - HDHR.osz",
-            "984361 The Flashbulb - Ninedump.osz",
-            "1023681 Inferi - The Ruin of Mankind.osz",
-            "1034358 ALEPH - The Evil Spirit.osz",
-            "1037567 ALEPH - Scintillations.osz",
+            "1048153 Chroma - [@__@].osz",
+            "1229307 Venetian Snares - Shaky Sometimes.osz",
+            "1236083 meganeko - Sirius A (osu! edit).osz",
+            "1248594 Noisia - Anomaly.osz",
+            "1272851 siqlo - One Way Street.osz",
+            "1290736 Kola Kid - good old times.osz",
+            "1318825 SECONDWALL - Light.osz",
+            "1320872 MYUKKE. - The 89's Momentum.osz",
+            "1337389 cute girls doing cute things - Main Heroine.osz",
+            "1397782 Reku Mochizuki - Yorixiro.osz",
+            "1407228 II-L - VANGUARD-1.osz",
+            "1422686 II-L - VANGUARD-2.osz",
+            "1429217 Street - Phi.osz",
+            "1442235 2ToneDisco x Cosmicosmo - Shoelaces (feat. Puniden).osz",
+            "1447478 Cres. - End Time.osz",
+            "1449942 m108 - Crescent Sakura.osz",
+            "1463778 MuryokuP - A tree without a branch.osz",
+            "1465152 fiend - Fever Dream (feat. yzzyx).osz",
+            "1472397 MYUKKE. - Boudica.osz",
+            "1488148 Aoi vs. siqlo - Hacktivism.osz",
+            "1522733 wotoha - Digital Life Hacker.osz",
+            "1540010 Marmalade butcher - Floccinaucinihilipilification.osz",
+            "1584690 MYUKKE. - AKKERA-COUNTRY-BOY.osz",
+            "1608857 BLOOD STAIN CHILD - S.O.P.H.I.A.osz",
+            "1609365 Reku Mochizuki - Faith of Eastward.osz",
+            "1622545 METAROOM - I - DINKI THE STARGUIDE.osz",
+            "1629336 METAROOM - PINK ORIGINS.osz",
+            "1644680 Neko Hacker - Pictures feat. 4s4ki.osz",
+            "1650835 RiraN - Ready For The Madness.osz",
+            "1661508 PTB10 - Starfall.osz",
+            "1671987 xi - World Fragments II.osz",
+            "1703065 tokiwa - wasurena feat. Sennzai.osz",
+            "1703527 tokiwa feat. Nakamura Sanso - Kotodama Refrain.osz",
+            "1704340 A-One feat. Shihori - Magic Girl !!.osz",
+            "1712783 xi - Parousia.osz",
+            "1718774 Harumaki Gohan - Suisei ni Nareta nara.osz",
+            "1719687 EmoCosine - Love Kills U.osz",
+            "1733940 WHITEFISTS feat. Sennzai - Paralyzed Ash.osz",
+            "1734692 EmoCosine - Cutter.osz",
+            "1739529 luvlxckdown - tbh i dont like being social.osz",
+            "1756970 Kurubukko vs. yukitani - Minamichita EVOLVED.osz",
+            "1762209 Marmalade butcher - Immortality Math Club.osz",
+            "1765720 ZxNX - FORTALiCE.osz",
+            "1786165 NILFRUITS - Arandano.osz",
+            "1787258 SAMString - Night Fighter.osz",
+            "1791462 ZxNX - Schadenfreude.osz",
+            "1793821 Kobaryo - The Lightning Sword.osz",
+            "1796440 kuru x miraie - re:start.osz",
+            "1799285 Origami Angel - 666 Flags.osz",
+            "1812415 nanobii - Rainbow Road.osz",
+            "1814682 NIWASHI - Y.osz",
+            "1818361 meganeko - Feral (osu! edit).osz",
+            "1818924 fiend - Disconnect.osz",
+            "1838730 Pegboard Nerds - Disconnected.osz",
+            "1854710 Blaster & Extra Terra - Spacecraft (Cut Ver.).osz",
+            "1859322 Hino Isuka - Delightness Brightness.osz",
+            "1884102 Maduk - Go (feat. Lachi) (Cut Ver.).osz",
+            "1884578 Neko Hacker - People People feat. Nanahira.osz",
+            "1897902 uma vs. Morimori Atsushi - Re: End of a Dream.osz",
+            "1905582 KINEMA106 - Fly Away (Cut Ver.).osz",
+            "1934686 ARForest - Rainbow Magic!!.osz",
+            "1963076 METAROOM - S.N.U.F.F.Y.osz",
+            "1968973 Stars Hollow - Out the Sunroof..osz",
+            "1971951 James Landino - Shiba Paradise.osz",
+            "1972518 Toromaru - Sleight of Hand.osz",
+            "1982302 KINEMA106 - INVITE.osz",
+            "1983475 KNOWER - The Government Knows.osz",
+            "2010165 Junk - Yellow Smile (bms edit).osz",
+            "2022737 Andora - Euphoria (feat. WaMi).osz",
+            "2025023 tephe - Genjitsu Escape.osz",
+            "2052754 P4koo - 8th:Planet ~Re:search~.osz",
+            "2054122 Raimukun - Myths Orbis.osz",
+            "2121470 Raimukun - Nyarlathotep's Dreamland.osz",
+            "2122284 Agressor Bunx - Tornado (Cut Ver.).osz",
+            "2125034 Agressor Bunx - Acid Mirage (Cut Ver.).osz",
+            "2136263 Se-U-Ra - Cris Fortress.osz",
         };
 
         private static readonly string[] bundled_catch =
         {
-            "554256 Helblinde - When Time Sleeps.osz",
-            "693123 yuki. - Nadeshiko Sensation.osz",
-            "767009 OISHII - PIZZA PLAZA.osz",
-            "767346 Thaehan - Bwa !.osz",
-            "815162 VINXIS - Greetings.osz",
-            "840964 cYsmix - Breeze.osz",
-            "932657 Wisp X - Eventide.osz",
-            "933700 onumi - CONFUSION PART ONE.osz",
-            "933984 onumi - PERSONALITY.osz",
-            "934785 onumi - FAKE.osz",
-            "936545 onumi - REGRET PART ONE.osz",
-            "943803 Fractal Dreamers - Everything for a Dream.osz",
-            "943876 S3RL - I Will Pick You Up (feat. Tamika).osz",
-            "946773 Trial & Error - DREAMING COLOR (Short Ver.).osz",
-            "955808 Trial & Error - Tokoyami no keiyaku KEGARETA-SHOUJO feat. GUMI (Short Ver.).osz",
-            "957808 Fractal Dreamers - Module_410.osz",
-            "957842 antiPLUR - One Life Left to Live.osz",
-            "965730 The Flashbulb - Lawn Wake IV (Black).osz",
-            "966240 Creo - Challenger.osz",
-            "968232 Rin - Lunatic set 15 ~ The Moon as Seen from the Shrine.osz",
-            "972302 VINXIS - A Centralized View.osz",
-            "972887 HyuN - Illusion of Inflict.osz",
-            "1008600 LukHash - WHEN AN ANGEL DIES.osz",
-            "1032103 LukHash - H8 U.osz",
+            @"693123 yuki. - Nadeshiko Sensation.osz",
+            @"833719 FOLiACETATE - Heterochromia Iridis.osz",
+            @"981762 siromaru + cranky - conflict.osz",
+            @"1008600 LukHash - WHEN AN ANGEL DIES.osz",
+            @"1071294 dark cat - pursuit of happiness.osz",
+            @"1102115 meganeko - Nova.osz",
+            @"1115500 Chopin - Etude Op. 25, No. 12 (meganeko Remix).osz",
+            @"1128274 LeaF - Wizdomiot.osz",
+            @"1141049 HyuN feat. JeeE - Fallen Angel.osz",
+            @"1148215 Zekk - Fluctuation.osz",
+            @"1151833 ginkiha - nightfall.osz",
+            @"1158124 PUP - Dark Days.osz",
+            @"1184890 IAHN - Transform (Original Mix).osz",
+            @"1195922 Disasterpeace - Home.osz",
+            @"1197461 MIMI - Nanimo nai Youna.osz",
+            @"1197924 Camellia feat. Nanahira - Looking For A New Adventure.osz",
+            @"1203594 ginkiha - Anemoi.osz",
+            @"1211572 MIMI - Lapis Lazuli.osz",
+            @"1231601 Lime - Harmony.osz",
+            @"1240162 P4koo - 8th:Planet ~Re:search~.osz",
+            @"1246000 Zekk - Calling.osz",
+            @"1249928 Thaehan - Yuujou.osz",
+            @"1258751 Umeboshi Chazuke - ICHIBANBOSHI*ROCKET.osz",
+            @"1264818 Umeboshi Chazuke - Panic! Pop'n! Picnic! (2019 REMASTER).osz",
+            @"1280183 IAHN - Mad Halloween.osz",
+            @"1303201 Umeboshi Chazuke - Run*2 Run To You!!.osz",
+            @"1328918 Kobaryo - Theme for Psychopath Justice.osz",
+            @"1338215 Lime - Renai Syndrome.osz",
+            @"1338796 uma vs. Morimori Atsushi - Re:End of a Dream.osz",
+            @"1340492 MYUKKE. - The 89's Momentum.osz",
+            @"1393933 Mastermind (xi+nora2r) - Dreadnought.osz",
+            @"1400205 m108 - XIII Charlotte.osz",
+            @"1471328 Lime - Chronomia.osz",
+            @"1503591 Origami Angel - The Title Track.osz",
+            @"1524173 litmus* as Ester - Krave.osz",
+            @"1541235 Getty vs. DJ DiA - Grayed Out -Antifront-.osz",
+            @"1554250 Shawn Wasabi - Otter Pop (feat. Hollis).osz",
+            @"1583461 Sound Souler - Absent Color.osz",
+            @"1638487 tokiwa - wasurena feat. Sennzai.osz",
+            @"1698949 ZxNX - Schadenfreude.osz",
+            @"1704324 xi - Time files.osz",
+            @"1756405 Fractal Dreamers - Kingdom of Silence.osz",
+            @"1769575 cYsmix - Peer Gynt.osz",
+            @"1770054 Ardolf - Split.osz",
+            @"1772648 in love with a ghost - interdimensional portal leading to a cute place feat. snail's house.osz",
+            @"1776379 in love with a ghost - i thought we were lovers w/ basil.osz",
+            @"1779476 URBANGARDE - KIMI WA OKUMAGASO.osz",
+            @"1789435 xi - Parousia.osz",
+            @"1794190 Se-U-Ra - The Endless for Traveler.osz",
+            @"1799889 Waterflame - Ricochet Love.osz",
+            @"1816401 Gram vs. Yooh - Apocalypse.osz",
+            @"1826327 -45 - Total Eclipse of The Sun.osz",
+            @"1830796 xi - Halcyon.osz",
+            @"1924231 Mili - Nine Point Eight.osz",
+            @"1952903 Cres. - End Time.osz",
+            @"1970946 Good Kid - Slingshot.osz",
+            @"1982063 linear ring - enchanted love.osz",
+            @"2000438 Toromaru - Erinyes.osz",
+            @"2124277 II-L - VANGUARD-3.osz",
+            @"2147529 Nashimoto Ui - AaAaAaAAaAaAAa (Cut Ver.).osz",
         };
 
         private static readonly string[] bundled_mania =
         {
-            "943516 antiPLUR - Clockwork Spooks.osz",
-            "946394 VINXIS - Three Times The Original Charm.osz",
-            "966408 antiPLUR - One Life Left to Live.osz",
-            "971561 antiPLUR - Runengon.osz",
-            "983864 James Landino - Shiba Island.osz",
-            "989512 BilliumMoto - 1xMISS.osz",
-            "994104 James Landino - Reaction feat. Slyleaf.osz",
-            "1003217 nekodex - circles!.osz",
-            "1009907 James Landino & Kabuki - Birdsong.osz",
-            "1015169 Thaehan - Insert Coin.osz",
+            @"1008419 BilliumMoto - Four Veiled Stars.osz",
+            @"1025170 Frums - We Want To Run.osz",
+            @"1092856 F-777 - Viking Arena.osz",
+            @"1139247 O2i3 - Heart Function.osz",
+            @"1154007 LeaF - ATHAZA.osz",
+            @"1170054 Zekk - Fallen.osz",
+            @"1212132 Street - Koiyamai (TV Size).osz",
+            @"1226466 Se-U-Ra - Elif to Shiro Kura no Yoru -Called-.osz",
+            @"1247210 Frums - Credits.osz",
+            @"1254196 ARForest - Regret.osz",
+            @"1258829 Umeboshi Chazuke - Cineraria.osz",
+            @"1300398 ARForest - The Last Page.osz",
+            @"1305627 Frums - Star of the COME ON!!.osz",
+            @"1348806 Se-U-Ra - LOA2.osz",
+            @"1375449 yuki. - Nadeshiko Sensation.osz",
+            @"1448292 Cres. - End Time.osz",
+            @"1479741 Reku Mochizuki - FORViDDEN ENERZY -Fataldoze-.osz",
+            @"1494747 Fractal Dreamers - Whispers from a Distant Star.osz",
+            @"1505336 litmus* - Rush-More.osz",
+            @"1508963 ARForest - Rainbow Magic!!.osz",
+            @"1727126 Chroma - Strange Inventor.osz",
+            @"1737101 ZxNX - FORTALiCE.osz",
+            @"1740952 Sobrem x Silentroom - Random.osz",
+            @"1756251 Plum - Mad Piano Party.osz",
+            @"1909163 Frums - theyaremanycolors.osz",
+            @"1916285 siromaru + cranky - conflict.osz",
+            @"1948972 Ardolf - Split.osz",
+            @"1957138 GLORYHAMMER - Rise Of The Chaos Wizards.osz",
+            @"1972411 James Landino - Shiba Paradise.osz",
+            @"1978179 Andora - Flicker (feat. RANASOL).osz",
+            @"1987180 cygnus - The Evolution of War.osz",
+            @"1994458 tephe - Genjitsu Escape.osz",
+            @"1999339 Aice room - Nyan Nyan Dive (EmoCosine Remix).osz",
+            @"2015361 HoneyComeBear - Rainy Girl.osz",
+            @"2028108 HyuN - Infinity Heaven.osz",
+            @"2055329 miraie & blackwinterwells - facade.osz",
+            @"2069877 Sephid - Thunderstrike 1988.osz",
+            @"2119716 Aethoro - Snowy.osz",
+            @"2120379 Synthion - VIVIDVELOCITY.osz",
+            @"2124805 Frums (unknown ""lambda"") - 19ZZ.osz",
+            @"2127811 Wiklund - Joy of Living (Cut Ver.).osz",
         };
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
index 175c15ea7b76..2c2761ff0c83 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
@@ -61,7 +61,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        thumbnail = new BeatmapCardThumbnail(BeatmapSet)
+                        thumbnail = new BeatmapCardThumbnail(BeatmapSet, BeatmapSet)
                         {
                             Name = @"Left (icon) area",
                             Size = new Vector2(height),
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
index 18e1584a98d8..c6ba4f234aaf 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
@@ -62,7 +62,7 @@ private void load()
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        thumbnail = new BeatmapCardThumbnail(BeatmapSet)
+                        thumbnail = new BeatmapCardThumbnail(BeatmapSet, BeatmapSet)
                         {
                             Name = @"Left (icon) area",
                             Size = new Vector2(height),
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
index cd498c474adf..7b668d7dc477 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
@@ -8,7 +8,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.Drawables.Cards.Buttons;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osuTK;
@@ -36,14 +35,14 @@ public partial class BeatmapCardThumbnail : Container
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        public BeatmapCardThumbnail(APIBeatmapSet beatmapSetInfo)
+        public BeatmapCardThumbnail(IBeatmapSetInfo beatmapSetInfo, IBeatmapSetOnlineInfo onlineInfo)
         {
             InternalChildren = new Drawable[]
             {
                 new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.List)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    OnlineInfo = beatmapSetInfo
+                    OnlineInfo = onlineInfo
                 },
                 background = new Box
                 {
@@ -62,7 +61,6 @@ public BeatmapCardThumbnail(APIBeatmapSet beatmapSetInfo)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Size = new Vector2(50),
                             InnerRadius = 0.2f
                         },
                         content = new Container
@@ -93,6 +91,9 @@ protected override void Update()
         {
             base.Update();
             progress.Progress = playButton.Progress.Value;
+
+            playButton.Scale = new Vector2(DrawWidth / 100);
+            progress.Size = new Vector2(50 * DrawWidth / 100);
         }
 
         private void updateState()
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index 0bb60847e535..6f71fa90b8e3 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -52,8 +52,11 @@ protected override Drawable CreateDrawable(IBeatmapInfo? model)
 
         private Drawable getDrawableForModel(IBeatmapInfo? model)
         {
+            if (model == null)
+                return Empty();
+
             // prefer online cover where available.
-            if (model?.BeatmapSet is IBeatmapSetOnlineInfo online)
+            if (model.BeatmapSet is IBeatmapSetOnlineInfo online)
                 return new OnlineBeatmapSetCover(online, beatmapSetCoverType);
 
             if (model is BeatmapInfo localModel)
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableOnlineBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableOnlineBeatmapSetCover.cs
index 93b0dd5c15eb..5bce472613d0 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableOnlineBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableOnlineBeatmapSetCover.cs
@@ -27,8 +27,17 @@ public IBeatmapSetOnlineInfo OnlineInfo
             set => base.Masking = value;
         }
 
-        public UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover)
+        protected override double LoadDelay { get; }
+
+        private readonly double timeBeforeUnload;
+
+        protected override double TransformDuration => 400;
+
+        public UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover, double timeBeforeLoad = 500, double timeBeforeUnload = 1000)
         {
+            LoadDelay = timeBeforeLoad;
+            this.timeBeforeUnload = timeBeforeUnload;
+
             this.coverType = coverType;
 
             InternalChild = new Box
@@ -38,12 +47,12 @@ public UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType coverType = BeatmapSe
             };
         }
 
-        protected override double LoadDelay => 500;
-
-        protected override double TransformDuration => 400;
-
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
-            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
+            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, timeBeforeUnload)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
 
         protected override Drawable CreateDrawable(IBeatmapSetOnlineInfo model)
         {
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index d254945a5128..35067f40557e 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -53,7 +53,7 @@ public DummyWorkingBeatmap([NotNull] AudioManager audio, TextureStore textures)
 
         protected override IBeatmap GetBeatmap() => new Beatmap();
 
-        public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
+        public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg2");
 
         protected override Track GetBeatmapTrack() => GetVirtualTrack();
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 386dada32853..c2f40978891e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -85,6 +85,8 @@ protected override void ParseStreamInto(LineBufferedReader stream, Beatmap beatm
 
             base.ParseStreamInto(stream, beatmap);
 
+            applyDifficultyRestrictions(beatmap.Difficulty, beatmap);
+
             flushPendingPoints();
 
             // Objects may be out of order *only* if a user has manually edited an .osu file.
@@ -102,10 +104,30 @@ protected override void ParseStreamInto(LineBufferedReader stream, Beatmap beatm
             }
         }
 
+        /// <summary>
+        /// Ensures that all <see cref="BeatmapDifficulty"/> settings are within the allowed ranges.
+        /// See also: https://github.com/peppy/osu-stable-reference/blob/0e425c0d525ef21353c8293c235cc0621d28338b/osu!/GameplayElements/Beatmaps/Beatmap.cs#L567-L614
+        /// </summary>
+        private static void applyDifficultyRestrictions(BeatmapDifficulty difficulty, Beatmap beatmap)
+        {
+            difficulty.DrainRate = Math.Clamp(difficulty.DrainRate, 0, 10);
+
+            // mania uses "circle size" for key count, thus different allowable range
+            difficulty.CircleSize = beatmap.BeatmapInfo.Ruleset.OnlineID != 3
+                ? Math.Clamp(difficulty.CircleSize, 0, 10)
+                : Math.Clamp(difficulty.CircleSize, 1, 18);
+
+            difficulty.OverallDifficulty = Math.Clamp(difficulty.OverallDifficulty, 0, 10);
+            difficulty.ApproachRate = Math.Clamp(difficulty.ApproachRate, 0, 10);
+
+            difficulty.SliderMultiplier = Math.Clamp(difficulty.SliderMultiplier, 0.4, 3.6);
+            difficulty.SliderTickRate = Math.Clamp(difficulty.SliderTickRate, 0.5, 8);
+        }
+
         /// <summary>
         /// Processes the beatmap such that a new combo is started the first hitobject following each break.
         /// </summary>
-        private void postProcessBreaks(Beatmap beatmap)
+        private static void postProcessBreaks(Beatmap beatmap)
         {
             int currentBreak = 0;
             bool forceNewCombo = false;
@@ -161,14 +183,12 @@ private void applySamples(HitObject hitObject)
         /// This method's intention is to restore those legacy defaults.
         /// See also: https://osu.ppy.sh/wiki/en/Client/File_formats/Osu_%28file_format%29
         /// </summary>
-        private void applyLegacyDefaults(BeatmapInfo beatmapInfo)
+        private static void applyLegacyDefaults(BeatmapInfo beatmapInfo)
         {
             beatmapInfo.WidescreenStoryboard = false;
             beatmapInfo.SamplesMatchPlaybackRate = false;
         }
 
-        protected override bool ShouldSkipLine(string line) => base.ShouldSkipLine(line) || line.StartsWith(' ') || line.StartsWith('_');
-
         protected override void ParseLine(Beatmap beatmap, Section section, string line)
         {
             switch (section)
@@ -404,11 +424,11 @@ private void handleDifficulty(string line)
                     break;
 
                 case @"SliderMultiplier":
-                    difficulty.SliderMultiplier = Math.Clamp(Parsing.ParseDouble(pair.Value), 0.4, 3.6);
+                    difficulty.SliderMultiplier = Parsing.ParseDouble(pair.Value);
                     break;
 
                 case @"SliderTickRate":
-                    difficulty.SliderTickRate = Math.Clamp(Parsing.ParseDouble(pair.Value), 0.5, 8);
+                    difficulty.SliderTickRate = Parsing.ParseDouble(pair.Value);
                     break;
             }
         }
@@ -417,43 +437,57 @@ private void handleEvent(string line)
         {
             string[] split = line.Split(',');
 
-            if (!Enum.TryParse(split[0], out LegacyEventType type))
-                throw new InvalidDataException($@"Unknown event type: {split[0]}");
+            // Until we have full storyboard encoder coverage, let's track any lines which aren't handled
+            // and store them to a temporary location such that they aren't lost on editor save / export.
+            bool lineSupportedByEncoder = false;
 
-            switch (type)
+            if (Enum.TryParse(split[0], out LegacyEventType type))
             {
-                case LegacyEventType.Sprite:
-                    // Generally, the background is the first thing defined in a beatmap file.
-                    // In some older beatmaps, it is not present and replaced by a storyboard-level background instead.
-                    // Allow the first sprite (by file order) to act as the background in such cases.
-                    if (string.IsNullOrEmpty(beatmap.BeatmapInfo.Metadata.BackgroundFile))
-                        beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(split[3]);
-                    break;
-
-                case LegacyEventType.Video:
-                    string filename = CleanFilename(split[2]);
-
-                    // Some very old beatmaps had incorrect type specifications for their backgrounds (ie. using 1 for VIDEO
-                    // instead of 0 for BACKGROUND). To handle this gracefully, check the file extension against known supported
-                    // video extensions and handle similar to a background if it doesn't match.
-                    if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(filename).ToLowerInvariant()))
-                    {
-                        beatmap.BeatmapInfo.Metadata.BackgroundFile = filename;
-                    }
-
-                    break;
-
-                case LegacyEventType.Background:
-                    beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(split[2]);
-                    break;
-
-                case LegacyEventType.Break:
-                    double start = getOffsetTime(Parsing.ParseDouble(split[1]));
-                    double end = Math.Max(start, getOffsetTime(Parsing.ParseDouble(split[2])));
-
-                    beatmap.Breaks.Add(new BreakPeriod(start, end));
-                    break;
+                switch (type)
+                {
+                    case LegacyEventType.Sprite:
+                        // Generally, the background is the first thing defined in a beatmap file.
+                        // In some older beatmaps, it is not present and replaced by a storyboard-level background instead.
+                        // Allow the first sprite (by file order) to act as the background in such cases.
+                        if (string.IsNullOrEmpty(beatmap.BeatmapInfo.Metadata.BackgroundFile))
+                        {
+                            beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(split[3]);
+                            lineSupportedByEncoder = true;
+                        }
+
+                        break;
+
+                    case LegacyEventType.Video:
+                        string filename = CleanFilename(split[2]);
+
+                        // Some very old beatmaps had incorrect type specifications for their backgrounds (ie. using 1 for VIDEO
+                        // instead of 0 for BACKGROUND). To handle this gracefully, check the file extension against known supported
+                        // video extensions and handle similar to a background if it doesn't match.
+                        if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(filename).ToLowerInvariant()))
+                        {
+                            beatmap.BeatmapInfo.Metadata.BackgroundFile = filename;
+                            lineSupportedByEncoder = true;
+                        }
+
+                        break;
+
+                    case LegacyEventType.Background:
+                        beatmap.BeatmapInfo.Metadata.BackgroundFile = CleanFilename(split[2]);
+                        lineSupportedByEncoder = true;
+                        break;
+
+                    case LegacyEventType.Break:
+                        double start = getOffsetTime(Parsing.ParseDouble(split[1]));
+                        double end = Math.Max(start, getOffsetTime(Parsing.ParseDouble(split[2])));
+
+                        beatmap.Breaks.Add(new BreakPeriod(start, end));
+                        lineSupportedByEncoder = true;
+                        break;
+                }
             }
+
+            if (!lineSupportedByEncoder)
+                beatmap.UnhandledEventLines.Add(line);
         }
 
         private void handleTimingPoint(string line)
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 290d29090ad6..186b565c3928 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -156,6 +156,9 @@ private void handleEvents(TextWriter writer)
 
             foreach (var b in beatmap.Breaks)
                 writer.WriteLine(FormattableString.Invariant($"{(int)LegacyEventType.Break},{b.StartTime},{b.EndTime}"));
+
+            foreach (string l in beatmap.UnhandledEventLines)
+                writer.WriteLine(l);
         }
 
         private void handleControlPoints(TextWriter writer)
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 6689f087cbf6..2f9a256d312c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -9,6 +9,7 @@
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.IO;
 using osu.Game.Storyboards;
+using osu.Game.Storyboards.Commands;
 using osuTK;
 using osuTK.Graphics;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Beatmaps.Formats
     public class LegacyStoryboardDecoder : LegacyDecoder<Storyboard>
     {
         private StoryboardSprite? storyboardSprite;
-        private CommandTimelineGroup? timelineGroup;
+        private StoryboardCommandGroup? currentCommandsGroup;
 
         private Storyboard storyboard = null!;
 
@@ -114,7 +115,7 @@ private void handleEvents(string line)
                         if (!OsuGameBase.VIDEO_EXTENSIONS.Contains(Path.GetExtension(path).ToLowerInvariant()))
                             break;
 
-                        storyboard.GetLayer("Video").Add(new StoryboardVideo(path, offset));
+                        storyboard.GetLayer("Video").Add(storyboardSprite = new StoryboardVideo(path, offset));
                         break;
                     }
 
@@ -164,7 +165,7 @@ private void handleEvents(string line)
             else
             {
                 if (depth < 2)
-                    timelineGroup = storyboardSprite?.TimelineGroup;
+                    currentCommandsGroup = storyboardSprite?.Commands;
 
                 string commandType = split[0];
 
@@ -176,7 +177,7 @@ private void handleEvents(string line)
                         double startTime = split.Length > 2 ? Parsing.ParseDouble(split[2]) : double.MinValue;
                         double endTime = split.Length > 3 ? Parsing.ParseDouble(split[3]) : double.MaxValue;
                         int groupNumber = split.Length > 4 ? Parsing.ParseInt(split[4]) : 0;
-                        timelineGroup = storyboardSprite?.AddTrigger(triggerName, startTime, endTime, groupNumber);
+                        currentCommandsGroup = storyboardSprite?.AddTriggerGroup(triggerName, startTime, endTime, groupNumber);
                         break;
                     }
 
@@ -184,7 +185,7 @@ private void handleEvents(string line)
                     {
                         double startTime = Parsing.ParseDouble(split[1]);
                         int repeatCount = Parsing.ParseInt(split[2]);
-                        timelineGroup = storyboardSprite?.AddLoop(startTime, Math.Max(0, repeatCount - 1));
+                        currentCommandsGroup = storyboardSprite?.AddLoopingGroup(startTime, Math.Max(0, repeatCount - 1));
                         break;
                     }
 
@@ -203,7 +204,7 @@ private void handleEvents(string line)
                             {
                                 float startValue = Parsing.ParseFloat(split[4]);
                                 float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
-                                timelineGroup?.Alpha.Add(easing, startTime, endTime, startValue, endValue);
+                                currentCommandsGroup?.AddAlpha(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
@@ -211,7 +212,7 @@ private void handleEvents(string line)
                             {
                                 float startValue = Parsing.ParseFloat(split[4]);
                                 float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
-                                timelineGroup?.Scale.Add(easing, startTime, endTime, startValue, endValue);
+                                currentCommandsGroup?.AddScale(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
@@ -221,7 +222,7 @@ private void handleEvents(string line)
                                 float startY = Parsing.ParseFloat(split[5]);
                                 float endX = split.Length > 6 ? Parsing.ParseFloat(split[6]) : startX;
                                 float endY = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startY;
-                                timelineGroup?.VectorScale.Add(easing, startTime, endTime, new Vector2(startX, startY), new Vector2(endX, endY));
+                                currentCommandsGroup?.AddVectorScale(easing, startTime, endTime, new Vector2(startX, startY), new Vector2(endX, endY));
                                 break;
                             }
 
@@ -229,7 +230,7 @@ private void handleEvents(string line)
                             {
                                 float startValue = Parsing.ParseFloat(split[4]);
                                 float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
-                                timelineGroup?.Rotation.Add(easing, startTime, endTime, float.RadiansToDegrees(startValue), float.RadiansToDegrees(endValue));
+                                currentCommandsGroup?.AddRotation(easing, startTime, endTime, float.RadiansToDegrees(startValue), float.RadiansToDegrees(endValue));
                                 break;
                             }
 
@@ -239,8 +240,8 @@ private void handleEvents(string line)
                                 float startY = Parsing.ParseFloat(split[5]);
                                 float endX = split.Length > 6 ? Parsing.ParseFloat(split[6]) : startX;
                                 float endY = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startY;
-                                timelineGroup?.X.Add(easing, startTime, endTime, startX, endX);
-                                timelineGroup?.Y.Add(easing, startTime, endTime, startY, endY);
+                                currentCommandsGroup?.AddX(easing, startTime, endTime, startX, endX);
+                                currentCommandsGroup?.AddY(easing, startTime, endTime, startY, endY);
                                 break;
                             }
 
@@ -248,7 +249,7 @@ private void handleEvents(string line)
                             {
                                 float startValue = Parsing.ParseFloat(split[4]);
                                 float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
-                                timelineGroup?.X.Add(easing, startTime, endTime, startValue, endValue);
+                                currentCommandsGroup?.AddX(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
@@ -256,7 +257,7 @@ private void handleEvents(string line)
                             {
                                 float startValue = Parsing.ParseFloat(split[4]);
                                 float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
-                                timelineGroup?.Y.Add(easing, startTime, endTime, startValue, endValue);
+                                currentCommandsGroup?.AddY(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
@@ -268,7 +269,7 @@ private void handleEvents(string line)
                                 float endRed = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startRed;
                                 float endGreen = split.Length > 8 ? Parsing.ParseFloat(split[8]) : startGreen;
                                 float endBlue = split.Length > 9 ? Parsing.ParseFloat(split[9]) : startBlue;
-                                timelineGroup?.Colour.Add(easing, startTime, endTime,
+                                currentCommandsGroup?.AddColour(easing, startTime, endTime,
                                     new Color4(startRed / 255f, startGreen / 255f, startBlue / 255f, 1),
                                     new Color4(endRed / 255f, endGreen / 255f, endBlue / 255f, 1));
                                 break;
@@ -281,16 +282,16 @@ private void handleEvents(string line)
                                 switch (type)
                                 {
                                     case "A":
-                                        timelineGroup?.BlendingParameters.Add(easing, startTime, endTime, BlendingParameters.Additive,
+                                        currentCommandsGroup?.AddBlendingParameters(easing, startTime, endTime, BlendingParameters.Additive,
                                             startTime == endTime ? BlendingParameters.Additive : BlendingParameters.Inherit);
                                         break;
 
                                     case "H":
-                                        timelineGroup?.FlipH.Add(easing, startTime, endTime, true, startTime == endTime);
+                                        currentCommandsGroup?.AddFlipH(easing, startTime, endTime, true, startTime == endTime);
                                         break;
 
                                     case "V":
-                                        timelineGroup?.FlipV.Add(easing, startTime, endTime, true, startTime == endTime);
+                                        currentCommandsGroup?.AddFlipV(easing, startTime, endTime, true, startTime == endTime);
                                         break;
                                 }
 
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 6fe494ca0f04..5cc38e5b8460 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -42,6 +42,12 @@ public interface IBeatmap
         /// </summary>
         List<BreakPeriod> Breaks { get; }
 
+        /// <summary>
+        /// All lines from the [Events] section which aren't handled in the encoding process yet.
+        /// These lines shoule be written out to the beatmap file on save or export.
+        /// </summary>
+        List<string> UnhandledEventLines { get; }
+
         /// <summary>
         /// Total amount of break time in the beatmap.
         /// </summary>
diff --git a/osu.Game/Beatmaps/LocalCachedBeatmapMetadataSource.cs b/osu.Game/Beatmaps/LocalCachedBeatmapMetadataSource.cs
index 3f93c32283cd..27bc80344930 100644
--- a/osu.Game/Beatmaps/LocalCachedBeatmapMetadataSource.cs
+++ b/osu.Game/Beatmaps/LocalCachedBeatmapMetadataSource.cs
@@ -44,11 +44,34 @@ public LocalCachedBeatmapMetadataSource(Storage storage)
 
             this.storage = storage;
 
-            // avoid downloading / using cache for unit tests.
-            if (!DebugUtils.IsNUnitRunning && !storage.Exists(cache_database_name))
+            if (shouldFetchCache())
                 prepareLocalCache();
         }
 
+        private bool shouldFetchCache()
+        {
+            // avoid downloading / using cache for unit tests.
+            if (DebugUtils.IsNUnitRunning)
+                return false;
+
+            if (!storage.Exists(cache_database_name))
+            {
+                log(@"Fetching local cache because it does not exist.");
+                return true;
+            }
+
+            // periodically update the cache to include newer beatmaps.
+            var fileInfo = new FileInfo(storage.GetFullPath(cache_database_name));
+
+            if (fileInfo.LastWriteTime < DateTime.Now.AddMonths(-1))
+            {
+                log($@"Refetching local cache because it was last written to on {fileInfo.LastWriteTime}.");
+                return true;
+            }
+
+            return false;
+        }
+
         public bool Available =>
             // no download in progress.
             cacheDownloadRequest == null
@@ -124,6 +147,8 @@ public bool TryLookup(BeatmapInfo beatmapInfo, out OnlineBeatmapMetadata? online
 
         private void prepareLocalCache()
         {
+            bool isRefetch = storage.Exists(cache_database_name);
+
             string cacheFilePath = storage.GetFullPath(cache_database_name);
             string compressedCacheFilePath = $@"{cacheFilePath}.bz2";
 
@@ -132,9 +157,15 @@ private void prepareLocalCache()
             cacheDownloadRequest.Failed += ex =>
             {
                 File.Delete(compressedCacheFilePath);
-                File.Delete(cacheFilePath);
 
-                Logger.Log($@"{nameof(BeatmapUpdaterMetadataLookup)}'s online cache download failed: {ex}", LoggingTarget.Database);
+                // don't clobber the cache when refetching if the download didn't succeed. seems excessive.
+                // consequently, also null the download request to allow the existing cache to be used (see `Available`).
+                if (isRefetch)
+                    cacheDownloadRequest = null;
+                else
+                    File.Delete(cacheFilePath);
+
+                log($@"Online cache download failed: {ex}");
             };
 
             cacheDownloadRequest.Finished += () =>
@@ -143,15 +174,22 @@ private void prepareLocalCache()
                 {
                     using (var stream = File.OpenRead(cacheDownloadRequest.Filename))
                     using (var outStream = File.OpenWrite(cacheFilePath))
-                    using (var bz2 = new BZip2Stream(stream, CompressionMode.Decompress, false))
-                        bz2.CopyTo(outStream);
+                    {
+                        // ensure to clobber any and all existing data to avoid accidental corruption.
+                        outStream.SetLength(0);
+
+                        using (var bz2 = new BZip2Stream(stream, CompressionMode.Decompress, false))
+                            bz2.CopyTo(outStream);
+                    }
 
                     // set to null on completion to allow lookups to begin using the new source
                     cacheDownloadRequest = null;
+                    log(@"Local cache fetch completed successfully.");
                 }
                 catch (Exception ex)
                 {
-                    Logger.Log($@"{nameof(LocalCachedBeatmapMetadataSource)}'s online cache extraction failed: {ex}", LoggingTarget.Database);
+                    log($@"Online cache extraction failed: {ex}");
+                    // at this point clobber the cache regardless of whether we're refetching, because by this point who knows what state the cache file is in.
                     File.Delete(cacheFilePath);
                 }
                 finally
@@ -173,6 +211,9 @@ private void prepareLocalCache()
             });
         }
 
+        private static void log(string message)
+            => Logger.Log($@"[{nameof(LocalCachedBeatmapMetadataSource)}] {message}", LoggingTarget.Database);
+
         private void logForModel(BeatmapSetInfo set, string message) =>
             RealmArchiveModelImporter<BeatmapSetInfo>.LogForModel(set, $@"[{nameof(LocalCachedBeatmapMetadataSource)}] {message}");
 
diff --git a/osu.Game/Collections/CollectionDropdown.cs b/osu.Game/Collections/CollectionDropdown.cs
index 15dd64407388..c04689b0977e 100644
--- a/osu.Game/Collections/CollectionDropdown.cs
+++ b/osu.Game/Collections/CollectionDropdown.cs
@@ -202,7 +202,7 @@ public CollectionDropdownDrawableMenuItem(MenuItem item)
             [BackgroundDependencyLoader]
             private void load()
             {
-                AddInternal(addOrRemoveButton = new IconButton
+                AddInternal(addOrRemoveButton = new NoFocusChangeIconButton
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
@@ -271,6 +271,11 @@ private void addOrRemove()
             }
 
             protected override Drawable CreateContent() => (Content)base.CreateContent();
+
+            private partial class NoFocusChangeIconButton : IconButton
+            {
+                public override bool ChangeFocusOnClick => false;
+            }
         }
     }
 }
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 16645d6796e8..ea663f45fe5d 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -137,7 +137,7 @@ protected override void PopOut()
             this.ScaleTo(0.9f, exit_duration);
 
             // Ensure that textboxes commit
-            GetContainingInputManager()?.TriggerFocusContention(this);
+            GetContainingFocusManager()?.TriggerFocusContention(this);
         }
     }
 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f4a4c553d8cf..affcaffe02f1 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -200,6 +200,8 @@ protected override void InitialiseDefaults()
             SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
             SetDefault(OsuSetting.EditorShowSpeedChanges, false);
 
+            SetDefault(OsuSetting.HideCountryFlags, false);
+
             SetDefault(OsuSetting.MultiplayerRoomFilter, RoomPermissionsFilter.All);
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
@@ -435,6 +437,7 @@ public enum OsuSetting
         TouchDisableGameplayTaps,
         ModSelectTextSearchStartsActive,
         UserOnlineStatus,
-        MultiplayerRoomFilter
+        MultiplayerRoomFilter,
+        HideCountryFlags,
     }
 }
diff --git a/osu.Game/Database/BackgroundDataStoreProcessor.cs b/osu.Game/Database/BackgroundDataStoreProcessor.cs
index 872194aa1dba..7074c89b84ba 100644
--- a/osu.Game/Database/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/Database/BackgroundDataStoreProcessor.cs
@@ -16,6 +16,7 @@
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Performance;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
@@ -51,6 +52,9 @@ public partial class BackgroundDataStoreProcessor : Component
         [Resolved]
         private ILocalUserPlayInfo? localUserPlayInfo { get; set; }
 
+        [Resolved]
+        private IHighPerformanceSessionManager? highPerformanceSessionManager { get; set; }
+
         [Resolved]
         private INotificationOverlay? notificationOverlay { get; set; }
 
@@ -287,14 +291,17 @@ private void processScoresWithMissingStatistics()
                 {
                     var score = scoreManager.Query(s => s.ID == id);
 
-                    scoreManager.PopulateMaximumStatistics(score);
-
-                    // Can't use async overload because we're not on the update thread.
-                    // ReSharper disable once MethodHasAsyncOverload
-                    realmAccess.Write(r =>
+                    if (score != null)
                     {
-                        r.Find<ScoreInfo>(id)!.MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
-                    });
+                        scoreManager.PopulateMaximumStatistics(score);
+
+                        // Can't use async overload because we're not on the update thread.
+                        // ReSharper disable once MethodHasAsyncOverload
+                        realmAccess.Write(r =>
+                        {
+                            r.Find<ScoreInfo>(id)!.MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
+                        });
+                    }
 
                     ++processedCount;
                 }
@@ -493,7 +500,9 @@ private void completeNotification(ProgressNotification? notification, int proces
 
         private void sleepIfRequired()
         {
-            while (localUserPlayInfo?.IsPlaying.Value == true)
+            // Importantly, also sleep if high performance session is active.
+            // If we don't do this, memory usage can become runaway due to GC running in a more lenient mode.
+            while (localUserPlayInfo?.IsPlaying.Value == true || highPerformanceSessionManager?.IsSessionActive == true)
             {
                 Logger.Log("Background processing sleeping due to active gameplay...");
                 Thread.Sleep(TimeToSleepDuringGameplay);
diff --git a/osu.Game/Database/BeatmapExporter.cs b/osu.Game/Database/BeatmapExporter.cs
index f37c57dea55a..01ef09d3d76b 100644
--- a/osu.Game/Database/BeatmapExporter.cs
+++ b/osu.Game/Database/BeatmapExporter.cs
@@ -17,6 +17,8 @@ public BeatmapExporter(Storage storage)
         {
         }
 
+        protected override bool UseFixedEncoding => false;
+
         protected override string FileExtension => @".olz";
     }
 }
diff --git a/osu.Game/Database/EmptyRealmSet.cs b/osu.Game/Database/EmptyRealmSet.cs
index 02dfa50fe567..c34974cb0388 100644
--- a/osu.Game/Database/EmptyRealmSet.cs
+++ b/osu.Game/Database/EmptyRealmSet.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using JetBrains.Annotations;
 using Realms;
 using Realms.Schema;
 
@@ -15,8 +16,12 @@ public class EmptyRealmSet<T> : IRealmCollection<T>
     {
         private IList<T> emptySet => Array.Empty<T>();
 
+        [MustDisposeResource]
         public IEnumerator<T> GetEnumerator() => emptySet.GetEnumerator();
+
+        [MustDisposeResource]
         IEnumerator IEnumerable.GetEnumerator() => emptySet.GetEnumerator();
+
         public int Count => emptySet.Count;
         public T this[int index] => emptySet[index];
         public int IndexOf(object? item) => item == null ? -1 : emptySet.IndexOf((T)item);
diff --git a/osu.Game/Database/LegacyArchiveExporter.cs b/osu.Game/Database/LegacyArchiveExporter.cs
index 98052075910d..e4d3ed468170 100644
--- a/osu.Game/Database/LegacyArchiveExporter.cs
+++ b/osu.Game/Database/LegacyArchiveExporter.cs
@@ -3,10 +3,12 @@
 
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
+using osu.Game.IO.Archives;
 using osu.Game.Overlays.Notifications;
 using Realms;
 using SharpCompress.Common;
@@ -22,6 +24,11 @@ namespace osu.Game.Database
     public abstract class LegacyArchiveExporter<TModel> : LegacyExporter<TModel>
         where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
     {
+        /// <summary>
+        /// Whether to always use Shift-JIS encoding for archive filenames (like osu!stable did).
+        /// </summary>
+        protected virtual bool UseFixedEncoding => true;
+
         protected LegacyArchiveExporter(Storage storage)
             : base(storage)
         {
@@ -29,7 +36,12 @@ protected LegacyArchiveExporter(Storage storage)
 
         public override void ExportToStream(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
         {
-            using (var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)))
+            var zipWriterOptions = new ZipWriterOptions(CompressionType.Deflate)
+            {
+                ArchiveEncoding = UseFixedEncoding ? ZipArchiveReader.DEFAULT_ENCODING : new ArchiveEncoding(Encoding.UTF8, Encoding.UTF8)
+            };
+
+            using (var writer = new ZipWriter(outputStream, zipWriterOptions))
             {
                 int i = 0;
                 int fileCount = model.Files.Count();
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 167d170c8131..1ece81be5095 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -35,6 +35,7 @@
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK.Input;
 using Realms;
 using Realms.Exceptions;
@@ -91,8 +92,9 @@ public class RealmAccess : IDisposable
         /// 38   2023-12-10    Add EndTimeObjectCount and TotalObjectCount to BeatmapInfo.
         /// 39   2023-12-19    Migrate any EndTimeObjectCount and TotalObjectCount values of 0 to -1 to better identify non-calculated values.
         /// 40   2023-12-21    Add ScoreInfo.Version to keep track of which build scores were set on.
+        /// 41   2024-04-17    Add ScoreInfo.TotalScoreWithoutMods for future mod multiplier rebalances.
         /// </summary>
-        private const int schema_version = 40;
+        private const int schema_version = 41;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -321,12 +323,32 @@ private Realm prepareFirstRealmAccess()
                 {
                     Logger.Error(e, "Your local database is too new to work with this version of osu!. Please close osu! and install the latest release to recover your data.");
 
-                    // If a newer version database already exists, don't backup again. We can presume that the first backup is the one we care about.
+                    // If a newer version database already exists, don't create another backup. We can presume that the first backup is the one we care about.
                     if (!storage.Exists(newerVersionFilename))
                         createBackup(newerVersionFilename);
                 }
                 else
                 {
+                    // This error can occur due to file handles still being open by a previous instance.
+                    // If this is the case, rather than assuming the realm file is corrupt, block game startup.
+                    if (e.Message.StartsWith("SetEndOfFile() failed", StringComparison.Ordinal))
+                    {
+                        // This will throw if the realm file is not available for write access after 5 seconds.
+                        FileUtils.AttemptOperation(() =>
+                        {
+                            if (storage.Exists(Filename))
+                            {
+                                using (var _ = storage.GetStream(Filename, FileAccess.ReadWrite))
+                                {
+                                }
+                            }
+                        }, 20);
+
+                        // If the above eventually succeeds, try and continue startup as per normal.
+                        // This may throw again but let's allow it to, and block startup.
+                        return getRealmInstance();
+                    }
+
                     Logger.Error(e, "Realm startup failed with unrecoverable error; starting with a fresh database. A backup of your database has been made.");
                     createBackup($"{Filename.Replace(realm_extension, string.Empty)}_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}_corrupt{realm_extension}");
                 }
@@ -1108,6 +1130,22 @@ void convertOnlineIDs<T>() where T : RealmObject
                         }
                     }
 
+                    break;
+
+                case 41:
+                    foreach (var score in migration.NewRealm.All<ScoreInfo>())
+                    {
+                        try
+                        {
+                            // this can fail e.g. if a user has a score set on a ruleset that can no longer be loaded.
+                            LegacyScoreDecoder.PopulateTotalScoreWithoutMods(score);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.Log($@"Failed to populate total score without mods for score {score.ID}: {ex}", LoggingTarget.Database);
+                        }
+                    }
+
                     break;
             }
 
@@ -1142,33 +1180,18 @@ private void createBackup(string backupFilename)
         {
             Logger.Log($"Creating full realm database backup at {backupFilename}", LoggingTarget.Database);
 
-            int attempts = 10;
-
-            while (true)
+            FileUtils.AttemptOperation(() =>
             {
-                try
-                {
-                    using (var source = storage.GetStream(Filename, mode: FileMode.Open))
-                    {
-                        // source may not exist.
-                        if (source == null)
-                            return;
-
-                        using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
-                            source.CopyTo(destination);
-                    }
-
-                    return;
-                }
-                catch (IOException)
+                using (var source = storage.GetStream(Filename, mode: FileMode.Open))
                 {
-                    if (attempts-- <= 0)
-                        throw;
+                    // source may not exist.
+                    if (source == null)
+                        return;
 
-                    // file may be locked during use.
-                    Thread.Sleep(500);
+                    using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
+                        source.CopyTo(destination);
                 }
-            }
+            }, 20);
         }
 
         /// <summary>
diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index bc4954c6ea9c..0014e246dc0f 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -449,16 +449,6 @@ private string computeHashFast(ArchiveReader reader)
             return reader.Name.ComputeSHA2Hash();
         }
 
-        /// <summary>
-        /// Create all required <see cref="File"/>s for the provided archive, adding them to the global file store.
-        /// </summary>
-        private List<RealmNamedFileUsage> createFileInfos(ArchiveReader reader, RealmFileStore files, Realm realm)
-        {
-            var fileInfos = new List<RealmNamedFileUsage>();
-
-            return fileInfos;
-        }
-
         private IEnumerable<(string original, string shortened)> getShortenedFilenames(ArchiveReader reader)
         {
             string prefix = reader.Filenames.GetCommonPrefix();
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 6f2f8d64fa6b..db44731bed47 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -247,7 +247,7 @@ public static void UpdateFromLegacy(ScoreInfo score, WorkingBeatmap beatmap)
             // warning: ordering is important here - both total score and ranks are dependent on accuracy!
             score.Accuracy = computeAccuracy(score, scoreProcessor);
             score.Rank = computeRank(score, scoreProcessor);
-            score.TotalScore = convertFromLegacyTotalScore(score, ruleset, beatmap);
+            (score.TotalScoreWithoutMods, score.TotalScore) = convertFromLegacyTotalScore(score, ruleset, beatmap);
         }
 
         /// <summary>
@@ -271,7 +271,7 @@ public static void UpdateFromLegacy(ScoreInfo score, Ruleset ruleset, LegacyBeat
             // warning: ordering is important here - both total score and ranks are dependent on accuracy!
             score.Accuracy = computeAccuracy(score, scoreProcessor);
             score.Rank = computeRank(score, scoreProcessor);
-            score.TotalScore = convertFromLegacyTotalScore(score, ruleset, difficulty, attributes);
+            (score.TotalScoreWithoutMods, score.TotalScore) = convertFromLegacyTotalScore(score, ruleset, difficulty, attributes);
         }
 
         /// <summary>
@@ -281,17 +281,13 @@ public static void UpdateFromLegacy(ScoreInfo score, Ruleset ruleset, LegacyBeat
         /// <param name="ruleset">The <see cref="Ruleset"/> in which the score was set.</param>
         /// <param name="beatmap">The <see cref="WorkingBeatmap"/> applicable for this score.</param>
         /// <returns>The standardised total score.</returns>
-        private static long convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset, WorkingBeatmap beatmap)
+        private static (long withoutMods, long withMods) convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset, WorkingBeatmap beatmap)
         {
             if (!score.IsLegacyScore)
-                return score.TotalScore;
+                return (score.TotalScoreWithoutMods, score.TotalScore);
 
             if (ruleset is not ILegacyRuleset legacyRuleset)
-                return score.TotalScore;
-
-            var mods = score.Mods;
-            if (mods.Any(mod => mod is ModScoreV2))
-                return score.TotalScore;
+                return (score.TotalScoreWithoutMods, score.TotalScore);
 
             var playableBeatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods);
 
@@ -300,8 +296,13 @@ private static long convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset
 
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
             LegacyScoreAttributes attributes = sv1Simulator.Simulate(beatmap, playableBeatmap);
+            var legacyBeatmapConversionDifficultyInfo = LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap.Beatmap);
 
-            return convertFromLegacyTotalScore(score, ruleset, LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap.Beatmap), attributes);
+            var mods = score.Mods;
+            if (mods.Any(mod => mod is ModScoreV2))
+                return ((long)Math.Round(score.TotalScore / sv1Simulator.GetLegacyScoreMultiplier(mods, legacyBeatmapConversionDifficultyInfo)), score.TotalScore);
+
+            return convertFromLegacyTotalScore(score, ruleset, legacyBeatmapConversionDifficultyInfo, attributes);
         }
 
         /// <summary>
@@ -312,15 +313,15 @@ private static long convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset
         /// <param name="difficulty">The beatmap difficulty.</param>
         /// <param name="attributes">The legacy scoring attributes for the beatmap which the score was set on.</param>
         /// <returns>The standardised total score.</returns>
-        private static long convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
+        private static (long withoutMods, long withMods) convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
         {
             if (!score.IsLegacyScore)
-                return score.TotalScore;
+                return (score.TotalScoreWithoutMods, score.TotalScore);
 
             Debug.Assert(score.LegacyTotalScore != null);
 
             if (ruleset is not ILegacyRuleset legacyRuleset)
-                return score.TotalScore;
+                return (score.TotalScoreWithoutMods, score.TotalScore);
 
             double legacyModMultiplier = legacyRuleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(score.Mods, difficulty);
             int maximumLegacyAccuracyScore = attributes.AccuracyScore;
@@ -352,17 +353,18 @@ private static long convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset
 
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
 
-            long convertedTotalScore;
+            long convertedTotalScoreWithoutMods;
 
             switch (score.Ruleset.OnlineID)
             {
                 case 0:
                     if (score.MaxCombo == 0 || score.Accuracy == 0)
                     {
-                        return (long)Math.Round((
+                        convertedTotalScoreWithoutMods = (long)Math.Round(
                             0
                             + 500000 * Math.Pow(score.Accuracy, 5)
-                            + bonusProportion) * modMultiplier);
+                            + bonusProportion);
+                        break;
                     }
 
                     // see similar check above.
@@ -370,10 +372,11 @@ private static long convertFromLegacyTotalScore(ScoreInfo score, Ruleset ruleset
                     // are either pointless or wildly wrong.
                     if (maximumLegacyComboScore + maximumLegacyBonusScore == 0)
                     {
-                        return (long)Math.Round((
+                        convertedTotalScoreWithoutMods = (long)Math.Round(
                             500000 * comboProportion // as above, zero if mods result in zero multiplier, one otherwise
                             + 500000 * Math.Pow(score.Accuracy, 5)
-                            + bonusProportion) * modMultiplier);
+                            + bonusProportion);
+                        break;
                     }
 
                     // Assumptions:
@@ -470,17 +473,17 @@ double scoreBasedEstimateOfComboPortionInStandardisedScore
 
                     double newComboScoreProportion = estimatedComboPortionInStandardisedScore / maximumAchievableComboPortionInStandardisedScore;
 
-                    convertedTotalScore = (long)Math.Round((
+                    convertedTotalScoreWithoutMods = (long)Math.Round(
                         500000 * newComboScoreProportion * score.Accuracy
                         + 500000 * Math.Pow(score.Accuracy, 5)
-                        + bonusProportion) * modMultiplier);
+                        + bonusProportion);
                     break;
 
                 case 1:
-                    convertedTotalScore = (long)Math.Round((
+                    convertedTotalScoreWithoutMods = (long)Math.Round(
                         250000 * comboProportion
                         + 750000 * Math.Pow(score.Accuracy, 3.6)
-                        + bonusProportion) * modMultiplier);
+                        + bonusProportion);
                     break;
 
                 case 2:
@@ -505,28 +508,28 @@ double scoreBasedEstimateOfComboPortionInStandardisedScore
                         ? 0
                         : (double)score.Statistics.GetValueOrDefault(HitResult.SmallTickHit) / score.MaximumStatistics.GetValueOrDefault(HitResult.SmallTickHit);
 
-                    convertedTotalScore = (long)Math.Round((
+                    convertedTotalScoreWithoutMods = (long)Math.Round(
                         comboPortion * estimateComboProportionForCatch(attributes.MaxCombo, score.MaxCombo, score.Statistics.GetValueOrDefault(HitResult.Miss))
                         + dropletsPortion * dropletsHit
-                        + bonusProportion) * modMultiplier);
+                        + bonusProportion);
                     break;
 
                 case 3:
-                    convertedTotalScore = (long)Math.Round((
+                    convertedTotalScoreWithoutMods = (long)Math.Round(
                         850000 * comboProportion
                         + 150000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
-                        + bonusProportion) * modMultiplier);
+                        + bonusProportion);
                     break;
 
                 default:
-                    convertedTotalScore = score.TotalScore;
-                    break;
+                    return (score.TotalScoreWithoutMods, score.TotalScore);
             }
 
-            if (convertedTotalScore < 0)
-                throw new InvalidOperationException($"Total score conversion operation returned invalid total of {convertedTotalScore}");
+            if (convertedTotalScoreWithoutMods < 0)
+                throw new InvalidOperationException($"Total score conversion operation returned invalid total of {convertedTotalScoreWithoutMods}");
 
-            return convertedTotalScore;
+            long convertedTotalScore = (long)Math.Round(convertedTotalScoreWithoutMods * modMultiplier);
+            return (convertedTotalScoreWithoutMods, convertedTotalScore);
         }
 
         /// <summary>
diff --git a/osu.Game/Graphics/OsuIcon.cs b/osu.Game/Graphics/OsuIcon.cs
index 3cd10b131555..9879ef5d148d 100644
--- a/osu.Game/Graphics/OsuIcon.cs
+++ b/osu.Game/Graphics/OsuIcon.cs
@@ -120,6 +120,7 @@ public static class OsuIcon
         public static IconUsage Cross => get(OsuIconMapping.Cross);
         public static IconUsage CrossCircle => get(OsuIconMapping.CrossCircle);
         public static IconUsage Crown => get(OsuIconMapping.Crown);
+        public static IconUsage DailyChallenge => get(OsuIconMapping.DailyChallenge);
         public static IconUsage Debug => get(OsuIconMapping.Debug);
         public static IconUsage Delete => get(OsuIconMapping.Delete);
         public static IconUsage Details => get(OsuIconMapping.Details);
@@ -175,6 +176,8 @@ public static class OsuIcon
         public static IconUsage EditorSelect => get(OsuIconMapping.EditorSelect);
         public static IconUsage EditorSound => get(OsuIconMapping.EditorSound);
         public static IconUsage EditorWhistle => get(OsuIconMapping.EditorWhistle);
+        public static IconUsage Tortoise => get(OsuIconMapping.Tortoise);
+        public static IconUsage Hare => get(OsuIconMapping.Hare);
 
         private static IconUsage get(OsuIconMapping glyph) => new IconUsage((char)glyph, FONT_NAME);
 
@@ -216,6 +219,9 @@ private enum OsuIconMapping
             [Description(@"crown")]
             Crown,
 
+            [Description(@"daily-challenge")]
+            DailyChallenge,
+
             [Description(@"debug")]
             Debug,
 
@@ -380,6 +386,12 @@ private enum OsuIconMapping
 
             [Description(@"Editor/whistle")]
             EditorWhistle,
+
+            [Description(@"tortoise")]
+            Tortoise,
+
+            [Description(@"hare")]
+            Hare,
         }
 
         public class OsuIconStore : ITextureStore, ITexturedGlyphLookupStore
diff --git a/osu.Game/Graphics/Sprites/GlowingDrawable.cs b/osu.Game/Graphics/Sprites/GlowingDrawable.cs
new file mode 100644
index 000000000000..10085ad38be9
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/GlowingDrawable.cs
@@ -0,0 +1,41 @@
+// 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.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Utils;
+using osuTK;
+
+namespace osu.Game.Graphics.Sprites
+{
+    public abstract partial class GlowingDrawable : BufferedContainer
+    {
+        // Inflate draw quad to prevent glow from trimming at the edges.
+        // Padding won't suffice since it will affect drawable position in cases when it's not centered.
+        protected override Quad ComputeScreenSpaceDrawQuad()
+            => base.ComputeScreenSpaceDrawQuad().AABBFloat.Inflate(new Vector2(Blur.KernelSize(BlurSigma.X), Blur.KernelSize(BlurSigma.Y)));
+
+        public ColourInfo GlowColour
+        {
+            get => EffectColour;
+            set
+            {
+                EffectColour = value;
+                BackgroundColour = value.MultiplyAlpha(0f);
+            }
+        }
+
+        protected GlowingDrawable()
+            : base(cachedFrameBuffer: true)
+        {
+            AutoSizeAxes = Axes.Both;
+            RedrawOnScale = false;
+            DrawOriginal = true;
+            Child = CreateDrawable();
+        }
+
+        protected abstract Drawable CreateDrawable();
+    }
+}
diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index 669c5da01e87..3ac13bf86227 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
@@ -4,24 +4,17 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Framework.Utils;
 using osuTK;
 
 namespace osu.Game.Graphics.Sprites
 {
-    public partial class GlowingSpriteText : BufferedContainer, IHasText
+    public partial class GlowingSpriteText : GlowingDrawable, IHasText
     {
         private const float blur_sigma = 3f;
 
-        // Inflate draw quad to prevent glow from trimming at the edges.
-        // Padding won't suffice since it will affect text position in cases when it's not centered.
-        protected override Quad ComputeScreenSpaceDrawQuad() => base.ComputeScreenSpaceDrawQuad().AABBFloat.Inflate(Blur.KernelSize(blur_sigma));
-
-        private readonly OsuSpriteText text;
+        private OsuSpriteText text = null!;
 
         public LocalisableString Text
         {
@@ -47,16 +40,6 @@ public ColourInfo TextColour
             set => text.Colour = value;
         }
 
-        public ColourInfo GlowColour
-        {
-            get => EffectColour;
-            set
-            {
-                EffectColour = value;
-                BackgroundColour = value.MultiplyAlpha(0f);
-            }
-        }
-
         public Vector2 Spacing
         {
             get => text.Spacing;
@@ -76,20 +59,16 @@ public Bindable<string> Current
         }
 
         public GlowingSpriteText()
-            : base(cachedFrameBuffer: true)
         {
-            AutoSizeAxes = Axes.Both;
             BlurSigma = new Vector2(blur_sigma);
-            RedrawOnScale = false;
-            DrawOriginal = true;
             EffectBlending = BlendingParameters.Additive;
-            EffectPlacement = EffectPlacement.InFront;
-            Child = text = new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Shadow = false,
-            };
         }
+
+        protected override Drawable CreateDrawable() => text = new OsuSpriteText
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            Shadow = false,
+        };
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index 2f2cb7e5f8ce..06ef75cf5844 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -12,6 +13,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
@@ -40,6 +42,27 @@ private void load()
             AddInternal(hoverClickSounds = new HoverClickSounds());
 
             updateTextColour();
+
+            bool hasSubmenu = Item.Items.Any();
+
+            // Only add right chevron if direction of menu items is vertical (i.e. width is relative size, see `DrawableMenuItem.SetFlowDirection()`).
+            if (hasSubmenu && RelativeSizeAxes == Axes.X)
+            {
+                AddInternal(new SpriteIcon
+                {
+                    Margin = new MarginPadding(6),
+                    Size = new Vector2(8),
+                    Icon = FontAwesome.Solid.ChevronRight,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                });
+
+                text.Padding = new MarginPadding
+                {
+                    // Add some padding for the chevron above.
+                    Right = 5,
+                };
+            }
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
index 5af275c9e725..686c490930d3 100644
--- a/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableStatefulMenuItem.cs
@@ -4,7 +4,9 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -19,6 +21,16 @@ public DrawableStatefulMenuItem(StatefulMenuItem item)
 
         protected override TextContainer CreateTextContainer() => new ToggleTextContainer(Item);
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            // Right mouse button is a special case where we allow actioning without dismissing the menu.
+            // This is achieved by not calling `Clicked` (as done by the base implementation in OnClick).
+            if (IsActionable && e.Button == MouseButton.Right)
+                Item.Action.Value?.Invoke();
+
+            return true;
+        }
+
         private partial class ToggleTextContainer : TextContainer
         {
             private readonly StatefulMenuItem menuItem;
diff --git a/osu.Game/Graphics/UserInterface/ExpandableSlider.cs b/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
index 121a1eef4916..a7a8561b9474 100644
--- a/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
+++ b/osu.Game/Graphics/UserInterface/ExpandableSlider.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 System;
+using System.Numerics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -10,7 +10,7 @@
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osuTK;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -18,7 +18,7 @@ namespace osu.Game.Graphics.UserInterface
     /// An <see cref="IExpandable"/> implementation for the UI slider bar control.
     /// </summary>
     public partial class ExpandableSlider<T, TSlider> : CompositeDrawable, IExpandable, IHasCurrentValue<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
         where TSlider : RoundedSliderBar<T>, new()
     {
         private readonly OsuSpriteText label;
@@ -129,7 +129,7 @@ protected override void LoadComplete()
     /// An <see cref="IExpandable"/> implementation for the UI slider bar control.
     /// </summary>
     public partial class ExpandableSlider<T> : ExpandableSlider<T, RoundedSliderBar<T>>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
index 338f32f32175..4ec93995a4e4 100644
--- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -31,7 +31,7 @@ public void TakeFocus()
             if (!allowImmediateFocus)
                 return;
 
-            Scheduler.Add(() => GetContainingInputManager().ChangeFocus(this));
+            Scheduler.Add(() => GetContainingFocusManager().ChangeFocus(this));
         }
 
         public new void KillFocus() => base.KillFocus();
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index b7b405a7e865..caab3d97f82b 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -52,8 +52,6 @@ public OsuCheckbox(bool nubOnRight = true, float nubSize = Nub.DEFAULT_EXPANDED_
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 
-            const float nub_padding = 5;
-
             Children = new Drawable[]
             {
                 LabelTextFlowContainer = new OsuTextFlowContainer(ApplyLabelParameters)
@@ -69,15 +67,13 @@ public OsuCheckbox(bool nubOnRight = true, float nubSize = Nub.DEFAULT_EXPANDED_
             {
                 Nub.Anchor = Anchor.CentreRight;
                 Nub.Origin = Anchor.CentreRight;
-                Nub.Margin = new MarginPadding { Right = nub_padding };
-                LabelTextFlowContainer.Padding = new MarginPadding { Right = Nub.DEFAULT_EXPANDED_SIZE + nub_padding * 2 };
+                LabelTextFlowContainer.Padding = new MarginPadding { Right = Nub.DEFAULT_EXPANDED_SIZE + 10f };
             }
             else
             {
                 Nub.Anchor = Anchor.CentreLeft;
                 Nub.Origin = Anchor.CentreLeft;
-                Nub.Margin = new MarginPadding { Left = nub_padding };
-                LabelTextFlowContainer.Padding = new MarginPadding { Left = Nub.DEFAULT_EXPANDED_SIZE + nub_padding * 2 };
+                LabelTextFlowContainer.Padding = new MarginPadding { Left = Nub.DEFAULT_EXPANDED_SIZE + 10f };
             }
 
             Nub.Current.BindTo(Current);
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 191a7ca24639..9cb6356cabd1 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Numerics;
 using System.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -15,7 +16,7 @@
 namespace osu.Game.Graphics.UserInterface
 {
     public abstract partial class OsuSliderBar<T> : SliderBar<T>, IHasTooltip
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
         public bool PlaySamplesOnAdjust { get; set; } = true;
 
@@ -85,11 +86,11 @@ private void playSample(T value)
         private LocalisableString getTooltipText(T value)
         {
             if (CurrentNumber.IsInteger)
-                return value.ToInt32(NumberFormatInfo.InvariantInfo).ToString("N0");
+                return int.CreateTruncating(value).ToString("N0");
 
-            double floatValue = value.ToDouble(NumberFormatInfo.InvariantInfo);
+            double floatValue = double.CreateTruncating(value);
 
-            decimal decimalPrecision = normalise(CurrentNumber.Precision.ToDecimal(NumberFormatInfo.InvariantInfo), max_decimal_digits);
+            decimal decimalPrecision = normalise(decimal.CreateTruncating(CurrentNumber.Precision), max_decimal_digits);
 
             // Find the number of significant digits (we could have less than 5 after normalize())
             int significantDigits = FormatUtils.FindPrecision(decimalPrecision);
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index f24977927f60..5ce384c53cbf 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -8,6 +8,8 @@
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
@@ -143,13 +145,6 @@ protected override void OnHoverLost(HoverLostEvent e)
                     FadeUnhovered();
             }
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                if (accentColour == default)
-                    AccentColour = colours.Blue;
-            }
-
             public OsuTabItem(T value)
                 : base(value)
             {
@@ -196,10 +191,21 @@ public OsuTabItem(T value)
                         Origin = Anchor.BottomLeft,
                         Anchor = Anchor.BottomLeft,
                     },
-                    new HoverClickSounds(HoverSampleSet.TabSelect)
+                    new HoverSounds(HoverSampleSet.TabSelect)
                 };
             }
 
+            private Sample selectSample;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours, AudioManager audio)
+            {
+                if (accentColour == default)
+                    AccentColour = colours.Blue;
+
+                selectSample = audio.Samples.Get(@"UI/tabselect-select");
+            }
+
             protected override void OnActivated()
             {
                 Text.Font = Text.Font.With(weight: FontWeight.Bold);
@@ -211,6 +217,8 @@ protected override void OnDeactivated()
                 Text.Font = Text.Font.With(weight: FontWeight.Medium);
                 FadeUnhovered();
             }
+
+            protected override void OnActivatedByUser() => selectSample.Play();
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/PageTabControl.cs b/osu.Game/Graphics/UserInterface/PageTabControl.cs
index 2fe8acfbd5b5..44c659f945af 100644
--- a/osu.Game/Graphics/UserInterface/PageTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/PageTabControl.cs
@@ -7,6 +7,8 @@
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -53,6 +55,8 @@ public Color4 AccentColour
                 }
             }
 
+            private Sample selectSample = null!;
+
             public PageTabItem(T value)
                 : base(value)
             {
@@ -78,12 +82,18 @@ public PageTabItem(T value)
                         Origin = Anchor.BottomLeft,
                         Anchor = Anchor.BottomLeft,
                     },
-                    new HoverClickSounds(HoverSampleSet.TabSelect)
+                    new HoverSounds(HoverSampleSet.TabSelect)
                 };
 
                 Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Torus, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                selectSample = audio.Samples.Get(@"UI/tabselect-select");
+            }
+
             protected virtual LocalisableString CreateText() => (Value as Enum)?.GetLocalisableDescription() ?? Value.ToString();
 
             protected override bool OnHover(HoverEvent e)
@@ -112,6 +122,8 @@ private void slideInactive()
             protected override void OnActivated() => slideActive();
 
             protected override void OnDeactivated() => slideInactive();
+
+            protected override void OnActivatedByUser() => selectSample.Play();
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
index 0981881ead81..56047173bb0b 100644
--- a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -11,11 +11,12 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Overlays;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public partial class RoundedSliderBar<T> : OsuSliderBar<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
         protected readonly Nub Nub;
         protected readonly Box LeftBox;
diff --git a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
index 60a667049213..0df1c1d20463 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -12,11 +12,12 @@
 using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 using static osu.Game.Graphics.UserInterface.ShearedNub;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public partial class ShearedSliderBar<T> : OsuSliderBar<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
         protected readonly ShearedNub Nub;
         protected readonly Box LeftBox;
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
index 4585d3a4c98f..4912a21fabef 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledSliderBar.cs
@@ -1,14 +1,14 @@
 // 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 osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
     public partial class LabelledSliderBar<TNumber> : LabelledComponent<SettingsSlider<TNumber>, TNumber>
-        where TNumber : struct, IEquatable<TNumber>, IComparable<TNumber>, IConvertible
+        where TNumber : struct, INumber<TNumber>, IMinMaxValue<TNumber>
     {
         public LabelledSliderBar()
             : base(true)
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 8b9d35e34320..863ad5a173b8 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -57,7 +57,7 @@ private void load(OsuColour colours)
         protected override void OnFocus(FocusEvent e)
         {
             base.OnFocus(e);
-            GetContainingInputManager().ChangeFocus(Component);
+            GetContainingFocusManager().ChangeFocus(Component);
         }
 
         protected override OsuTextBox CreateComponent() => CreateTextBox().With(t =>
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index e5ba7f61bfde..4c16cb4951cb 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.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 System;
+using System.Numerics;
 using System.Globalization;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -10,12 +10,12 @@
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
 using osu.Game.Utils;
-using osuTK;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
     public partial class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
         /// <summary>
         /// A custom step value for each key press which actuates a change on this control.
@@ -85,7 +85,7 @@ public SliderWithTextBoxInput(LocalisableString labelText)
             Current.BindValueChanged(updateTextBoxFromSlider, true);
         }
 
-        public bool TakeFocus() => GetContainingInputManager().ChangeFocus(textBox);
+        public bool TakeFocus() => GetContainingFocusManager().ChangeFocus(textBox);
 
         private bool updatingFromTextBox;
 
@@ -138,7 +138,7 @@ private void updateTextBoxFromSlider(ValueChangedEvent<T> _)
         {
             if (updatingFromTextBox) return;
 
-            decimal decimalValue = slider.Current.Value.ToDecimal(NumberFormatInfo.InvariantInfo);
+            decimal decimalValue = decimal.CreateTruncating(slider.Current.Value);
             textBox.Text = decimalValue.ToString($@"N{FormatUtils.FindPrecision(decimalValue)}");
         }
     }
diff --git a/osu.Game/IO/Archives/ZipArchiveReader.cs b/osu.Game/IO/Archives/ZipArchiveReader.cs
index cc5c65d184d7..6bb2a314e795 100644
--- a/osu.Game/IO/Archives/ZipArchiveReader.cs
+++ b/osu.Game/IO/Archives/ZipArchiveReader.cs
@@ -7,23 +7,45 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using Microsoft.Toolkit.HighPerformance;
 using osu.Framework.IO.Stores;
 using SharpCompress.Archives.Zip;
+using SharpCompress.Common;
+using SharpCompress.Readers;
 using SixLabors.ImageSharp.Memory;
 
 namespace osu.Game.IO.Archives
 {
     public sealed class ZipArchiveReader : ArchiveReader
     {
+        /// <summary>
+        /// Archives created by osu!stable still write out as Shift-JIS.
+        /// We want to force this fallback rather than leave it up to the library/system.
+        /// In the future we may want to change exports to set the zip UTF-8 flag and use that instead.
+        /// </summary>
+        public static readonly ArchiveEncoding DEFAULT_ENCODING;
+
         private readonly Stream archiveStream;
         private readonly ZipArchive archive;
 
+        static ZipArchiveReader()
+        {
+            // Required to support rare code pages.
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
+            DEFAULT_ENCODING = new ArchiveEncoding(Encoding.GetEncoding(932), Encoding.GetEncoding(932));
+        }
+
         public ZipArchiveReader(Stream archiveStream, string name = null)
             : base(name)
         {
             this.archiveStream = archiveStream;
-            archive = ZipArchive.Open(archiveStream);
+
+            archive = ZipArchive.Open(archiveStream, new ReaderOptions
+            {
+                ArchiveEncoding = DEFAULT_ENCODING
+            });
         }
 
         public override Stream GetStream(string name)
diff --git a/osu.Game/IO/Legacy/SerializationReader.cs b/osu.Game/IO/Legacy/SerializationReader.cs
index 2d3d5bffd543..fc61b028a4d8 100644
--- a/osu.Game/IO/Legacy/SerializationReader.cs
+++ b/osu.Game/IO/Legacy/SerializationReader.cs
@@ -123,58 +123,58 @@ public object ReadObject()
 
             switch (t)
             {
-                case ObjType.boolType:
+                case ObjType.BoolType:
                     return ReadBoolean();
 
-                case ObjType.byteType:
+                case ObjType.ByteType:
                     return ReadByte();
 
-                case ObjType.uint16Type:
+                case ObjType.UInt16Type:
                     return ReadUInt16();
 
-                case ObjType.uint32Type:
+                case ObjType.UInt32Type:
                     return ReadUInt32();
 
-                case ObjType.uint64Type:
+                case ObjType.UInt64Type:
                     return ReadUInt64();
 
-                case ObjType.sbyteType:
+                case ObjType.SByteType:
                     return ReadSByte();
 
-                case ObjType.int16Type:
+                case ObjType.Int16Type:
                     return ReadInt16();
 
-                case ObjType.int32Type:
+                case ObjType.Int32Type:
                     return ReadInt32();
 
-                case ObjType.int64Type:
+                case ObjType.Int64Type:
                     return ReadInt64();
 
-                case ObjType.charType:
+                case ObjType.CharType:
                     return ReadChar();
 
-                case ObjType.stringType:
+                case ObjType.StringType:
                     return base.ReadString();
 
-                case ObjType.singleType:
+                case ObjType.SingleType:
                     return ReadSingle();
 
-                case ObjType.doubleType:
+                case ObjType.DoubleType:
                     return ReadDouble();
 
-                case ObjType.decimalType:
+                case ObjType.DecimalType:
                     return ReadDecimal();
 
-                case ObjType.dateTimeType:
+                case ObjType.DateTimeType:
                     return ReadDateTime();
 
-                case ObjType.byteArrayType:
+                case ObjType.ByteArrayType:
                     return ReadByteArray();
 
-                case ObjType.charArrayType:
+                case ObjType.CharArrayType:
                     return ReadCharArray();
 
-                case ObjType.otherType:
+                case ObjType.OtherType:
                     throw new IOException("Deserialization of arbitrary type is not supported.");
 
                 default:
@@ -185,25 +185,25 @@ public object ReadObject()
 
     public enum ObjType : byte
     {
-        nullType,
-        boolType,
-        byteType,
-        uint16Type,
-        uint32Type,
-        uint64Type,
-        sbyteType,
-        int16Type,
-        int32Type,
-        int64Type,
-        charType,
-        stringType,
-        singleType,
-        doubleType,
-        decimalType,
-        dateTimeType,
-        byteArrayType,
-        charArrayType,
-        otherType,
-        ILegacySerializableType
+        NullType,
+        BoolType,
+        ByteType,
+        UInt16Type,
+        UInt32Type,
+        UInt64Type,
+        SByteType,
+        Int16Type,
+        Int32Type,
+        Int64Type,
+        CharType,
+        StringType,
+        SingleType,
+        DoubleType,
+        DecimalType,
+        DateTimeType,
+        ByteArrayType,
+        CharArrayType,
+        OtherType,
+        LegacySerializableType
     }
 }
diff --git a/osu.Game/IO/Legacy/SerializationWriter.cs b/osu.Game/IO/Legacy/SerializationWriter.cs
index 10572a6478b3..afe86cd096a0 100644
--- a/osu.Game/IO/Legacy/SerializationWriter.cs
+++ b/osu.Game/IO/Legacy/SerializationWriter.cs
@@ -34,11 +34,11 @@ public override void Write(string str)
         {
             if (str == null)
             {
-                Write((byte)ObjType.nullType);
+                Write((byte)ObjType.NullType);
             }
             else
             {
-                Write((byte)ObjType.stringType);
+                Write((byte)ObjType.StringType);
                 base.Write(str);
             }
         }
@@ -125,94 +125,94 @@ public void WriteObject(object obj)
         {
             if (obj == null)
             {
-                Write((byte)ObjType.nullType);
+                Write((byte)ObjType.NullType);
             }
             else
             {
                 switch (obj)
                 {
                     case bool boolObj:
-                        Write((byte)ObjType.boolType);
+                        Write((byte)ObjType.BoolType);
                         Write(boolObj);
                         break;
 
                     case byte byteObj:
-                        Write((byte)ObjType.byteType);
+                        Write((byte)ObjType.ByteType);
                         Write(byteObj);
                         break;
 
                     case ushort ushortObj:
-                        Write((byte)ObjType.uint16Type);
+                        Write((byte)ObjType.UInt16Type);
                         Write(ushortObj);
                         break;
 
                     case uint uintObj:
-                        Write((byte)ObjType.uint32Type);
+                        Write((byte)ObjType.UInt32Type);
                         Write(uintObj);
                         break;
 
                     case ulong ulongObj:
-                        Write((byte)ObjType.uint64Type);
+                        Write((byte)ObjType.UInt64Type);
                         Write(ulongObj);
                         break;
 
                     case sbyte sbyteObj:
-                        Write((byte)ObjType.sbyteType);
+                        Write((byte)ObjType.SByteType);
                         Write(sbyteObj);
                         break;
 
                     case short shortObj:
-                        Write((byte)ObjType.int16Type);
+                        Write((byte)ObjType.Int16Type);
                         Write(shortObj);
                         break;
 
                     case int intObj:
-                        Write((byte)ObjType.int32Type);
+                        Write((byte)ObjType.Int32Type);
                         Write(intObj);
                         break;
 
                     case long longObj:
-                        Write((byte)ObjType.int64Type);
+                        Write((byte)ObjType.Int64Type);
                         Write(longObj);
                         break;
 
                     case char charObj:
-                        Write((byte)ObjType.charType);
+                        Write((byte)ObjType.CharType);
                         base.Write(charObj);
                         break;
 
                     case string stringObj:
-                        Write((byte)ObjType.stringType);
+                        Write((byte)ObjType.StringType);
                         base.Write(stringObj);
                         break;
 
                     case float floatObj:
-                        Write((byte)ObjType.singleType);
+                        Write((byte)ObjType.SingleType);
                         Write(floatObj);
                         break;
 
                     case double doubleObj:
-                        Write((byte)ObjType.doubleType);
+                        Write((byte)ObjType.DoubleType);
                         Write(doubleObj);
                         break;
 
                     case decimal decimalObj:
-                        Write((byte)ObjType.decimalType);
+                        Write((byte)ObjType.DecimalType);
                         Write(decimalObj);
                         break;
 
                     case DateTime dateTimeObj:
-                        Write((byte)ObjType.dateTimeType);
+                        Write((byte)ObjType.DateTimeType);
                         Write(dateTimeObj);
                         break;
 
                     case byte[] byteArray:
-                        Write((byte)ObjType.byteArrayType);
+                        Write((byte)ObjType.ByteArrayType);
                         base.Write(byteArray);
                         break;
 
                     case char[] charArray:
-                        Write((byte)ObjType.charArrayType);
+                        Write((byte)ObjType.CharArrayType);
                         base.Write(charArray);
                         break;
 
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 436334cfe1da..09db7461d6f4 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -182,6 +182,8 @@ public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory
             new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.SelectPreviousRandom),
             new KeyBinding(InputKey.F3, GlobalAction.ToggleBeatmapOptions),
             new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Up }, GlobalAction.IncreaseModSpeed),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Down }, GlobalAction.DecreaseModSpeed),
         };
 
         private static IEnumerable<KeyBinding> audioControlKeyBindings => new[]
@@ -420,6 +422,12 @@ public enum GlobalAction
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.StepReplayBackward))]
         StepReplayBackward,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.IncreaseModSpeed))]
+        IncreaseModSpeed,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.DecreaseModSpeed))]
+        DecreaseModSpeed,
     }
 
     public enum GlobalActionCategory
diff --git a/osu.Game/Localisation/ButtonSystemStrings.cs b/osu.Game/Localisation/ButtonSystemStrings.cs
index ba4abf63a6e7..b0a205eebe2c 100644
--- a/osu.Game/Localisation/ButtonSystemStrings.cs
+++ b/osu.Game/Localisation/ButtonSystemStrings.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.Localisation;
@@ -54,6 +54,11 @@ public static class ButtonSystemStrings
         /// </summary>
         public static LocalisableString Exit => new TranslatableString(getKey(@"exit"), @"exit");
 
+        /// <summary>
+        /// "daily challenge"
+        /// </summary>
+        public static LocalisableString DailyChallenge => new TranslatableString(getKey(@"daily_challenge"), @"daily challenge");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/DeleteConfirmationContentStrings.cs b/osu.Game/Localisation/DeleteConfirmationContentStrings.cs
new file mode 100644
index 000000000000..d781fadbcee3
--- /dev/null
+++ b/osu.Game/Localisation/DeleteConfirmationContentStrings.cs
@@ -0,0 +1,44 @@
+// 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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class DeleteConfirmationContentStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.DeleteConfirmationContent";
+
+        /// <summary>
+        /// "Are you sure you want to delete all beatmaps?"
+        /// </summary>
+        public static LocalisableString Beatmaps => new TranslatableString(getKey(@"beatmaps"), @"Are you sure you want to delete all beatmaps?");
+
+        /// <summary>
+        /// "Are you sure you want to delete all beatmaps videos? This cannot be undone!"
+        /// </summary>
+        public static LocalisableString BeatmapVideos => new TranslatableString(getKey(@"beatmap_videos"), @"Are you sure you want to delete all beatmaps videos? This cannot be undone!");
+
+        /// <summary>
+        /// "Are you sure you want to delete all skins? This cannot be undone!"
+        /// </summary>
+        public static LocalisableString Skins => new TranslatableString(getKey(@"skins"), @"Are you sure you want to delete all skins? This cannot be undone!");
+
+        /// <summary>
+        /// "Are you sure you want to delete all collections? This cannot be undone!"
+        /// </summary>
+        public static LocalisableString Collections => new TranslatableString(getKey(@"collections"), @"Are you sure you want to delete all collections? This cannot be undone!");
+
+        /// <summary>
+        /// "Are you sure you want to delete all scores? This cannot be undone!"
+        /// </summary>
+        public static LocalisableString Scores => new TranslatableString(getKey(@"scores"), @"Are you sure you want to delete all scores? This cannot be undone!");
+
+        /// <summary>
+        /// "Are you sure you want to delete all mod presets?"
+        /// </summary>
+        public static LocalisableString ModPresets => new TranslatableString(getKey(@"mod_presets"), @"Are you sure you want to delete all mod presets?");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/DeleteConfirmationDialogStrings.cs b/osu.Game/Localisation/DeleteConfirmationDialogStrings.cs
index 33738fe95e36..25997eadd352 100644
--- a/osu.Game/Localisation/DeleteConfirmationDialogStrings.cs
+++ b/osu.Game/Localisation/DeleteConfirmationDialogStrings.cs
@@ -10,9 +10,9 @@ public static class DeleteConfirmationDialogStrings
         private const string prefix = @"osu.Game.Resources.Localisation.DeleteConfirmationDialog";
 
         /// <summary>
-        /// "Confirm deletion of"
+        /// "Caution"
         /// </summary>
-        public static LocalisableString HeaderText => new TranslatableString(getKey(@"header_text"), @"Confirm deletion of");
+        public static LocalisableString HeaderText => new TranslatableString(getKey(@"header_text"), @"Caution");
 
         /// <summary>
         /// "Yes. Go for it."
diff --git a/osu.Game/Localisation/EditorSetupStrings.cs b/osu.Game/Localisation/EditorSetupStrings.cs
index eff6f9e6b8b2..350517734f7c 100644
--- a/osu.Game/Localisation/EditorSetupStrings.cs
+++ b/osu.Game/Localisation/EditorSetupStrings.cs
@@ -42,7 +42,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "If enabled, an &quot;Are you ready? 3, 2, 1, GO!&quot; countdown will be inserted at the beginning of the beatmap, assuming there is enough time to do so."
         /// </summary>
-        public static LocalisableString CountdownDescription => new TranslatableString(getKey(@"countdown_description"), @"If enabled, an ""Are you ready? 3, 2, 1, GO!"" countdown will be inserted at the beginning of the beatmap, assuming there is enough time to do so.");
+        public static LocalisableString CountdownDescription => new TranslatableString(getKey(@"countdown_description"),
+            @"If enabled, an ""Are you ready? 3, 2, 1, GO!"" countdown will be inserted at the beginning of the beatmap, assuming there is enough time to do so.");
 
         /// <summary>
         /// "Countdown speed"
@@ -52,7 +53,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "If the countdown sounds off-time, use this to make it appear one or more beats early."
         /// </summary>
-        public static LocalisableString CountdownOffsetDescription => new TranslatableString(getKey(@"countdown_offset_description"), @"If the countdown sounds off-time, use this to make it appear one or more beats early.");
+        public static LocalisableString CountdownOffsetDescription =>
+            new TranslatableString(getKey(@"countdown_offset_description"), @"If the countdown sounds off-time, use this to make it appear one or more beats early.");
 
         /// <summary>
         /// "Countdown offset"
@@ -67,7 +69,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "Allows storyboards to use the full screen space, rather than be confined to a 4:3 area."
         /// </summary>
-        public static LocalisableString WidescreenSupportDescription => new TranslatableString(getKey(@"widescreen_support_description"), @"Allows storyboards to use the full screen space, rather than be confined to a 4:3 area.");
+        public static LocalisableString WidescreenSupportDescription =>
+            new TranslatableString(getKey(@"widescreen_support_description"), @"Allows storyboards to use the full screen space, rather than be confined to a 4:3 area.");
 
         /// <summary>
         /// "Epilepsy warning"
@@ -77,7 +80,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "Recommended if the storyboard or video contain scenes with rapidly flashing colours."
         /// </summary>
-        public static LocalisableString EpilepsyWarningDescription => new TranslatableString(getKey(@"epilepsy_warning_description"), @"Recommended if the storyboard or video contain scenes with rapidly flashing colours.");
+        public static LocalisableString EpilepsyWarningDescription =>
+            new TranslatableString(getKey(@"epilepsy_warning_description"), @"Recommended if the storyboard or video contain scenes with rapidly flashing colours.");
 
         /// <summary>
         /// "Letterbox during breaks"
@@ -87,7 +91,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "Adds horizontal letterboxing to give a cinematic look during breaks."
         /// </summary>
-        public static LocalisableString LetterboxDuringBreaksDescription => new TranslatableString(getKey(@"letterbox_during_breaks_description"), @"Adds horizontal letterboxing to give a cinematic look during breaks.");
+        public static LocalisableString LetterboxDuringBreaksDescription =>
+            new TranslatableString(getKey(@"letterbox_during_breaks_description"), @"Adds horizontal letterboxing to give a cinematic look during breaks.");
 
         /// <summary>
         /// "Samples match playback rate"
@@ -97,7 +102,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "When enabled, all samples will speed up or slow down when rate-changing mods are enabled."
         /// </summary>
-        public static LocalisableString SamplesMatchPlaybackRateDescription => new TranslatableString(getKey(@"samples_match_playback_rate_description"), @"When enabled, all samples will speed up or slow down when rate-changing mods are enabled.");
+        public static LocalisableString SamplesMatchPlaybackRateDescription => new TranslatableString(getKey(@"samples_match_playback_rate_description"),
+            @"When enabled, all samples will speed up or slow down when rate-changing mods are enabled.");
 
         /// <summary>
         /// "The size of all hit objects"
@@ -117,7 +123,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "The harshness of hit windows and difficulty of special objects (ie. spinners)"
         /// </summary>
-        public static LocalisableString OverallDifficultyDescription => new TranslatableString(getKey(@"overall_difficulty_description"), @"The harshness of hit windows and difficulty of special objects (ie. spinners)");
+        public static LocalisableString OverallDifficultyDescription =>
+            new TranslatableString(getKey(@"overall_difficulty_description"), @"The harshness of hit windows and difficulty of special objects (ie. spinners)");
 
         /// <summary>
         /// "Tick Rate"
@@ -127,7 +134,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "Determines how many &quot;ticks&quot; are generated within long hit objects. A tick rate of 1 will generate ticks on each beat, 2 would be twice per beat, etc."
         /// </summary>
-        public static LocalisableString TickRateDescription => new TranslatableString(getKey(@"tick_rate_description"), @"Determines how many ""ticks"" are generated within long hit objects. A tick rate of 1 will generate ticks on each beat, 2 would be twice per beat, etc.");
+        public static LocalisableString TickRateDescription => new TranslatableString(getKey(@"tick_rate_description"),
+            @"Determines how many ""ticks"" are generated within long hit objects. A tick rate of 1 will generate ticks on each beat, 2 would be twice per beat, etc.");
 
         /// <summary>
         /// "Base Velocity"
@@ -137,7 +145,8 @@ public static class EditorSetupStrings
         /// <summary>
         /// "The base velocity of the beatmap, affecting things like slider velocity and scroll speed in some rulesets."
         /// </summary>
-        public static LocalisableString BaseVelocityDescription => new TranslatableString(getKey(@"base_velocity_description"), @"The base velocity of the beatmap, affecting things like slider velocity and scroll speed in some rulesets.");
+        public static LocalisableString BaseVelocityDescription => new TranslatableString(getKey(@"base_velocity_description"),
+            @"The base velocity of the beatmap, affecting things like slider velocity and scroll speed in some rulesets.");
 
         /// <summary>
         /// "Metadata"
@@ -159,6 +168,11 @@ public static class EditorSetupStrings
         /// </summary>
         public static LocalisableString Creator => new TranslatableString(getKey(@"creator"), @"Creator");
 
+        /// <summary>
+        /// "Source"
+        /// </summary>
+        public static LocalisableString Source => new TranslatableString(getKey(@"source"), @"Source");
+
         /// <summary>
         /// "Difficulty Name"
         /// </summary>
diff --git a/osu.Game/Localisation/FirstRunOverlayImportFromStableScreenStrings.cs b/osu.Game/Localisation/FirstRunOverlayImportFromStableScreenStrings.cs
index 04fecab3dfb5..521a77fe20be 100644
--- a/osu.Game/Localisation/FirstRunOverlayImportFromStableScreenStrings.cs
+++ b/osu.Game/Localisation/FirstRunOverlayImportFromStableScreenStrings.cs
@@ -47,7 +47,7 @@ public static class FirstRunOverlayImportFromStableScreenStrings
         public static LocalisableString Calculating => new TranslatableString(getKey(@"calculating"), @"calculating...");
 
         /// <summary>
-        /// "{0} items"
+        /// "{0} item(s)"
         /// </summary>
         public static LocalisableString Items(int arg0) => new TranslatableString(getKey(@"items"), @"{0} item(s)", arg0);
 
diff --git a/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs b/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs
index a77ee066e456..50a417312db0 100644
--- a/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs
+++ b/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs
@@ -39,6 +39,11 @@ public static class FirstRunSetupBeatmapScreenStrings
         /// </summary>
         public static LocalisableString BundledButton => new TranslatableString(getKey(@"bundled_button"), @"Get recommended beatmaps");
 
+        /// <summary>
+        /// "Beatmaps will be downloaded in the background. You can continue with setup while this happens!"
+        /// </summary>
+        public static LocalisableString DownloadingInBackground => new TranslatableString(getKey(@"downloading_in_background"), @"Beatmaps will be downloaded in the background. You can continue with setup while this happens!");
+
         /// <summary>
         /// "You can also obtain more beatmaps from the main menu &quot;browse&quot; button at any time."
         /// </summary>
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 703e0ff1cad7..18a1d3e4feb7 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -369,6 +369,16 @@ public static class GlobalActionKeyBindingStrings
         /// </summary>
         public static LocalisableString EditorToggleRotateControl => new TranslatableString(getKey(@"editor_toggle_rotate_control"), @"Toggle rotate control");
 
+        /// <summary>
+        /// "Increase mod speed"
+        /// </summary>
+        public static LocalisableString IncreaseModSpeed => new TranslatableString(getKey(@"increase_mod_speed"), @"Increase mod speed");
+
+        /// <summary>
+        /// "Decrease mod speed"
+        /// </summary>
+        public static LocalisableString DecreaseModSpeed => new TranslatableString(getKey(@"decrease_mod_speed"), @"Decrease mod speed");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 711e95486fc9..4e1fc3a4749d 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 
 namespace osu.Game.Localisation
 {
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public enum Language
     {
diff --git a/osu.Game/Localisation/ModSelectOverlayStrings.cs b/osu.Game/Localisation/ModSelectOverlayStrings.cs
index 7a9bb698d847..cf01081772e1 100644
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@@ -14,10 +14,16 @@ public static class ModSelectOverlayStrings
         /// </summary>
         public static LocalisableString ModSelectTitle => new TranslatableString(getKey(@"mod_select_title"), @"Mod Select");
 
+        /// <summary>
+        /// "{0} mods"
+        /// </summary>
+        public static LocalisableString Mods(int count) => new TranslatableString(getKey(@"mods"), @"{0} mods", count);
+
         /// <summary>
         /// "Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play. Others are just for fun."
         /// </summary>
-        public static LocalisableString ModSelectDescription => new TranslatableString(getKey(@"mod_select_description"), @"Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play. Others are just for fun.");
+        public static LocalisableString ModSelectDescription => new TranslatableString(getKey(@"mod_select_description"),
+            @"Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play. Others are just for fun.");
 
         /// <summary>
         /// "Mod Customisation"
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 3188ca55334a..698fe230b294 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -114,7 +114,7 @@ public static class NotificationsStrings
         public static LocalisableString MismatchingBeatmapForReplay => new TranslatableString(getKey(@"mismatching_beatmap_for_replay"), @"Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it.");
 
         /// <summary>
-        /// "You are now running osu! {version}.
+        /// "You are now running osu! {0}.
         /// Click to see what's new!"
         /// </summary>
         public static LocalisableString GameVersionAfterUpdate(string version) => new TranslatableString(getKey(@"game_version_after_update"), @"You are now running osu! {0}.
diff --git a/osu.Game/Localisation/OnlineSettingsStrings.cs b/osu.Game/Localisation/OnlineSettingsStrings.cs
index 0660bac1725c..8e8c81cf59f0 100644
--- a/osu.Game/Localisation/OnlineSettingsStrings.cs
+++ b/osu.Game/Localisation/OnlineSettingsStrings.cs
@@ -79,6 +79,11 @@ public static class OnlineSettingsStrings
         /// </summary>
         public static LocalisableString DiscordPresenceOff => new TranslatableString(getKey(@"discord_presence_off"), @"Off");
 
+        /// <summary>
+        /// "Hide country flags"
+        /// </summary>
+        public static LocalisableString HideCountryFlags => new TranslatableString(getKey(@"hide_country_flags"), @"Hide country flags");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/ToastStrings.cs b/osu.Game/Localisation/ToastStrings.cs
index da798a393784..942540cfc524 100644
--- a/osu.Game/Localisation/ToastStrings.cs
+++ b/osu.Game/Localisation/ToastStrings.cs
@@ -49,6 +49,11 @@ public static class ToastStrings
         /// </summary>
         public static LocalisableString UrlCopied => new TranslatableString(getKey(@"url_copied"), @"URL copied");
 
+        /// <summary>
+        /// "Speed changed to {0:N2}x"
+        /// </summary>
+        public static LocalisableString SpeedChangedTo(double speed) => new TranslatableString(getKey(@"speed_changed"), @"Speed changed to {0:N2}x", speed);
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 64caddb2fc1d..36f1311f9dde 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -33,6 +33,9 @@ public class SoloScoreInfo : IScoreInfo
         [JsonProperty("total_score")]
         public long TotalScore { get; set; }
 
+        [JsonProperty("total_score_without_mods")]
+        public long TotalScoreWithoutMods { get; set; }
+
         [JsonProperty("accuracy")]
         public double Accuracy { get; set; }
 
@@ -206,6 +209,7 @@ public ScoreInfo ToScoreInfo(Mod[] mods, IBeatmapInfo? beatmap = null)
                 Ruleset = new RulesetInfo { OnlineID = RulesetID },
                 Passed = Passed,
                 TotalScore = TotalScore,
+                TotalScoreWithoutMods = TotalScoreWithoutMods,
                 LegacyTotalScore = LegacyTotalScore,
                 Accuracy = Accuracy,
                 MaxCombo = MaxCombo,
@@ -239,6 +243,7 @@ public ScoreInfo ToScoreInfo(Mod[] mods, IBeatmapInfo? beatmap = null)
         {
             Rank = score.Rank,
             TotalScore = score.TotalScore,
+            TotalScoreWithoutMods = score.TotalScoreWithoutMods,
             Accuracy = score.Accuracy,
             PP = score.PP,
             MaxCombo = score.MaxCombo,
diff --git a/osu.Game/Online/Metadata/DailyChallengeInfo.cs b/osu.Game/Online/Metadata/DailyChallengeInfo.cs
new file mode 100644
index 000000000000..7c49556653eb
--- /dev/null
+++ b/osu.Game/Online/Metadata/DailyChallengeInfo.cs
@@ -0,0 +1,16 @@
+// 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 MessagePack;
+
+namespace osu.Game.Online.Metadata
+{
+    [MessagePackObject]
+    [Serializable]
+    public struct DailyChallengeInfo
+    {
+        [Key(0)]
+        public long RoomID { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Metadata/IMetadataClient.cs b/osu.Game/Online/Metadata/IMetadataClient.cs
index 7102554ae97b..ee7a726bfc14 100644
--- a/osu.Game/Online/Metadata/IMetadataClient.cs
+++ b/osu.Game/Online/Metadata/IMetadataClient.cs
@@ -20,5 +20,11 @@ public interface IMetadataClient : IStatefulUserHubClient
         /// Delivers an update of the <see cref="UserPresence"/> of the user with the supplied <paramref name="userId"/>.
         /// </summary>
         Task UserPresenceUpdated(int userId, UserPresence? status);
+
+        /// <summary>
+        /// Delivers an update of the current "daily challenge" status.
+        /// Null value means there is no "daily challenge" currently active.
+        /// </summary>
+        Task DailyChallengeUpdated(DailyChallengeInfo? info);
     }
 }
diff --git a/osu.Game/Online/Metadata/IMetadataServer.cs b/osu.Game/Online/Metadata/IMetadataServer.cs
index 978004533395..8bf3f8f56bd8 100644
--- a/osu.Game/Online/Metadata/IMetadataServer.cs
+++ b/osu.Game/Online/Metadata/IMetadataServer.cs
@@ -7,7 +7,12 @@
 namespace osu.Game.Online.Metadata
 {
     /// <summary>
-    /// Metadata server is responsible for keeping the osu! client up-to-date with any changes.
+    /// Metadata server is responsible for keeping the osu! client up-to-date with various real-time happenings, such as:
+    /// <list type="bullet">
+    /// <item>beatmap updates via BSS,</item>
+    /// <item>online user activity/status updates,</item>
+    /// <item>other real-time happenings, such as current "daily challenge" status.</item>
+    /// </list>
     /// </summary>
     public interface IMetadataServer
     {
diff --git a/osu.Game/Online/Metadata/MetadataClient.cs b/osu.Game/Online/Metadata/MetadataClient.cs
index 8e99a9b2cb26..b61997049492 100644
--- a/osu.Game/Online/Metadata/MetadataClient.cs
+++ b/osu.Game/Online/Metadata/MetadataClient.cs
@@ -59,6 +59,15 @@ protected Task ProcessChanges(int[] beatmapSetIDs)
 
         #endregion
 
+        #region Daily Challenge
+
+        public abstract IBindable<DailyChallengeInfo?> DailyChallengeInfo { get; }
+
+        /// <inheritdoc/>
+        public abstract Task DailyChallengeUpdated(DailyChallengeInfo? info);
+
+        #endregion
+
         #region Disconnection handling
 
         public event Action? Disconnecting;
diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 3805d126889b..b94f26a71d9c 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -26,6 +26,9 @@ public partial class OnlineMetadataClient : MetadataClient
         public override IBindableDictionary<int, UserPresence> UserStates => userStates;
         private readonly BindableDictionary<int, UserPresence> userStates = new BindableDictionary<int, UserPresence>();
 
+        public override IBindable<DailyChallengeInfo?> DailyChallengeInfo => dailyChallengeInfo;
+        private readonly Bindable<DailyChallengeInfo?> dailyChallengeInfo = new Bindable<DailyChallengeInfo?>();
+
         private readonly string endpoint;
 
         private IHubClientConnector? connector;
@@ -58,6 +61,7 @@ private void load(IAPIProvider api, OsuConfigManager config)
                     // https://github.com/dotnet/aspnetcore/issues/15198
                     connection.On<BeatmapUpdates>(nameof(IMetadataClient.BeatmapSetsUpdated), ((IMetadataClient)this).BeatmapSetsUpdated);
                     connection.On<int, UserPresence?>(nameof(IMetadataClient.UserPresenceUpdated), ((IMetadataClient)this).UserPresenceUpdated);
+                    connection.On<DailyChallengeInfo?>(nameof(IMetadataClient.DailyChallengeUpdated), ((IMetadataClient)this).DailyChallengeUpdated);
                     connection.On(nameof(IStatefulUserHubClient.DisconnectRequested), ((IMetadataClient)this).DisconnectRequested);
                 };
 
@@ -101,6 +105,7 @@ private void isConnectedChanged(ValueChangedEvent<bool> connected)
                 {
                     isWatchingUserPresence.Value = false;
                     userStates.Clear();
+                    dailyChallengeInfo.Value = null;
                 });
                 return;
             }
@@ -229,6 +234,12 @@ public override async Task EndWatchingUserPresence()
             }
         }
 
+        public override Task DailyChallengeUpdated(DailyChallengeInfo? info)
+        {
+            Schedule(() => dailyChallengeInfo.Value = info);
+            return Task.CompletedTask;
+        }
+
         public override async Task DisconnectRequested()
         {
             await base.DisconnectRequested().ConfigureAwait(false);
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index bbf0e3697ae2..77ede1fd35d8 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -396,7 +396,7 @@ Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
                 switch (state)
                 {
                     case MultiplayerRoomState.Open:
-                        APIRoom.Status.Value = new RoomStatusOpen();
+                        APIRoom.Status.Value = APIRoom.HasPassword.Value ? new RoomStatusOpenPrivate() : new RoomStatusOpen();
                         break;
 
                     case MultiplayerRoomState.Playing:
@@ -816,6 +816,7 @@ private void updateLocalRoomSettings(MultiplayerRoomSettings settings)
             Room.Settings = settings;
             APIRoom.Name.Value = Room.Settings.Name;
             APIRoom.Password.Value = Room.Settings.Password;
+            APIRoom.Status.Value = string.IsNullOrEmpty(Room.Settings.Password) ? new RoomStatusOpen() : new RoomStatusOpenPrivate();
             APIRoom.Type.Value = Room.Settings.MatchType;
             APIRoom.QueueMode.Value = Room.Settings.QueueMode;
             APIRoom.AutoStartDuration.Value = Room.Settings.AutoStartDuration;
diff --git a/osu.Game/Online/Rooms/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs
index 7feb709acb6e..1b5e08c72936 100644
--- a/osu.Game/Online/Rooms/GetRoomsRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs
@@ -1,10 +1,12 @@
 // 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.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Online.Rooms
@@ -33,6 +35,25 @@ protected override WebRequest CreateWebRequest()
             return req;
         }
 
+        protected override void PostProcess()
+        {
+            base.PostProcess();
+
+            if (Response != null)
+            {
+                // API doesn't populate status so let's do it here.
+                foreach (var room in Response)
+                {
+                    if (room.EndDate.Value != null && DateTimeOffset.Now >= room.EndDate.Value)
+                        room.Status.Value = new RoomStatusEnded();
+                    else if (room.HasPassword.Value)
+                        room.Status.Value = new RoomStatusOpenPrivate();
+                    else
+                        room.Status.Value = new RoomStatusOpen();
+                }
+            }
+        }
+
         protected override string Target => "rooms";
     }
 }
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 8f346c405799..5abf5034d9ef 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -112,7 +112,7 @@ private ushort autoStartDuration
         public readonly Bindable<PlaylistAggregateScore> UserScore = new Bindable<PlaylistAggregateScore>();
 
         [JsonProperty("has_password")]
-        public readonly BindableBool HasPassword = new BindableBool();
+        public readonly Bindable<bool> HasPassword = new Bindable<bool>();
 
         [Cached]
         [JsonProperty("recent_participants")]
@@ -201,9 +201,6 @@ public void CopyFrom(Room other)
             CurrentPlaylistItem.Value = other.CurrentPlaylistItem.Value;
             AutoSkip.Value = other.AutoSkip.Value;
 
-            if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
-                Status.Value = new RoomStatusEnded();
-
             other.RemoveExpiredPlaylistItems();
 
             if (!Playlist.SequenceEqual(other.Playlist))
diff --git a/osu.Game/Online/Rooms/RoomCategory.cs b/osu.Game/Online/Rooms/RoomCategory.cs
index 17afb0dc7f67..4534e7de59cd 100644
--- a/osu.Game/Online/Rooms/RoomCategory.cs
+++ b/osu.Game/Online/Rooms/RoomCategory.cs
@@ -13,5 +13,8 @@ public enum RoomCategory
 
         [Description("Featured Artist")]
         FeaturedArtist,
+
+        [Description("Daily Challenge")]
+        DailyChallenge,
     }
 }
diff --git a/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpenPrivate.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpenPrivate.cs
new file mode 100644
index 000000000000..d71e706c76ee
--- /dev/null
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpenPrivate.cs
@@ -0,0 +1,14 @@
+// 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.Game.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Online.Rooms.RoomStatuses
+{
+    public class RoomStatusOpenPrivate : RoomStatus
+    {
+        public override string Message => "Open (Private)";
+        public override Color4 GetAppropriateColour(OsuColour colours) => colours.GreenDark;
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 07ee9115d6f6..fb7a3d13ca5e 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -248,6 +248,9 @@ public void EndPlaying(GameplayState state)
 
                 isPlaying = false;
                 currentBeatmap = null;
+                currentScore = null;
+                currentScoreProcessor = null;
+                currentScoreToken = null;
 
                 if (state.HasPassed)
                     currentState.State = SpectatedUserState.Passed;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 732d5f867cf9..7c8931401495 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -706,26 +706,9 @@ public void PresentScore(IScoreInfo score, ScorePresentType presentType = ScoreP
         {
             Logger.Log($"Beginning {nameof(PresentScore)} with score {score}");
 
-            // The given ScoreInfo may have missing properties if it was retrieved from online data. Re-retrieve it from the database
-            // to ensure all the required data for presenting a replay are present.
-            ScoreInfo databasedScoreInfo = null;
+            var databasedScore = ScoreManager.GetScore(score);
 
-            if (score.OnlineID > 0)
-                databasedScoreInfo = ScoreManager.Query(s => s.OnlineID == score.OnlineID);
-
-            if (score.LegacyOnlineID > 0)
-                databasedScoreInfo ??= ScoreManager.Query(s => s.LegacyOnlineID == score.LegacyOnlineID);
-
-            if (score is ScoreInfo scoreInfo)
-                databasedScoreInfo ??= ScoreManager.Query(s => s.Hash == scoreInfo.Hash);
-
-            if (databasedScoreInfo == null)
-            {
-                Logger.Log("The requested score could not be found locally.", LoggingTarget.Information);
-                return;
-            }
-
-            var databasedScore = ScoreManager.GetScore(databasedScoreInfo);
+            if (databasedScore == null) return;
 
             if (databasedScore.Replay == null)
             {
@@ -733,7 +716,7 @@ public void PresentScore(IScoreInfo score, ScorePresentType presentType = ScoreP
                 return;
             }
 
-            var databasedBeatmap = BeatmapManager.QueryBeatmap(b => b.ID == databasedScoreInfo.BeatmapInfo.ID);
+            var databasedBeatmap = BeatmapManager.QueryBeatmap(b => b.ID == databasedScore.ScoreInfo.BeatmapInfo.ID);
 
             if (databasedBeatmap == null)
             {
@@ -858,7 +841,10 @@ protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefau
             {
                 // General expectation that osu! starts in fullscreen by default (also gives the most predictable performance).
                 // However, macOS is bound to have issues when using exclusive fullscreen as it takes full control away from OS, therefore borderless is default there.
-                { FrameworkSetting.WindowMode, RuntimeInfo.OS == RuntimeInfo.Platform.macOS ? WindowMode.Borderless : WindowMode.Fullscreen }
+                { FrameworkSetting.WindowMode, RuntimeInfo.OS == RuntimeInfo.Platform.macOS ? WindowMode.Borderless : WindowMode.Fullscreen },
+                { FrameworkSetting.VolumeUniversal, 0.6 },
+                { FrameworkSetting.VolumeMusic, 0.6 },
+                { FrameworkSetting.VolumeEffect, 0.6 },
             };
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 81e3d8bed88e..5e4ec5a61d93 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -75,6 +75,12 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
     {
         public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv", ".mpg", ".wmv", ".m4v" };
 
+#if DEBUG
+        public const string GAME_NAME = "osu! (development)";
+#else
+        public const string GAME_NAME = "osu!";
+#endif
+
         public const string OSU_PROTOCOL = "osu://";
 
         public const string CLIENT_STREAM_NAME = @"lazer";
@@ -94,7 +100,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
         public const int SAMPLE_DEBOUNCE_TIME = 20;
 
         /// <summary>
-        /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
+        /// The maximum volume at which audio tracks should play back at. This can be set lower than 1 to create some head-room for sound effects.
         /// </summary>
         private const double global_track_volume_adjust = 0.8;
 
@@ -241,11 +247,7 @@ public virtual string Version
 
         public OsuGameBase()
         {
-            Name = @"osu!";
-
-#if DEBUG
-            Name += " (development)";
-#endif
+            Name = GAME_NAME;
 
             allowableExceptions = UnhandledExceptionsBeforeCrash;
         }
@@ -576,17 +578,17 @@ public virtual SettingsSubsection CreateSettingsSubsectionFor(InputHandler handl
                 {
                     case ITabletHandler th:
                         return new TabletSettings(th);
-
-                    case MouseHandler mh:
-                        return new MouseSettings(mh);
-
-                    case JoystickHandler jh:
-                        return new JoystickSettings(jh);
                 }
             }
 
             switch (handler)
             {
+                case MouseHandler mh:
+                    return new MouseSettings(mh);
+
+                case JoystickHandler jh:
+                    return new JoystickSettings(jh);
+
                 case TouchHandler th:
                     return new TouchSettings(th);
 
@@ -678,16 +680,21 @@ private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
         /// <summary>
         /// Allows a maximum of one unhandled exception, per second of execution.
         /// </summary>
-        private bool onExceptionThrown(Exception _)
+        /// <returns>Whether to ignore the exception and continue running.</returns>
+        private bool onExceptionThrown(Exception ex)
         {
-            bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
-
-            Logger.Log($"Unhandled exception has been {(continueExecution ? $"allowed with {allowableExceptions} more allowable exceptions" : "denied")} .");
+            if (Interlocked.Decrement(ref allowableExceptions) < 0)
+            {
+                Logger.Log("Too many unhandled exceptions, crashing out.");
+                RulesetStore.TryDisableCustomRulesetsCausing(ex);
+                return false;
+            }
 
+            Logger.Log($"Unhandled exception has been allowed with {allowableExceptions} more allowable exceptions.");
             // restore the stock of allowable exceptions after a short delay.
             Task.Delay(1000).ContinueWith(_ => Interlocked.Increment(ref allowableExceptions));
 
-            return continueExecution;
+            return true;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index f57c7d22a2d9..53e51e061140 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -243,7 +243,7 @@ private bool focusNextTextBox()
 
             if (nextTextBox != null)
             {
-                Schedule(() => GetContainingInputManager().ChangeFocus(nextTextBox));
+                Schedule(() => GetContainingFocusManager().ChangeFocus(nextTextBox));
                 return true;
             }
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
index 9cd0031e3d9f..63a533c92e33 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
@@ -5,6 +5,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -47,13 +49,15 @@ private partial class TabItem : TabItem<BeatmapCardSize>
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; }
 
+            private Sample selectSample = null!;
+
             public TabItem(BeatmapCardSize value)
                 : base(value)
             {
             }
 
             [BackgroundDependencyLoader]
-            private void load()
+            private void load(AudioManager audio)
             {
                 AutoSizeAxes = Axes.Both;
                 Masking = true;
@@ -79,8 +83,10 @@ private void load()
                             Icon = getIconForCardSize(Value)
                         }
                     },
-                    new HoverClickSounds(HoverSampleSet.TabSelect)
+                    new HoverSounds(HoverSampleSet.TabSelect)
                 };
+
+                selectSample = audio.Samples.Get(@"UI/tabselect-select");
             }
 
             private static IconUsage getIconForCardSize(BeatmapCardSize cardSize)
@@ -111,6 +117,8 @@ protected override void OnActivated()
                     updateState();
             }
 
+            protected override void OnActivatedByUser() => selectSample.Play();
+
             protected override void OnDeactivated()
             {
                 if (IsLoaded)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
index e59beb43ff37..4bd25f656197 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
@@ -128,7 +128,11 @@ protected override void UpdateState()
             protected override bool OnClick(ClickEvent e)
             {
                 base.OnClick(e);
+
+                // this tab item implementation is not managed by a TabControl,
+                // therefore we have to manually update Active state and play select sound when this tab item is clicked.
                 Active.Toggle();
+                SelectSample.Play();
                 return true;
             }
         }
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 831cf812ff0e..ee188d34ce89 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -5,6 +5,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
@@ -24,13 +26,15 @@ public partial class FilterTabItem<T> : TabItem<T>
 
         private OsuSpriteText text;
 
+        protected Sample SelectSample { get; private set; } = null!;
+
         public FilterTabItem(T value)
             : base(value)
         {
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             AutoSizeAxes = Axes.Both;
             AddRangeInternal(new Drawable[]
@@ -40,10 +44,12 @@ private void load()
                     Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
                     Text = LabelFor(Value)
                 },
-                new HoverClickSounds(HoverSampleSet.TabSelect)
+                new HoverSounds(HoverSampleSet.TabSelect)
             });
 
             Enabled.Value = true;
+
+            SelectSample = audio.Samples.Get(@"UI/tabselect-select");
         }
 
         protected override void LoadComplete()
@@ -71,6 +77,8 @@ protected override void OnHoverLost(HoverLostEvent e)
 
         protected override void OnDeactivated() => UpdateState();
 
+        protected override void OnActivatedByUser() => SelectSample.Play();
+
         /// <summary>
         /// Returns the label text to be used for the supplied <paramref name="value"/>.
         /// </summary>
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index a645683c5f86..9b2f26e8ae21 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -198,6 +198,7 @@ private IEnumerable<BeatmapCard> createCardsFor(IEnumerable<APIBeatmapSet> beatm
         {
             c.Anchor = Anchor.TopCentre;
             c.Origin = Anchor.TopCentre;
+            c.Scale = new Vector2(0.8f);
         })).ToArray();
 
         private static ReverseChildIDFillFlowContainer<BeatmapCard> createCardContainerFor(IEnumerable<BeatmapCard> newCards)
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index 0b1befe7b949..364874cdf74d 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -16,7 +16,6 @@
 using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
@@ -26,9 +25,9 @@ public partial class BasicStats : Container
     {
         private readonly Statistic length, bpm, circleCount, sliderCount;
 
-        private APIBeatmapSet beatmapSet;
+        private IBeatmapSetInfo beatmapSet;
 
-        public APIBeatmapSet BeatmapSet
+        public IBeatmapSetInfo BeatmapSet
         {
             get => beatmapSet;
             set
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
index 426fbcdb8d1d..29744f27fc59 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
@@ -21,7 +21,7 @@ public APIBeatmapSet? BeatmapSet
                 // propagate value to tab items first to enable only available rulesets.
                 beatmapSet.Value = value;
 
-                SelectTab(TabContainer.TabItems.FirstOrDefault(t => t.Enabled.Value));
+                Current.Value = TabContainer.TabItems.FirstOrDefault(t => t.Enabled.Value)?.Value;
             }
         }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
index 5f9cdf50654a..921f136de992 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
@@ -11,6 +11,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
@@ -28,9 +29,9 @@ public partial class PlayButton : Container
         [CanBeNull]
         public PreviewTrack Preview { get; private set; }
 
-        private APIBeatmapSet beatmapSet;
+        private IBeatmapSetInfo beatmapSet;
 
-        public APIBeatmapSet BeatmapSet
+        public IBeatmapSetInfo BeatmapSet
         {
             get => beatmapSet;
             set
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 2254514a4454..1eff4a7c1196 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -8,9 +8,9 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
@@ -24,7 +24,7 @@ public partial class PreviewButton : OsuClickableContainer
 
         public IBindable<bool> Playing => playButton.Playing;
 
-        public APIBeatmapSet BeatmapSet
+        public IBeatmapSetInfo BeatmapSet
         {
             get => playButton.BeatmapSet;
             set => playButton.BeatmapSet = value;
@@ -32,8 +32,6 @@ public APIBeatmapSet BeatmapSet
 
         public PreviewButton()
         {
-            Height = 42;
-
             Children = new Drawable[]
             {
                 background = new Box
diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index d656a6b14be6..7d69cb73293e 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -68,6 +68,7 @@ public Details()
                 preview = new PreviewButton
                 {
                     RelativeSizeAxes = Axes.X,
+                    Height = 42,
                 },
                 new DetailBox
                 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 7a817c43ebd3..a6868efb5dcd 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -160,7 +160,6 @@ private Drawable[] createContent(int index, ScoreInfo score)
                 new UpdateableFlag(score.User.CountryCode)
                 {
                     Size = new Vector2(19, 14),
-                    ShowPlaceholderOnUnknown = false,
                 },
                 username,
 #pragma warning disable 618
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 9dc2ce204fbe..13ba9fb74b6c 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -118,7 +118,6 @@ public TopScoreUserSection()
                                 Origin = Anchor.CentreLeft,
                                 Size = new Vector2(19, 14),
                                 Margin = new MarginPadding { Top = 3 }, // makes spacing look more even
-                                ShowPlaceholderOnUnknown = false,
                             },
                         }
                     }
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index 87b1f4ef01f4..e8c251e7fd41 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -49,7 +49,7 @@ public ChannelListItem(Channel channel)
         [BackgroundDependencyLoader]
         private void load()
         {
-            Height = 30;
+            Height = 25;
             RelativeSizeAxes = Axes.X;
 
             Children = new Drawable[]
@@ -87,7 +87,7 @@ private void load()
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Text = Channel.Name,
-                                Font = OsuFont.Torus.With(size: 17, weight: FontWeight.SemiBold),
+                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                 Colour = colourProvider.Light3,
                                 Margin = new MarginPadding { Bottom = 2 },
                                 RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index bbc3ee5bf42d..9bcca3ac9dc7 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -47,7 +47,7 @@ public Message Message
 
         public IReadOnlyCollection<Drawable> DrawableContentFlow => drawableContentFlow;
 
-        protected virtual float FontSize => 20;
+        protected virtual float FontSize => 14;
 
         protected virtual float Spacing => 15;
 
diff --git a/osu.Game/Overlays/Chat/ChatTextBar.cs b/osu.Game/Overlays/Chat/ChatTextBar.cs
index 16a8d14b1003..0a42363279d8 100644
--- a/osu.Game/Overlays/Chat/ChatTextBar.cs
+++ b/osu.Game/Overlays/Chat/ChatTextBar.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Overlays.Chat
 {
     public partial class ChatTextBar : Container
     {
+        public const float HEIGHT = 40;
+
         public readonly BindableBool ShowSearch = new BindableBool();
 
         public event Action<string>? OnChatMessageCommitted;
@@ -45,7 +47,7 @@ public partial class ChatTextBar : Container
         private void load(OverlayColourProvider colourProvider)
         {
             RelativeSizeAxes = Axes.X;
-            Height = 60;
+            Height = HEIGHT;
 
             Children = new Drawable[]
             {
@@ -76,7 +78,7 @@ private void load(OverlayColourProvider colourProvider)
                                 Child = chattingText = new TruncatingSpriteText
                                 {
                                     MaxWidth = chatting_text_width - padding * 2,
-                                    Font = OsuFont.Torus.With(size: 20),
+                                    Font = OsuFont.Torus,
                                     Colour = colourProvider.Background1,
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
@@ -91,7 +93,7 @@ private void load(OverlayColourProvider colourProvider)
                                     Icon = FontAwesome.Solid.Search,
                                     Origin = Anchor.CentreRight,
                                     Anchor = Anchor.CentreRight,
-                                    Size = new Vector2(20),
+                                    Size = new Vector2(OsuFont.DEFAULT_FONT_SIZE),
                                     Margin = new MarginPadding { Right = 2 },
                                 },
                             },
@@ -101,6 +103,7 @@ private void load(OverlayColourProvider colourProvider)
                                 Padding = new MarginPadding { Right = padding },
                                 Child = chatTextBox = new ChatTextBox
                                 {
+                                    FontSize = OsuFont.DEFAULT_FONT_SIZE,
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
                                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs b/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs
index 9c85c73ee420..466f8b2f5d41 100644
--- a/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs
+++ b/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs
@@ -44,7 +44,7 @@ public partial class ChannelListingItem : OsuClickableContainer, IFilterable
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        private const float text_size = 18;
+        private const float text_size = 14;
         private const float icon_size = 14;
 
         private const float vertical_margin = 1.5f;
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 8f3b7031c285..b11483e6788b 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -55,7 +55,6 @@ public partial class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComp
         private const int transition_length = 500;
         private const float top_bar_height = 40;
         private const float side_bar_width = 190;
-        private const float chat_bar_height = 60;
 
         protected override string PopInSampleName => @"UI/overlay-big-pop-in";
         protected override string PopOutSampleName => @"UI/overlay-big-pop-out";
@@ -136,7 +135,7 @@ private void load()
                                     Padding = new MarginPadding
                                     {
                                         Left = side_bar_width,
-                                        Bottom = chat_bar_height,
+                                        Bottom = ChatTextBar.HEIGHT,
                                     },
                                     Children = new Drawable[]
                                     {
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index 8e9e82507dc4..caf19829eeae 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -39,7 +39,7 @@ protected override void LoadComplete()
             base.LoadComplete();
 
             if (!TextBox.ReadOnly)
-                GetContainingInputManager().ChangeFocus(TextBox);
+                GetContainingFocusManager().ChangeFocus(TextBox);
         }
 
         protected override void OnCommit(string text)
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 4ac37a63e2d4..a23c394c9f18 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -210,7 +210,7 @@ protected PopupDialog()
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                     TextAnchor = Anchor.TopCentre,
-                                    Padding = new MarginPadding { Horizontal = 5 },
+                                    Padding = new MarginPadding { Horizontal = 15 },
                                 },
                                 body = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 18))
                                 {
@@ -219,7 +219,7 @@ protected PopupDialog()
                                     TextAnchor = Anchor.TopCentre,
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding { Horizontal = 5 },
+                                    Padding = new MarginPadding { Horizontal = 15 },
                                 },
                                 buttonsContainer = new FillFlowContainer<PopupDialogButton>
                                 {
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
index 385695f6698f..da60951ab659 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
@@ -15,6 +15,7 @@
 using osu.Game.Localisation;
 using osu.Game.Online;
 using osuTK;
+using osuTK.Graphics;
 using Realms;
 
 namespace osu.Game.Overlays.FirstRunSetup
@@ -25,6 +26,8 @@ public partial class ScreenBeatmaps : FirstRunSetupScreen
         private ProgressRoundedButton downloadBundledButton = null!;
         private ProgressRoundedButton downloadTutorialButton = null!;
 
+        private OsuTextFlowContainer downloadInBackgroundText = null!;
+
         private OsuTextFlowContainer currentlyLoadedBeatmaps = null!;
 
         private BundledBeatmapDownloader? tutorialDownloader;
@@ -100,6 +103,15 @@ private void load()
                     Text = FirstRunSetupBeatmapScreenStrings.BundledButton,
                     Action = downloadBundled
                 },
+                downloadInBackgroundText = new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: CONTENT_FONT_SIZE))
+                {
+                    Colour = OverlayColourProvider.Light2,
+                    Alpha = 0,
+                    TextAnchor = Anchor.TopCentre,
+                    Text = FirstRunSetupBeatmapScreenStrings.DownloadingInBackground,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
+                },
                 new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: CONTENT_FONT_SIZE))
                 {
                     Colour = OverlayColourProvider.Content1,
@@ -169,6 +181,10 @@ private void downloadBundled()
             if (bundledDownloader != null)
                 return;
 
+            downloadInBackgroundText
+                .FlashColour(Color4.White, 500)
+                .FadeIn(200);
+
             bundledDownloader = new BundledBeatmapDownloader(false);
 
             AddInternal(bundledDownloader);
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
index b19a9c6c995b..983cb0bbb45a 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
@@ -128,6 +128,7 @@ private void updateStablePath()
             if (available)
             {
                 copyInformation.Text = FirstRunOverlayImportFromStableScreenStrings.DataMigrationNoExtraSpace;
+                copyInformation.AddText(@" "); // just to ensure correct spacing
                 copyInformation.AddLink(FirstRunOverlayImportFromStableScreenStrings.LearnAboutHardLinks, LinkAction.OpenWiki, @"Client/Release_stream/Lazer/File_storage#via-hard-links");
             }
             else if (!RuntimeInfo.IsDesktop)
diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index 80dfca93d23e..418721f371b6 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -150,7 +150,7 @@ private void performLogin()
 
         protected override void OnFocus(FocusEvent e)
         {
-            Schedule(() => { GetContainingInputManager().ChangeFocus(string.IsNullOrEmpty(username.Text) ? username : password); });
+            Schedule(() => { GetContainingFocusManager().ChangeFocus(string.IsNullOrEmpty(username.Text) ? username : password); });
         }
     }
 }
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index a8adf4ce8ce2..845d20ccaf01 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -186,7 +186,7 @@ private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule((
             }
 
             if (form != null)
-                ScheduleAfterChildren(() => GetContainingInputManager()?.ChangeFocus(form));
+                ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(form));
         });
 
         private void updateDropdownCurrent(UserStatus? status)
@@ -216,7 +216,7 @@ private void updateDropdownCurrent(UserStatus? status)
 
         protected override void OnFocus(FocusEvent e)
         {
-            if (form != null) GetContainingInputManager().ChangeFocus(form);
+            if (form != null) GetContainingFocusManager().ChangeFocus(form);
             base.OnFocus(e);
         }
     }
diff --git a/osu.Game/Overlays/Login/SecondFactorAuthForm.cs b/osu.Game/Overlays/Login/SecondFactorAuthForm.cs
index dcd3119f33b9..82e328c036e9 100644
--- a/osu.Game/Overlays/Login/SecondFactorAuthForm.cs
+++ b/osu.Game/Overlays/Login/SecondFactorAuthForm.cs
@@ -141,7 +141,7 @@ private void load()
 
         protected override void OnFocus(FocusEvent e)
         {
-            Schedule(() => { GetContainingInputManager().ChangeFocus(codeTextBox); });
+            Schedule(() => { GetContainingFocusManager().ChangeFocus(codeTextBox); });
         }
     }
 }
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index c0aff6aae9ba..8dc454c0a03e 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -78,7 +78,7 @@ protected override void PopIn()
             this.FadeIn(transition_time, Easing.OutQuint);
             FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
 
-            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(panel));
+            ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(panel));
         }
 
         protected override void PopOut()
diff --git a/osu.Game/Overlays/Mods/AddPresetPopover.cs b/osu.Game/Overlays/Mods/AddPresetPopover.cs
index b782b5d6babd..50aa5a2eb4a1 100644
--- a/osu.Game/Overlays/Mods/AddPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/AddPresetPopover.cs
@@ -89,7 +89,7 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
+            ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(nameTextBox));
 
             nameTextBox.Current.BindValueChanged(s =>
             {
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 9554ba8ce2f8..8fa6b35162b5 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -136,7 +136,7 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(nameTextBox));
+            ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(nameTextBox));
         }
 
         public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index df33c78ea41d..e9f21338bddb 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -69,6 +69,7 @@ public IReadOnlyList<ModState> AvailableMods
         private Task? latestLoadTask;
         private ModPanel[]? latestLoadedPanels;
         internal bool ItemsLoaded => latestLoadTask?.IsCompleted == true && allPanelsLoaded;
+        private bool? wasPresent;
 
         private bool allPanelsLoaded
         {
@@ -192,6 +193,15 @@ protected override void Update()
         {
             base.Update();
 
+            // we override `IsPresent` to include the scheduler's pending task state to make async loads work correctly when columns are masked away
+            // (see description of https://github.com/ppy/osu/pull/19783).
+            // however, because of that we must also ensure that we signal correct invalidations (https://github.com/ppy/osu-framework/issues/5129).
+            // failing to do so causes columns to be stuck in "present" mode despite actually not being present themselves.
+            // this works because `Update()` will always run after a scheduler update, which is what causes the presence state change responsible for the failure.
+            if (wasPresent != null && wasPresent != IsPresent)
+                Invalidate(Invalidation.Presence);
+            wasPresent = IsPresent;
+
             if (selectionDelay == initial_multiple_selection_delay || Time.Current - lastSelection >= selectionDelay)
             {
                 if (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 3982abeba7a4..568ca5ecc90a 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -55,7 +55,12 @@ protected override void LoadComplete()
 
         protected override void Select()
         {
-            var selectedSystemMods = selectedMods.Value.Where(mod => mod.Type == ModType.System);
+            // this implicitly presumes that if a system mod declares incompatibility with a non-system mod,
+            // the non-system mod should take precedence.
+            // if this assumption is ever broken, this should be reconsidered.
+            var selectedSystemMods = selectedMods.Value.Where(mod => mod.Type == ModType.System &&
+                                                                     !mod.IncompatibleMods.Any(t => Preset.Value.Mods.Any(t.IsInstanceOfType)));
+
             // will also have the side effect of activating the preset (see `updateActiveState()`).
             selectedMods.Value = Preset.Value.Mods.Concat(selectedSystemMods).ToArray();
         }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 53c24dc828a2..e255efdf2de7 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -143,8 +143,6 @@ protected virtual IEnumerable<ShearedButton> CreateFooterButtons()
         protected ShearedToggleButton? CustomisationButton { get; private set; }
         protected SelectAllModsButton? SelectAllModsButton { get; set; }
 
-        private bool textBoxShouldFocus;
-
         private Sample? columnAppearSample;
 
         private WorkingBeatmap? beatmap;
@@ -188,7 +186,7 @@ private void load(OsuGameBase game, OsuColour colours, AudioManager audio, OsuCo
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     Height = 0
-                }
+                },
             });
 
             MainAreaContent.AddRange(new Drawable[]
@@ -542,7 +540,7 @@ private void updateCustomisationVisualState()
             if (customisationVisible.Value)
                 SearchTextBox.KillFocus();
             else
-                setTextBoxFocus(textBoxShouldFocus);
+                setTextBoxFocus(textSearchStartsActive.Value);
         }
 
         /// <summary>
@@ -781,7 +779,7 @@ void hideOverlay(bool immediate)
         /// </remarks>>
         public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
         {
-            if (e.Repeat || e.Action != PlatformAction.SelectAll || SelectAllModsButton is null)
+            if (e.Repeat || e.Action != PlatformAction.SelectAll || SelectAllModsButton == null)
                 return false;
 
             SelectAllModsButton.TriggerClick();
@@ -798,15 +796,13 @@ protected override bool OnKeyDown(KeyDownEvent e)
                 return false;
 
             // TODO: should probably eventually support typical platform search shortcuts (`Ctrl-F`, `/`)
-            setTextBoxFocus(!textBoxShouldFocus);
+            setTextBoxFocus(!SearchTextBox.HasFocus);
             return true;
         }
 
-        private void setTextBoxFocus(bool keepFocus)
+        private void setTextBoxFocus(bool focus)
         {
-            textBoxShouldFocus = keepFocus;
-
-            if (textBoxShouldFocus)
+            if (focus)
                 SearchTextBox.TakeFocus();
             else
                 SearchTextBox.KillFocus();
@@ -953,7 +949,7 @@ protected override bool OnClick(ClickEvent e)
                     RequestScroll?.Invoke(this);
 
                 // Killing focus is done here because it's the only feasible place on ModSelectOverlay you can click on without triggering any action.
-                Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
+                Scheduler.Add(() => GetContainingFocusManager().ChangeFocus(null));
 
                 return true;
             }
diff --git a/osu.Game/Overlays/Mods/UserModSelectOverlay.cs b/osu.Game/Overlays/Mods/UserModSelectOverlay.cs
index 49469b99f3f3..16d71e557be3 100644
--- a/osu.Game/Overlays/Mods/UserModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/UserModSelectOverlay.cs
@@ -3,18 +3,30 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Input.Events;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Select;
 using osu.Game.Utils;
 
 namespace osu.Game.Overlays.Mods
 {
     public partial class UserModSelectOverlay : ModSelectOverlay
     {
+        private ModSpeedHotkeyHandler modSpeedHotkeyHandler = null!;
+
         public UserModSelectOverlay(OverlayColourScheme colourScheme = OverlayColourScheme.Green)
             : base(colourScheme)
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Add(modSpeedHotkeyHandler = new ModSpeedHotkeyHandler());
+        }
+
         protected override ModColumn CreateModColumn(ModType modType) => new UserModColumn(modType, false);
 
         protected override IReadOnlyList<Mod> ComputeNewModsFromSelection(IReadOnlyList<Mod> oldSelection, IReadOnlyList<Mod> newSelection)
@@ -38,6 +50,20 @@ protected override IReadOnlyList<Mod> ComputeNewModsFromSelection(IReadOnlyList<
             return modsAfterRemoval.ToList();
         }
 
+        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.IncreaseModSpeed:
+                    return modSpeedHotkeyHandler.ChangeSpeed(0.05, AllAvailableMods.Where(state => state.ValidForSelection.Value).Select(state => state.Mod));
+
+                case GlobalAction.DecreaseModSpeed:
+                    return modSpeedHotkeyHandler.ChangeSpeed(-0.05, AllAvailableMods.Where(state => state.ValidForSelection.Value).Select(state => state.Mod));
+            }
+
+            return base.OnPressed(e);
+        }
+
         private partial class UserModColumn : ModColumn
         {
             public UserModColumn(ModType modType, bool allowIncompatibleSelection)
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index ab9937060397..76c8c237d581 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -5,6 +5,7 @@
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -33,6 +34,7 @@ public partial class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverl
         public LocalisableString Title => NowPlayingStrings.HeaderTitle;
         public LocalisableString Description => NowPlayingStrings.HeaderDescription;
 
+        private const float player_width = 400;
         private const float player_height = 130;
         private const float transition_length = 800;
         private const float progress_height = 10;
@@ -47,7 +49,7 @@ public partial class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverl
         private IconButton nextButton = null!;
         private IconButton playlistButton = null!;
 
-        private SpriteText title = null!, artist = null!;
+        private ScrollingTextContainer title = null!, artist = null!;
 
         private PlaylistOverlay? playlist;
 
@@ -70,7 +72,7 @@ public partial class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverl
 
         public NowPlayingOverlay()
         {
-            Width = 400;
+            Width = player_width;
             Margin = new MarginPadding(margin);
         }
 
@@ -101,7 +103,7 @@ private void load()
                             Children = new[]
                             {
                                 background = Empty(),
-                                title = new OsuSpriteText
+                                title = new ScrollingTextContainer
                                 {
                                     Origin = Anchor.BottomCentre,
                                     Anchor = Anchor.TopCentre,
@@ -110,7 +112,7 @@ private void load()
                                     Colour = Color4.White,
                                     Text = @"Nothing to play",
                                 },
-                                artist = new OsuSpriteText
+                                artist = new ScrollingTextContainer
                                 {
                                     Origin = Anchor.TopCentre,
                                     Anchor = Anchor.TopCentre,
@@ -319,15 +321,15 @@ private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction
                     switch (direction)
                     {
                         case TrackChangeDirection.Next:
-                            newBackground.Position = new Vector2(400, 0);
+                            newBackground.Position = new Vector2(player_width, 0);
                             newBackground.MoveToX(0, 500, Easing.OutCubic);
-                            background.MoveToX(-400, 500, Easing.OutCubic);
+                            background.MoveToX(-player_width, 500, Easing.OutCubic);
                             break;
 
                         case TrackChangeDirection.Prev:
-                            newBackground.Position = new Vector2(-400, 0);
+                            newBackground.Position = new Vector2(-player_width, 0);
                             newBackground.MoveToX(0, 500, Easing.OutCubic);
-                            background.MoveToX(400, 500, Easing.OutCubic);
+                            background.MoveToX(player_width, 500, Easing.OutCubic);
                             break;
                     }
 
@@ -422,7 +424,7 @@ public Background(WorkingBeatmap beatmap)
             [BackgroundDependencyLoader]
             private void load(LargeTextureStore textures)
             {
-                sprite.Texture = beatmap.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
+                sprite.Texture = beatmap.GetBackground() ?? textures.Get(@"Backgrounds/bg2");
             }
         }
 
@@ -469,5 +471,111 @@ protected override void OnHoverLost(HoverLostEvent e)
                 base.OnHoverLost(e);
             }
         }
+
+        private partial class ScrollingTextContainer : CompositeDrawable
+        {
+            private const float initial_move_delay = 1000;
+            private const float pixels_per_second = 50;
+
+            private OsuSpriteText mainSpriteText = null!;
+            private OsuSpriteText fillerSpriteText = null!;
+
+            private Bindable<bool> showUnicode = null!;
+
+            [Resolved]
+            private FrameworkConfigManager frameworkConfig { get; set; } = null!;
+
+            private LocalisableString text;
+
+            public LocalisableString Text
+            {
+                get => text;
+                set
+                {
+                    text = value;
+
+                    if (IsLoaded)
+                        updateText();
+                }
+            }
+
+            private FontUsage font = OsuFont.Default;
+
+            public FontUsage Font
+            {
+                get => font;
+                set
+                {
+                    font = value;
+
+                    if (IsLoaded)
+                        updateFontAndText();
+                }
+            }
+
+            public ScrollingTextContainer()
+            {
+                AutoSizeAxes = Axes.Both;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChild = new FillFlowContainer<OsuSpriteText>
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new[]
+                    {
+                        mainSpriteText = new OsuSpriteText { Padding = new MarginPadding { Horizontal = margin } },
+                        fillerSpriteText = new OsuSpriteText { Padding = new MarginPadding { Horizontal = margin }, Alpha = 0 },
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                showUnicode = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode);
+                showUnicode.BindValueChanged(_ => updateText());
+
+                updateFontAndText();
+            }
+
+            private void updateFontAndText()
+            {
+                mainSpriteText.Font = font;
+                fillerSpriteText.Font = font;
+
+                updateText();
+            }
+
+            private void updateText()
+            {
+                mainSpriteText.Text = text;
+                fillerSpriteText.Alpha = 0;
+
+                ClearTransforms();
+                X = 0;
+
+                float textOverflowWidth = mainSpriteText.Width - player_width;
+
+                // apply half margin of tolerance on both sides before the text scrolls
+                if (textOverflowWidth > margin)
+                {
+                    fillerSpriteText.Alpha = 1;
+                    fillerSpriteText.Text = text;
+
+                    float initialX = (textOverflowWidth + mainSpriteText.Width) / 2;
+                    float targetX = (textOverflowWidth - mainSpriteText.Width) / 2;
+
+                    this.MoveToX(initialX)
+                        .Delay(initial_move_delay)
+                        .MoveToX(targetX, mainSpriteText.Width * 1000 / pixels_per_second)
+                        .Loop();
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/OSD/SpeedChangeToast.cs b/osu.Game/Overlays/OSD/SpeedChangeToast.cs
new file mode 100644
index 000000000000..49d3985b0443
--- /dev/null
+++ b/osu.Game/Overlays/OSD/SpeedChangeToast.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 osu.Game.Configuration;
+using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
+
+namespace osu.Game.Overlays.OSD
+{
+    public partial class SpeedChangeToast : Toast
+    {
+        public SpeedChangeToast(OsuConfigManager config, double newSpeed)
+            : base(ModSelectOverlayStrings.ModCustomisation, ToastStrings.SpeedChangedTo(newSpeed), config.LookupKeyBindings(GlobalAction.IncreaseModSpeed) + " / " + config.LookupKeyBindings(GlobalAction.DecreaseModSpeed))
+        {
+        }
+    }
+}
diff --git a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
index d7d6bd4a2ab2..c2bea0ed911d 100644
--- a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
+++ b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
@@ -11,6 +11,8 @@
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Localisation;
@@ -65,6 +67,8 @@ public IconUsage Icon
 
             private readonly SpriteIcon icon;
 
+            private Sample selectSample = null!;
+
             public PanelDisplayTabItem(OverlayPanelDisplayStyle value)
                 : base(value)
             {
@@ -78,14 +82,22 @@ public PanelDisplayTabItem(OverlayPanelDisplayStyle value)
                         RelativeSizeAxes = Axes.Both,
                         FillMode = FillMode.Fit
                     },
-                    new HoverClickSounds()
+                    new HoverSounds(HoverSampleSet.TabSelect)
                 });
             }
 
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                selectSample = audio.Samples.Get(@"UI/tabselect-select");
+            }
+
             protected override void OnActivated() => updateState();
 
             protected override void OnDeactivated() => updateState();
 
+            protected override void OnActivatedByUser() => selectSample.Play();
+
             protected override bool OnHover(HoverEvent e)
             {
                 updateState();
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 6d318820b331..b245486adf9d 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -10,6 +10,8 @@
 using osuTK.Graphics;
 using osuTK;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
@@ -39,6 +41,8 @@ protected virtual Color4 AccentColour
 
         public LocalisableString TooltipText => Value.Name;
 
+        private Sample selectSample = null!;
+
         public OverlayRulesetTabItem(RulesetInfo value)
             : base(value)
         {
@@ -59,12 +63,18 @@ public OverlayRulesetTabItem(RulesetInfo value)
                         Icon = value.CreateInstance().CreateIcon(),
                     },
                 },
-                new HoverClickSounds()
+                new HoverSounds(HoverSampleSet.TabSelect)
             });
 
             Enabled.Value = true;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            selectSample = audio.Samples.Get(@"UI/tabselect-select");
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -90,6 +100,8 @@ protected override void OnHoverLost(HoverLostEvent e)
 
         protected override void OnDeactivated() => updateState();
 
+        protected override void OnActivatedByUser() => selectSample.Play();
+
         private void updateState()
         {
             AccentColour = Enabled.Value ? getActiveColour() : colourProvider.Foreground1;
diff --git a/osu.Game/Overlays/OverlayStreamItem.cs b/osu.Game/Overlays/OverlayStreamItem.cs
index 45181c13e429..f0ae0b41fcf5 100644
--- a/osu.Game/Overlays/OverlayStreamItem.cs
+++ b/osu.Game/Overlays/OverlayStreamItem.cs
@@ -11,6 +11,8 @@
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK.Graphics;
@@ -49,8 +51,10 @@ protected OverlayStreamItem(T value)
             Margin = new MarginPadding(PADDING);
         }
 
+        private Sample selectSample;
+
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider, OsuColour colours)
+        private void load(OverlayColourProvider colourProvider, OsuColour colours, AudioManager audio)
         {
             AddRange(new Drawable[]
             {
@@ -87,9 +91,11 @@ private void load(OverlayColourProvider colourProvider, OsuColour colours)
                     CollapsedSize = 2,
                     Expanded = true
                 },
-                new HoverClickSounds()
+                new HoverSounds(HoverSampleSet.TabSelect)
             });
 
+            selectSample = audio.Samples.Get(@"UI/tabselect-select");
+
             SelectedItem.BindValueChanged(_ => updateState(), true);
         }
 
@@ -105,6 +111,8 @@ private void load(OverlayColourProvider colourProvider, OsuColour colours)
 
         protected override void OnDeactivated() => updateState();
 
+        protected override void OnActivatedByUser() => selectSample.Play();
+
         protected override bool OnHover(HoverEvent e)
         {
             updateState();
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 884e31868f85..a27caa13f1ac 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -4,6 +4,8 @@
 #nullable disable
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
@@ -80,6 +82,8 @@ public Color4 AccentColour
                 }
             }
 
+            private Sample selectSample = null!;
+
             public OverlayTabItem(T value)
                 : base(value)
             {
@@ -101,10 +105,16 @@ public OverlayTabItem(T value)
                         ExpandedSize = 5f,
                         CollapsedSize = 0
                     },
-                    new HoverClickSounds(HoverSampleSet.TabSelect)
+                    new HoverSounds(HoverSampleSet.TabSelect)
                 };
             }
 
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                selectSample = audio.Samples.Get(@"UI/tabselect-select");
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 base.OnHover(e);
@@ -136,6 +146,8 @@ protected override void OnDeactivated()
                 Text.Font = Text.Font.With(weight: FontWeight.Medium);
             }
 
+            protected override void OnActivatedByUser() => selectSample.Play();
+
             private void updateState()
             {
                 if (Active.Value)
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index c9e5068b2a76..165a576c030d 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -165,7 +165,6 @@ private void load(OverlayColourProvider colourProvider, OsuConfigManager configM
                                                         userFlag = new UpdateableFlag
                                                         {
                                                             Size = new Vector2(28, 20),
-                                                            ShowPlaceholderOnUnknown = false,
                                                         },
                                                         userCountryContainer = new OsuHoverContainer
                                                         {
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index 27d894cdc234..b9f7e443ca8e 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -99,7 +99,6 @@ protected sealed override Drawable CreateHeader(int index, TableColumn column)
                 new UpdateableFlag(GetCountryCode(item))
                 {
                     Size = new Vector2(28, 20),
-                    ShowPlaceholderOnUnknown = false,
                 },
                 CreateFlagContent(item)
             }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 60d1bd31bef0..05aeb0b810d5 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -152,6 +152,17 @@ private void updatePreviews()
             newPreview.IsChosen.Value = applyNewButton.IsHovered;
         }
 
+        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (e.Action == GlobalAction.Select && !e.Repeat)
+            {
+                applyNew();
+                return true;
+            }
+
+            return base.OnPressed(e);
+        }
+
         private partial class ConflictingKeyBindingPreview : CompositeDrawable
         {
             private readonly object action;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index e82cebe9f4f5..3f6eeca10edd 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -465,7 +465,7 @@ private void finalise(bool advanceToNextBinding = true)
             }
 
             if (HasFocus)
-                GetContainingInputManager().ChangeFocus(null);
+                GetContainingFocusManager().ChangeFocus(null);
 
             cancelAndClearButtons.FadeOut(300, Easing.OutQuint);
             cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index dd0a88bfb1bb..db3b56b9f0a8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -106,7 +106,7 @@ private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpda
             {
                 var next = Children.SkipWhile(c => c != sender).Skip(1).FirstOrDefault();
                 if (next != null)
-                    GetContainingInputManager().ChangeFocus(next);
+                    GetContainingFocusManager().ChangeFocus(next);
             }
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 7805ed58347b..6eb512fa351b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -105,12 +105,17 @@ protected override void LoadComplete()
 
             highPrecisionMouse.Current.BindValueChanged(highPrecision =>
             {
-                if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
+                switch (RuntimeInfo.OS)
                 {
-                    if (highPrecision.NewValue)
-                        highPrecisionMouse.SetNoticeText(MouseSettingsStrings.HighPrecisionPlatformWarning, true);
-                    else
-                        highPrecisionMouse.ClearNoticeText();
+                    case RuntimeInfo.Platform.Linux:
+                    case RuntimeInfo.Platform.macOS:
+                    case RuntimeInfo.Platform.iOS:
+                        if (highPrecision.NewValue)
+                            highPrecisionMouse.SetNoticeText(MouseSettingsStrings.HighPrecisionPlatformWarning, true);
+                        else
+                            highPrecisionMouse.ClearNoticeText();
+
+                        break;
                 }
             }, true);
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
index 4b1836ed8680..d0a8fc7d2cca 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
@@ -31,7 +31,7 @@ private void load(BeatmapManager beatmaps, IDialogOverlay? dialogOverlay)
                     {
                         deleteBeatmapsButton.Enabled.Value = false;
                         Task.Run(() => beatmaps.Delete()).ContinueWith(_ => Schedule(() => deleteBeatmapsButton.Enabled.Value = true));
-                    }));
+                    }, DeleteConfirmationContentStrings.Beatmaps));
                 }
             });
 
@@ -40,11 +40,11 @@ private void load(BeatmapManager beatmaps, IDialogOverlay? dialogOverlay)
                 Text = MaintenanceSettingsStrings.DeleteAllBeatmapVideos,
                 Action = () =>
                 {
-                    dialogOverlay?.Push(new MassVideoDeleteConfirmationDialog(() =>
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
                     {
                         deleteBeatmapVideosButton.Enabled.Value = false;
                         Task.Run(beatmaps.DeleteAllVideos).ContinueWith(_ => Schedule(() => deleteBeatmapVideosButton.Enabled.Value = true));
-                    }));
+                    }, DeleteConfirmationContentStrings.BeatmapVideos));
                 }
             });
             AddRange(new Drawable[]
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
index b373535a8b26..b1c44aa93c04 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
@@ -29,7 +29,7 @@ private void load(IDialogOverlay? dialogOverlay)
                 Text = MaintenanceSettingsStrings.DeleteAllCollections,
                 Action = () =>
                 {
-                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(deleteAllCollections));
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(deleteAllCollections, DeleteConfirmationContentStrings.Collections));
                 }
             });
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
index 99ef62d94be4..7ead815fe9ef 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
@@ -2,15 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Localisation;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public partial class MassDeleteConfirmationDialog : DangerousActionDialog
     {
-        public MassDeleteConfirmationDialog(Action deleteAction)
+        public MassDeleteConfirmationDialog(Action deleteAction, LocalisableString deleteContent)
         {
-            BodyText = "Everything?";
+            BodyText = deleteContent;
             DangerousAction = deleteAction;
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
deleted file mode 100644
index 6312e09b3e3b..000000000000
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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;
-
-namespace osu.Game.Overlays.Settings.Sections.Maintenance
-{
-    public partial class MassVideoDeleteConfirmationDialog : MassDeleteConfirmationDialog
-    {
-        public MassVideoDeleteConfirmationDialog(Action deleteAction)
-            : base(deleteAction)
-        {
-            BodyText = "All beatmap videos? This cannot be undone!";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
index f0d6d10e51e2..9c55308abe83 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
@@ -42,7 +42,7 @@ private void load(IDialogOverlay? dialogOverlay)
                         {
                             deleteAllButton.Enabled.Value = false;
                             Task.Run(deleteAllModPresets).ContinueWith(t => Schedule(onAllModPresetsDeleted, t));
-                        }));
+                        }, DeleteConfirmationContentStrings.ModPresets));
                     }
                 },
                 undeleteButton = new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
index c6f4f1e1a5c4..235f239c7c95 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
@@ -27,7 +27,7 @@ private void load(ScoreManager scores, IDialogOverlay? dialogOverlay)
                     {
                         deleteScoresButton.Enabled.Value = false;
                         Task.Run(() => scores.Delete()).ContinueWith(_ => Schedule(() => deleteScoresButton.Enabled.Value = true));
-                    }));
+                    }, DeleteConfirmationContentStrings.Scores));
                 }
             });
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
index c3ac49af6d53..e962118a368a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
@@ -27,7 +27,7 @@ private void load(SkinManager skins, IDialogOverlay? dialogOverlay)
                     {
                         deleteSkinsButton.Enabled.Value = false;
                         Task.Run(() => skins.Delete()).ContinueWith(_ => Schedule(() => deleteSkinsButton.Enabled.Value = true));
-                    }));
+                    }, DeleteConfirmationContentStrings.Skins));
                 }
             });
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs b/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
index e7b6aa56a8d3..7bd0829add56 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
@@ -28,6 +28,11 @@ private void load(OsuConfigManager config)
                     LabelText = OnlineSettingsStrings.NotifyOnPrivateMessage,
                     Current = config.GetBindable<bool>(OsuSetting.NotifyOnPrivateMessage)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = OnlineSettingsStrings.HideCountryFlags,
+                    Current = config.GetBindable<bool>(OsuSetting.HideCountryFlags)
+                },
             };
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index 1484f2c75630..6593eb69fac0 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -1,6 +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 osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -25,8 +26,10 @@ public OnlineSection()
             {
                 new WebSettings(),
                 new AlertsAndPrivacySettings(),
-                new IntegrationSettings()
             };
+
+            if (RuntimeInfo.IsDesktop)
+                Add(new IntegrationSettings());
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/SizeSlider.cs b/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
index c73831d8d1ae..14ef58ff8876 100644
--- a/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
+++ b/osu.Game/Overlays/Settings/Sections/SizeSlider.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Numerics;
 using System.Globalization;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
@@ -12,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections
     /// A slider intended to show a "size" multiplier number, where 1x is 1.0.
     /// </summary>
     public partial class SizeSlider<T> : RoundedSliderBar<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible, IFormattable
+        where T : struct, INumber<T>, IMinMaxValue<T>, IFormattable
     {
         public override LocalisableString TooltipText => Current.Value.ToString(@"0.##x", NumberFormatInfo.CurrentInfo);
     }
diff --git a/osu.Game/Overlays/Settings/SettingsPercentageSlider.cs b/osu.Game/Overlays/Settings/SettingsPercentageSlider.cs
index fa59d18de120..d7a09d3392f2 100644
--- a/osu.Game/Overlays/Settings/SettingsPercentageSlider.cs
+++ b/osu.Game/Overlays/Settings/SettingsPercentageSlider.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 System;
+using System.Numerics;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings
     /// Mostly provided for convenience of use with <see cref="SettingSourceAttribute"/>.
     /// </summary>
     public partial class SettingsPercentageSlider<TValue> : SettingsSlider<TValue>
-        where TValue : struct, IEquatable<TValue>, IComparable<TValue>, IConvertible
+        where TValue : struct, INumber<TValue>, IMinMaxValue<TValue>
     {
         protected override Drawable CreateControl() => ((RoundedSliderBar<TValue>)base.CreateControl()).With(sliderBar => sliderBar.DisplayAsPercentage = true);
     }
diff --git a/osu.Game/Overlays/Settings/SettingsSlider.cs b/osu.Game/Overlays/Settings/SettingsSlider.cs
index 6c81fece13a8..2460d780994a 100644
--- a/osu.Game/Overlays/Settings/SettingsSlider.cs
+++ b/osu.Game/Overlays/Settings/SettingsSlider.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 System;
+using System.Numerics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
@@ -9,12 +9,12 @@
 namespace osu.Game.Overlays.Settings
 {
     public partial class SettingsSlider<T> : SettingsSlider<T, RoundedSliderBar<T>>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
     }
 
     public partial class SettingsSlider<TValue, TSlider> : SettingsItem<TValue>
-        where TValue : struct, IEquatable<TValue>, IComparable<TValue>, IConvertible
+        where TValue : struct, INumber<TValue>, IMinMaxValue<TValue>
         where TSlider : RoundedSliderBar<TValue>, new()
     {
         protected override Drawable CreateControl() => new TSlider
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 748673035ba9..d5c642d24f63 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -201,7 +201,7 @@ protected override void PopOut()
 
             searchTextBox.HoldFocus = false;
             if (searchTextBox.HasFocus)
-                GetContainingInputManager().ChangeFocus(null);
+                GetContainingFocusManager().ChangeFocus(null);
         }
 
         public override bool AcceptsFocus => true;
diff --git a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
index 8f8d899fad4e..6b59d940cc78 100644
--- a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
@@ -40,7 +40,9 @@ public partial class SkinBlueprint : SelectionBlueprint<ISerialisableDrawable>
 
         public override bool Contains(Vector2 screenSpacePos) => drawableQuad.Contains(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(drawable.OriginPosition);
+        public override Vector2 ScreenSpaceSelectionPoint =>
+            // Important to use a stable position (not based on origin) as origin may be automatically updated during drag operations.
+            drawable.ScreenSpaceDrawQuad.Centre;
 
         protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) =>
             drawableQuad.Contains(screenSpacePos);
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index d3af928907ac..67fd6a95509b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -52,6 +52,7 @@ public partial class SkinEditor : VisibilityContainer, ICanAcceptFiles, IKeyBind
         private OsuTextFlowContainer headerText = null!;
 
         private Bindable<Skin> currentSkin = null!;
+        private Bindable<string> clipboardContent = null!;
 
         [Resolved]
         private OsuGame? game { get; set; }
@@ -65,9 +66,6 @@ public partial class SkinEditor : VisibilityContainer, ICanAcceptFiles, IKeyBind
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
-        [Resolved]
-        private EditorClipboard clipboard { get; set; } = null!;
-
         [Resolved]
         private SkinEditorOverlay? skinEditorOverlay { get; set; }
 
@@ -113,7 +111,7 @@ public SkinEditor(Drawable targetScreen)
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(EditorClipboard clipboard)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -224,6 +222,8 @@ private void load()
                     }
                 }
             };
+
+            clipboardContent = clipboard.Content.GetBoundCopy();
         }
 
         protected override void LoadComplete()
@@ -243,7 +243,7 @@ protected override void LoadComplete()
                 canCopy.Value = canCut.Value = SelectedComponents.Any();
             }, true);
 
-            clipboard.Content.BindValueChanged(content => canPaste.Value = !string.IsNullOrEmpty(content.NewValue), true);
+            clipboardContent.BindValueChanged(content => canPaste.Value = !string.IsNullOrEmpty(content.NewValue), true);
 
             Show();
 
@@ -255,8 +255,11 @@ protected override void LoadComplete()
             // schedule ensures this only happens when the skin editor is visible.
             // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
             // probably something which will be factored out in a future database refactor so not too concerning for now.
-            currentSkin.BindValueChanged(_ =>
+            currentSkin.BindValueChanged(val =>
             {
+                if (val.OldValue != null && hasBegunMutating)
+                    save(val.OldValue);
+
                 hasBegunMutating = false;
                 Scheduler.AddOnce(skinChanged);
             }, true);
@@ -454,6 +457,7 @@ private bool placeComponent(ISerialisableDrawable component, bool applyDefaults
             }
 
             SelectedComponents.Add(component);
+            SkinSelectionHandler.ApplyClosestAnchorOrigin(drawableComponent);
             return true;
         }
 
@@ -495,7 +499,7 @@ protected void Cut()
 
         protected void Copy()
         {
-            clipboard.Content.Value = JsonConvert.SerializeObject(SelectedComponents.Cast<Drawable>().Select(s => s.CreateSerialisedInfo()).ToArray());
+            clipboardContent.Value = JsonConvert.SerializeObject(SelectedComponents.Cast<Drawable>().Select(s => s.CreateSerialisedInfo()).ToArray());
         }
 
         protected void Clone()
@@ -515,7 +519,7 @@ protected void Paste()
 
             changeHandler?.BeginChange();
 
-            var drawableInfo = JsonConvert.DeserializeObject<SerialisedDrawableInfo[]>(clipboard.Content.Value);
+            var drawableInfo = JsonConvert.DeserializeObject<SerialisedDrawableInfo[]>(clipboardContent.Value);
 
             if (drawableInfo == null)
                 return;
@@ -536,7 +540,9 @@ protected void Paste()
 
         protected void Redo() => changeHandler?.RestoreState(1);
 
-        public void Save(bool userTriggered = true)
+        public void Save(bool userTriggered = true) => save(currentSkin.Value, userTriggered);
+
+        private void save(Skin skin, bool userTriggered = true)
         {
             if (!hasBegunMutating)
                 return;
@@ -550,11 +556,11 @@ public void Save(bool userTriggered = true)
                 return;
 
             foreach (var t in targetContainers)
-                currentSkin.Value.UpdateDrawableTarget(t);
+                skin.UpdateDrawableTarget(t);
 
             // In the case the save was user triggered, always show the save message to make them feel confident.
-            if (skins.Save(skins.CurrentSkin.Value) || userTriggered)
-                onScreenDisplay?.Display(new SkinEditorToast(ToastStrings.SkinSaved, currentSkin.Value.SkinInfo.ToString() ?? "Unknown"));
+            if (skins.Save(skin) || userTriggered)
+                onScreenDisplay?.Display(new SkinEditorToast(ToastStrings.SkinSaved, skin.SkinInfo.ToString() ?? "Unknown"));
         }
 
         protected override bool OnHover(HoverEvent e) => true;
@@ -666,8 +672,6 @@ public Task Import(params string[] paths)
 
                 SelectedComponents.Clear();
                 placeComponent(sprite, false);
-
-                SkinSelectionHandler.ApplyClosestAnchor(sprite);
             });
 
             return Task.CompletedTask;
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 2f4820e2074f..571f99bd08eb 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -13,6 +13,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Layout;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -30,7 +31,6 @@
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
 {
@@ -70,12 +70,14 @@ public partial class SkinEditorOverlay : OverlayContainer, IKeyBindingHandler<Gl
         private OsuScreen? lastTargetScreen;
         private InvokeOnDisposal? nestedInputManagerDisable;
 
-        private Vector2 lastDrawSize;
+        private readonly LayoutValue drawSizeLayout;
 
         public SkinEditorOverlay(ScalingContainer scalingContainer)
         {
             this.scalingContainer = scalingContainer;
             RelativeSizeAxes = Axes.Both;
+
+            AddLayout(drawSizeLayout = new LayoutValue(Invalidation.DrawSize));
         }
 
         [BackgroundDependencyLoader]
@@ -199,10 +201,10 @@ protected override void Update()
         {
             base.Update();
 
-            if (game.DrawSize != lastDrawSize)
+            if (!drawSizeLayout.IsValid)
             {
-                lastDrawSize = game.DrawSize;
                 updateScreenSizing();
+                drawSizeLayout.Validate();
             }
         }
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index cf6fb60636f2..a671e7a76ee5 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -5,12 +5,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Utils;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -23,6 +22,8 @@ namespace osu.Game.Overlays.SkinEditor
 {
     public partial class SkinSelectionHandler : SelectionHandler<ISerialisableDrawable>
     {
+        private OsuMenuItem originMenu = null!;
+
         [Resolved]
         private SkinEditor skinEditor { get; set; } = null!;
 
@@ -31,148 +32,16 @@ public partial class SkinSelectionHandler : SelectionHandler<ISerialisableDrawab
             UpdatePosition = updateDrawablePosition
         };
 
-        private bool allSelectedSupportManualSizing(Axes axis) => SelectedItems.All(b => (b as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(axis) == false);
-
-        public override bool HandleScale(Vector2 scale, Anchor anchor)
+        public override SelectionScaleHandler CreateScaleHandler()
         {
-            Axes adjustAxis;
-
-            switch (anchor)
-            {
-                // for corners, adjust scale.
-                case Anchor.TopLeft:
-                case Anchor.TopRight:
-                case Anchor.BottomLeft:
-                case Anchor.BottomRight:
-                    adjustAxis = Axes.Both;
-                    break;
-
-                // for edges, adjust size.
-                // autosize elements can't be easily handled so just disable sizing for now.
-                case Anchor.TopCentre:
-                case Anchor.BottomCentre:
-                    if (!allSelectedSupportManualSizing(Axes.Y))
-                        return false;
-
-                    adjustAxis = Axes.Y;
-                    break;
-
-                case Anchor.CentreLeft:
-                case Anchor.CentreRight:
-                    if (!allSelectedSupportManualSizing(Axes.X))
-                        return false;
-
-                    adjustAxis = Axes.X;
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(anchor), anchor, null);
-            }
-
-            // convert scale to screen space
-            scale = ToScreenSpace(scale) - ToScreenSpace(Vector2.Zero);
-
-            adjustScaleFromAnchor(ref scale, anchor);
-
-            // the selection quad is always upright, so use an AABB rect to make mutating the values easier.
-            var selectionRect = getSelectionQuad().AABBFloat;
-
-            // If the selection has no area we cannot scale it
-            if (selectionRect.Area == 0)
-                return false;
-
-            // copy to mutate, as we will need to compare to the original later on.
-            var adjustedRect = selectionRect;
-            bool isRotated = false;
-
-            // for now aspect lock scale adjustments that occur at corners..
-            if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-            {
-                // project scale vector along diagonal
-                Vector2 diag = (selectionRect.TopLeft - selectionRect.BottomRight).Normalized();
-                scale = Vector2.Dot(scale, diag) * diag;
-            }
-            // ..or if any of the selection have been rotated.
-            // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
-            else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0)))
+            var scaleHandler = new SkinSelectionScaleHandler
             {
-                isRotated = true;
-                if (anchor.HasFlagFast(Anchor.x1))
-                    // if dragging from the horizontal centre, only a vertical component is available.
-                    scale.X = scale.Y / selectionRect.Height * selectionRect.Width;
-                else
-                    // in all other cases (arbitrarily) use the horizontal component for aspect lock.
-                    scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
-            }
-
-            if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
-            if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
-
-            // Maintain the selection's centre position if dragging from the centre anchors and selection is rotated.
-            if (isRotated && anchor.HasFlagFast(Anchor.x1)) adjustedRect.X -= scale.X / 2;
-            if (isRotated && anchor.HasFlagFast(Anchor.y1)) adjustedRect.Y -= scale.Y / 2;
-
-            adjustedRect.Width += scale.X;
-            adjustedRect.Height += scale.Y;
-
-            if (adjustedRect.Width <= 0 || adjustedRect.Height <= 0)
-            {
-                Axes toFlip = Axes.None;
-
-                if (adjustedRect.Width <= 0) toFlip |= Axes.X;
-                if (adjustedRect.Height <= 0) toFlip |= Axes.Y;
-
-                SelectionBox.PerformFlipFromScaleHandles(toFlip);
-                return true;
-            }
-
-            // scale adjust applied to each individual item should match that of the quad itself.
-            var scaledDelta = new Vector2(
-                adjustedRect.Width / selectionRect.Width,
-                adjustedRect.Height / selectionRect.Height
-            );
-
-            foreach (var b in SelectedBlueprints)
-            {
-                var drawableItem = (Drawable)b.Item;
-
-                // each drawable's relative position should be maintained in the scaled quad.
-                var screenPosition = b.ScreenSpaceSelectionPoint;
-
-                var relativePositionInOriginal =
-                    new Vector2(
-                        (screenPosition.X - selectionRect.TopLeft.X) / selectionRect.Width,
-                        (screenPosition.Y - selectionRect.TopLeft.Y) / selectionRect.Height
-                    );
-
-                var newPositionInAdjusted = new Vector2(
-                    adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
-                    adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
-                );
-
-                updateDrawablePosition(drawableItem, newPositionInAdjusted);
-
-                var currentScaledDelta = scaledDelta;
-                if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
-                    currentScaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
-
-                switch (adjustAxis)
-                {
-                    case Axes.X:
-                        drawableItem.Width *= currentScaledDelta.X;
-                        break;
-
-                    case Axes.Y:
-                        drawableItem.Height *= currentScaledDelta.Y;
-                        break;
+                UpdatePosition = updateDrawablePosition
+            };
 
-                    case Axes.Both:
-                        drawableItem.Scale *= currentScaledDelta;
-                        break;
-                }
-            }
+            scaleHandler.PerformFlipFromScaleHandles += a => SelectionBox.PerformFlipFromScaleHandles(a);
 
-            return true;
+            return scaleHandler;
         }
 
         public override bool HandleFlip(Direction direction, bool flipOverOrigin)
@@ -202,25 +71,27 @@ public override bool HandleMovement(MoveSelectionEvent<ISerialisableDrawable> mo
                 var item = c.Item;
                 Drawable drawable = (Drawable)item;
 
-                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
-
-                if (item.UsesFixedAnchor) continue;
+                if (!item.UsesFixedAnchor)
+                    ApplyClosestAnchorOrigin(drawable);
 
-                ApplyClosestAnchor(drawable);
+                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
             }
 
             return true;
         }
 
-        public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable));
+        public static void ApplyClosestAnchorOrigin(Drawable drawable)
+        {
+            var closest = getClosestAnchor(drawable);
+
+            applyAnchor(drawable, closest);
+            applyOrigin(drawable, closest);
+        }
 
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();
 
-            SelectionBox.CanScaleX = allSelectedSupportManualSizing(Axes.X);
-            SelectionBox.CanScaleY = allSelectedSupportManualSizing(Axes.Y);
-            SelectionBox.CanScaleDiagonally = true;
             SelectionBox.CanFlipX = true;
             SelectionBox.CanFlipY = true;
             SelectionBox.CanReverse = false;
@@ -243,10 +114,15 @@ protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumer
                         .ToArray()
             };
 
-            yield return new OsuMenuItem("Origin")
+            yield return originMenu = new OsuMenuItem("Origin");
+
+            closestItem.State.BindValueChanged(s =>
             {
-                Items = createAnchorItems((d, o) => ((Drawable)d).Origin == o, applyOrigins).ToArray()
-            };
+                // For UX simplicity, origin should only be user-editable when "closest" anchor mode is disabled.
+                originMenu.Items = s.NewValue == TernaryState.True
+                    ? Array.Empty<MenuItem>()
+                    : createAnchorItems((d, o) => ((Drawable)d).Origin == o, applyOrigins).ToArray();
+            }, true);
 
             yield return new OsuMenuItemSpacer();
 
@@ -325,15 +201,10 @@ private void applyOrigins(Anchor origin)
             {
                 var drawable = (Drawable)item;
 
-                if (origin == drawable.Origin) continue;
-
-                var previousOrigin = drawable.OriginPosition;
-                drawable.Origin = origin;
-                drawable.Position += drawable.OriginPosition - previousOrigin;
+                applyOrigin(drawable, origin);
 
-                if (item.UsesFixedAnchor) continue;
-
-                ApplyClosestAnchor(drawable);
+                if (!item.UsesFixedAnchor)
+                    ApplyClosestAnchorOrigin(drawable);
             }
 
             OnOperationEnded();
@@ -368,7 +239,7 @@ private void applyClosestAnchors()
             foreach (var item in SelectedItems)
             {
                 item.UsesFixedAnchor = false;
-                ApplyClosestAnchor((Drawable)item);
+                ApplyClosestAnchorOrigin((Drawable)item);
             }
 
             OnOperationEnded();
@@ -414,15 +285,43 @@ private static void applyAnchor(Drawable drawable, Anchor anchor)
             drawable.Position -= drawable.AnchorPosition - previousAnchor;
         }
 
-        private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
+        private static void applyOrigin(Drawable drawable, Anchor screenSpaceOrigin)
         {
-            // cancel out scale in axes we don't care about (based on which drag handle was used).
-            if ((reference & Anchor.x1) > 0) scale.X = 0;
-            if ((reference & Anchor.y1) > 0) scale.Y = 0;
+            var boundingBox = drawable.ScreenSpaceDrawQuad.AABBFloat;
+
+            var targetScreenSpacePosition = screenSpaceOrigin.PositionOnQuad(boundingBox);
+
+            Anchor localOrigin = Anchor.TopLeft;
+            float smallestDistanceFromTargetPosition = float.PositiveInfinity;
+
+            void checkOrigin(Anchor originToTest)
+            {
+                Vector2 positionToTest = drawable.ToScreenSpace(originToTest.PositionOnQuad(drawable.DrawRectangle));
+                float testedDistance = Vector2.Distance(targetScreenSpacePosition, positionToTest);
+
+                if (testedDistance < smallestDistanceFromTargetPosition)
+                {
+                    localOrigin = originToTest;
+                    smallestDistanceFromTargetPosition = testedDistance;
+                }
+            }
+
+            checkOrigin(Anchor.TopLeft);
+            checkOrigin(Anchor.TopCentre);
+            checkOrigin(Anchor.TopRight);
+
+            checkOrigin(Anchor.CentreLeft);
+            checkOrigin(Anchor.Centre);
+            checkOrigin(Anchor.CentreRight);
+
+            checkOrigin(Anchor.BottomLeft);
+            checkOrigin(Anchor.BottomCentre);
+            checkOrigin(Anchor.BottomRight);
+
+            Vector2 offset = drawable.ToParentSpace(localOrigin.PositionOnQuad(drawable.DrawRectangle)) - drawable.ToParentSpace(drawable.Origin.PositionOnQuad(drawable.DrawRectangle));
 
-            // reverse the scale direction if dragging from top or left.
-            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
-            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+            drawable.Origin = localOrigin;
+            drawable.Position += offset;
         }
     }
 }
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
index 60f69000a28c..7ecf116b68fb 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
@@ -41,7 +41,7 @@ protected override void LoadComplete()
 
         private void updateState()
         {
-            CanRotate.Value = selectedItems.Count > 0;
+            CanRotateSelectionOrigin.Value = selectedItems.Count > 0;
         }
 
         private Drawable[]? objectsInRotation;
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionScaleHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionScaleHandler.cs
new file mode 100644
index 000000000000..08df8df7e201
--- /dev/null
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionScaleHandler.cs
@@ -0,0 +1,178 @@
+// 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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Skinning;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Overlays.SkinEditor
+{
+    public partial class SkinSelectionScaleHandler : SelectionScaleHandler
+    {
+        public Action<Drawable, Vector2> UpdatePosition { get; init; } = null!;
+
+        public event Action<Axes>? PerformFlipFromScaleHandles;
+
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
+
+        private BindableList<ISerialisableDrawable> selectedItems { get; } = new BindableList<ISerialisableDrawable>();
+
+        [BackgroundDependencyLoader]
+        private void load(SkinEditor skinEditor)
+        {
+            selectedItems.BindTo(skinEditor.SelectedComponents);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedItems.CollectionChanged += (_, __) => updateState();
+            updateState();
+        }
+
+        private void updateState()
+        {
+            CanScaleX.Value = allSelectedSupportManualSizing(Axes.X);
+            CanScaleY.Value = allSelectedSupportManualSizing(Axes.Y);
+            CanScaleDiagonally.Value = true;
+        }
+
+        private bool allSelectedSupportManualSizing(Axes axis) => selectedItems.All(b => (b as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(axis) == false);
+
+        private Dictionary<Drawable, OriginalDrawableState>? objectsInScale;
+        private Vector2? defaultOrigin;
+
+        private bool isFlippedX;
+        private bool isFlippedY;
+
+        public override void Begin()
+        {
+            if (objectsInScale != null)
+                throw new InvalidOperationException($"Cannot {nameof(Begin)} a scale operation while another is in progress!");
+
+            changeHandler?.BeginChange();
+
+            objectsInScale = selectedItems.Cast<Drawable>().ToDictionary(d => d, d => new OriginalDrawableState(d));
+            OriginalSurroundingQuad = ToLocalSpace(GeometryUtils.GetSurroundingQuad(objectsInScale.SelectMany(d => d.Key.ScreenSpaceDrawQuad.GetVertices().ToArray())));
+            defaultOrigin = OriginalSurroundingQuad.Value.Centre;
+
+            isFlippedX = false;
+            isFlippedY = false;
+        }
+
+        public override void Update(Vector2 scale, Vector2? origin = null, Axes adjustAxis = Axes.Both)
+        {
+            if (objectsInScale == null)
+                throw new InvalidOperationException($"Cannot {nameof(Update)} a scale operation without calling {nameof(Begin)} first!");
+
+            Debug.Assert(defaultOrigin != null && OriginalSurroundingQuad != null);
+
+            var actualOrigin = ToScreenSpace(origin ?? defaultOrigin.Value);
+
+            if ((adjustAxis == Axes.Y && !allSelectedSupportManualSizing(Axes.Y)) ||
+                (adjustAxis == Axes.X && !allSelectedSupportManualSizing(Axes.X)))
+                return;
+
+            // If the selection has no area we cannot scale it
+            if (OriginalSurroundingQuad.Value.Width == 0 || OriginalSurroundingQuad.Value.Height == 0)
+                return;
+
+            // for now aspect lock scale adjustments that occur at corners.
+            if (adjustAxis == Axes.Both)
+            {
+                // project scale vector along diagonal
+                scale = new Vector2((scale.X + scale.Y) * 0.5f);
+            }
+            // If any of the selection have been rotated and the adjust axis is not both,
+            // we would require skew logic to achieve a correct image editor-like scale.
+            // For now we just ignore, because it would likely not be the user's expected transform anyway.
+
+            bool flippedX = scale.X < 0;
+            bool flippedY = scale.Y < 0;
+            Axes toFlip = Axes.None;
+
+            if (flippedX != isFlippedX)
+            {
+                isFlippedX = flippedX;
+                toFlip |= Axes.X;
+            }
+
+            if (flippedY != isFlippedY)
+            {
+                isFlippedY = flippedY;
+                toFlip |= Axes.Y;
+            }
+
+            if (toFlip != Axes.None)
+            {
+                PerformFlipFromScaleHandles?.Invoke(toFlip);
+                return;
+            }
+
+            foreach (var (b, originalState) in objectsInScale)
+            {
+                UpdatePosition(b, GeometryUtils.GetScaledPosition(scale, actualOrigin, originalState.ScreenSpaceOriginPosition));
+
+                var currentScale = scale;
+                if (Precision.AlmostEquals(MathF.Abs(b.Rotation) % 180, 90))
+                    currentScale = new Vector2(scale.Y, scale.X);
+
+                switch (adjustAxis)
+                {
+                    case Axes.X:
+                        b.Width = MathF.Abs(originalState.Width * currentScale.X);
+                        break;
+
+                    case Axes.Y:
+                        b.Height = MathF.Abs(originalState.Height * currentScale.Y);
+                        break;
+
+                    case Axes.Both:
+                        b.Scale = originalState.Scale * currentScale;
+                        break;
+                }
+            }
+        }
+
+        public override void Commit()
+        {
+            if (objectsInScale == null)
+                throw new InvalidOperationException($"Cannot {nameof(Commit)} a scale operation without calling {nameof(Begin)} first!");
+
+            changeHandler?.EndChange();
+
+            objectsInScale = null;
+            defaultOrigin = null;
+        }
+
+        private struct OriginalDrawableState
+        {
+            public float Width { get; }
+            public float Height { get; }
+            public Vector2 Scale { get; }
+            public Vector2 ScreenSpaceOriginPosition { get; }
+
+            public OriginalDrawableState(Drawable drawable)
+            {
+                Width = drawable.Width;
+                Height = drawable.Height;
+                Scale = drawable.Scale;
+                ScreenSpaceOriginPosition = drawable.ToScreenSpace(drawable.OriginPosition);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index 5da0056787ba..51b95b7d3287 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Toolbar
 {
     public partial class ToolbarMusicButton : ToolbarOverlayToggleButton
     {
-        private Circle volumeBar;
+        private Box volumeBar;
 
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
@@ -37,7 +37,7 @@ private void load(NowPlayingOverlay music)
             StateContainer = music;
 
             Flow.Padding = new MarginPadding { Horizontal = Toolbar.HEIGHT / 4 };
-            Flow.Add(volumeDisplay = new Container
+            Flow.Add(volumeDisplay = new CircularContainer
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
@@ -47,12 +47,12 @@ private void load(NowPlayingOverlay music)
                 Masking = true,
                 Children = new[]
                 {
-                    new Circle
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.White.Opacity(0.25f),
                     },
-                    volumeBar = new Circle
+                    volumeBar = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Height = 0f,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 723c24597a43..d49c340ed4a4 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -3,11 +3,8 @@
 
 #nullable disable
 
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -24,8 +21,6 @@ public partial class ToolbarRulesetSelector : RulesetSelector
     {
         protected Drawable ModeButtonLine { get; private set; }
 
-        private readonly Dictionary<string, Sample> selectionSamples = new Dictionary<string, Sample>();
-
         public ToolbarRulesetSelector()
         {
             RelativeSizeAxes = Axes.Y;
@@ -33,7 +28,7 @@ public ToolbarRulesetSelector()
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
             AddRangeInternal(new[]
             {
@@ -59,9 +54,6 @@ private void load(AudioManager audio)
                     }
                 },
             });
-
-            foreach (var ruleset in Rulesets.AvailableRulesets)
-                selectionSamples[ruleset.ShortName] = audio.Samples.Get($"UI/ruleset-select-{ruleset.ShortName}");
         }
 
         protected override void LoadComplete()
@@ -88,10 +80,6 @@ private void moveLineToCurrent()
             if (SelectedTab != null)
             {
                 ModeButtonLine.MoveToX(SelectedTab.DrawPosition.X, !hasInitialPosition ? 0 : 500, Easing.OutElasticQuarter);
-
-                if (hasInitialPosition)
-                    selectionSamples[SelectedTab.Value.ShortName]?.Play();
-
                 hasInitialPosition = true;
             }
         }
@@ -121,7 +109,7 @@ protected override bool OnKeyDown(KeyDownEvent e)
 
                 RulesetInfo found = Rulesets.AvailableRulesets.ElementAtOrDefault(requested);
                 if (found != null)
-                    Current.Value = found;
+                    SelectItem(found);
                 return true;
             }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 3287ac6eaa04..0315bede645b 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
@@ -17,6 +19,8 @@ public partial class ToolbarRulesetTabButton : TabItem<RulesetInfo>
     {
         private readonly RulesetButton ruleset;
 
+        private Sample? selectSample;
+
         public ToolbarRulesetTabButton(RulesetInfo value)
             : base(value)
         {
@@ -34,10 +38,18 @@ public ToolbarRulesetTabButton(RulesetInfo value)
             ruleset.SetIcon(rInstance.CreateIcon());
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            selectSample = audio.Samples.Get($@"UI/ruleset-select-{Value.ShortName}");
+        }
+
         protected override void OnActivated() => ruleset.Active = true;
 
         protected override void OnDeactivated() => ruleset.Active = false;
 
+        protected override void OnActivatedByUser() => selectSample?.Play();
+
         private partial class RulesetButton : ToolbarButton
         {
             protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 0295ff467ae6..7744db5dd54c 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -40,10 +40,12 @@ protected override void PopIn()
 
         protected override void PopOut()
         {
-            base.PopOut();
-
             Waves.Hide();
-            this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InQuint);
+            this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InQuint)
+                // base call is responsible for stopping preview tracks.
+                // delay it until the fade has concluded to ensure that nothing inside the overlay has triggered
+                // another preview track playback in the meantime, leaving an "orphaned" preview playing.
+                .OnComplete(_ => base.PopOut());
         }
     }
 }
diff --git a/osu.Game/Performance/IHighPerformanceSessionManager.cs b/osu.Game/Performance/IHighPerformanceSessionManager.cs
index d3d1fda8fcbb..cc995e4942f1 100644
--- a/osu.Game/Performance/IHighPerformanceSessionManager.cs
+++ b/osu.Game/Performance/IHighPerformanceSessionManager.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Performance
     /// </summary>
     public interface IHighPerformanceSessionManager
     {
+        /// <summary>
+        /// Whether a high performance session is currently active.
+        /// </summary>
+        bool IsSessionActive { get; }
+
         /// <summary>
         /// Start a new high performance session.
         /// </summary>
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 00c90bd3176b..d37cfc28b9dc 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -107,18 +107,28 @@ public List<TimedDifficultyAttributes> CalculateTimed([NotNull] IEnumerable<Mod>
 
             var skills = CreateSkills(Beatmap, playableMods, clockRate);
             var progressiveBeatmap = new ProgressiveCalculationBeatmap(Beatmap);
+            var difficultyObjects = getDifficultyHitObjects().ToArray();
 
-            foreach (var hitObject in getDifficultyHitObjects())
+            foreach (var obj in difficultyObjects)
             {
-                progressiveBeatmap.HitObjects.Add(hitObject.BaseObject);
+                // Implementations expect the progressive beatmap to only contain top-level objects from the original beatmap.
+                // At the same time, we also need to consider the possibility DHOs may not be generated for any given object,
+                // so we'll add all remaining objects up to the current point in time to the progressive beatmap.
+                for (int i = progressiveBeatmap.HitObjects.Count; i < Beatmap.HitObjects.Count; i++)
+                {
+                    if (obj != difficultyObjects[^1] && Beatmap.HitObjects[i].StartTime > obj.BaseObject.StartTime)
+                        break;
+
+                    progressiveBeatmap.HitObjects.Add(Beatmap.HitObjects[i]);
+                }
 
                 foreach (var skill in skills)
                 {
                     cancellationToken.ThrowIfCancellationRequested();
-                    skill.Process(hitObject);
+                    skill.Process(obj);
                 }
 
-                attribs.Add(new TimedDifficultyAttributes(hitObject.EndTime * clockRate, CreateDifficultyAttributes(progressiveBeatmap, playableMods, skills, clockRate)));
+                attribs.Add(new TimedDifficultyAttributes(obj.EndTime * clockRate, CreateDifficultyAttributes(progressiveBeatmap, playableMods, skills, clockRate)));
             }
 
             return attribs;
@@ -320,6 +330,8 @@ public BeatmapDifficulty Difficulty
             }
 
             public List<BreakPeriod> Breaks => baseBeatmap.Breaks;
+            public List<string> UnhandledEventLines => baseBeatmap.UnhandledEventLines;
+
             public double TotalBreakTime => baseBeatmap.TotalBreakTime;
             public IEnumerable<BeatmapStatistic> GetStatistics() => baseBeatmap.GetStatistics();
             public double GetMostCommonBeatLength() => baseBeatmap.GetMostCommonBeatLength();
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 7d3c7d0b2f84..a9681e13bafa 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -28,6 +28,8 @@ public class BeatmapVerifier : IBeatmapVerifier
             new CheckTooShortAudioFiles(),
             new CheckAudioInVideo(),
             new CheckDelayedHitsounds(),
+            new CheckSongFormat(),
+            new CheckHitsoundsFormat(),
 
             // Files
             new CheckZeroByteFiles(),
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckHitsoundsFormat.cs b/osu.Game/Rulesets/Edit/Checks/CheckHitsoundsFormat.cs
new file mode 100644
index 000000000000..9b6a86135824
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckHitsoundsFormat.cs
@@ -0,0 +1,86 @@
+// 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.Generic;
+using System.IO;
+using ManagedBass;
+using osu.Framework.Audio.Callbacks;
+using osu.Game.Beatmaps;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckHitsoundsFormat : ICheck
+    {
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Checks for hitsound formats.");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateFormatUnsupported(this),
+            new IssueTemplateIncorrectFormat(this),
+        };
+
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
+        {
+            var beatmapSet = context.Beatmap.BeatmapInfo.BeatmapSet;
+            var audioFile = beatmapSet?.GetFile(context.Beatmap.Metadata.AudioFile);
+
+            if (beatmapSet == null) yield break;
+
+            foreach (var file in beatmapSet.Files)
+            {
+                if (audioFile != null && ReferenceEquals(file.File, audioFile.File)) continue;
+
+                using (Stream data = context.WorkingBeatmap.GetStream(file.File.GetStoragePath()))
+                {
+                    if (data == null)
+                        continue;
+
+                    if (!AudioCheckUtils.HasAudioExtension(file.Filename) || !probablyHasAudioData(data))
+                        continue;
+
+                    var fileCallbacks = new FileCallbacks(new DataStreamFileProcedures(data));
+                    int decodeStream = Bass.CreateStream(StreamSystem.NoBuffer, BassFlags.Decode, fileCallbacks.Callbacks, fileCallbacks.Handle);
+
+                    // If the format is not supported by BASS
+                    if (decodeStream == 0)
+                    {
+                        yield return new IssueTemplateFormatUnsupported(this).Create(file.Filename);
+
+                        continue;
+                    }
+
+                    var audioInfo = Bass.ChannelGetInfo(decodeStream);
+
+                    if ((audioInfo.ChannelType & ChannelType.Wave) == 0 && audioInfo.ChannelType != ChannelType.OGG)
+                        yield return new IssueTemplateIncorrectFormat(this).Create(file.Filename);
+
+                    Bass.StreamFree(decodeStream);
+                }
+            }
+        }
+
+        private bool probablyHasAudioData(Stream data) => data.Length > 100;
+
+        public class IssueTemplateFormatUnsupported : IssueTemplate
+        {
+            public IssueTemplateFormatUnsupported(ICheck check)
+                : base(check, IssueType.Problem, "\"{0}\" may be corrupt or using a unsupported audio format. Use wav or ogg for hitsounds.")
+            {
+            }
+
+            public Issue Create(string file) => new Issue(this, file);
+        }
+
+        public class IssueTemplateIncorrectFormat : IssueTemplate
+        {
+            public IssueTemplateIncorrectFormat(ICheck check)
+                : base(check, IssueType.Problem, "\"{0}\" is using a incorrect format. Use wav or ogg for hitsounds.")
+            {
+            }
+
+            public Issue Create(string file) => new Issue(this, file);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckSongFormat.cs b/osu.Game/Rulesets/Edit/Checks/CheckSongFormat.cs
new file mode 100644
index 000000000000..dd01fe110abc
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckSongFormat.cs
@@ -0,0 +1,83 @@
+// 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.Generic;
+using System.IO;
+using System.Linq;
+using ManagedBass;
+using osu.Framework.Audio.Callbacks;
+using osu.Game.Beatmaps;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckSongFormat : ICheck
+    {
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Checks for song formats.");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateFormatUnsupported(this),
+            new IssueTemplateIncorrectFormat(this),
+        };
+
+        private IEnumerable<ChannelType> allowedFormats => new[]
+        {
+            ChannelType.MP3,
+            ChannelType.OGG,
+        };
+
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
+        {
+            var beatmapSet = context.Beatmap.BeatmapInfo.BeatmapSet;
+            var audioFile = beatmapSet?.GetFile(context.Beatmap.Metadata.AudioFile);
+
+            if (beatmapSet == null) yield break;
+            if (audioFile == null) yield break;
+
+            using (Stream data = context.WorkingBeatmap.GetStream(audioFile.File.GetStoragePath()))
+            {
+                if (data == null || data.Length <= 0) yield break;
+
+                var fileCallbacks = new FileCallbacks(new DataStreamFileProcedures(data));
+                int decodeStream = Bass.CreateStream(StreamSystem.NoBuffer, BassFlags.Decode, fileCallbacks.Callbacks, fileCallbacks.Handle);
+
+                // If the format is not supported by BASS
+                if (decodeStream == 0)
+                {
+                    yield return new IssueTemplateFormatUnsupported(this).Create(audioFile.Filename);
+
+                    yield break;
+                }
+
+                var audioInfo = Bass.ChannelGetInfo(decodeStream);
+
+                if (!allowedFormats.Contains(audioInfo.ChannelType))
+                    yield return new IssueTemplateIncorrectFormat(this).Create(audioFile.Filename);
+
+                Bass.StreamFree(decodeStream);
+            }
+        }
+
+        public class IssueTemplateFormatUnsupported : IssueTemplate
+        {
+            public IssueTemplateFormatUnsupported(ICheck check)
+                : base(check, IssueType.Problem, "\"{0}\" may be corrupt or using a unsupported audio format. Use mp3 or ogg for the song's audio.")
+            {
+            }
+
+            public Issue Create(string file) => new Issue(this, file);
+        }
+
+        public class IssueTemplateIncorrectFormat : IssueTemplate
+        {
+            public IssueTemplateIncorrectFormat(ICheck check)
+                : base(check, IssueType.Problem, "\"{0}\" is using a incorrect format. Use mp3 or ogg for the song's audio.")
+            {
+            }
+
+            public Issue Create(string file) => new Issue(this, file);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs b/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
index 32a3aa5ad9cf..3f85926e04b2 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
@@ -13,14 +13,12 @@ namespace osu.Game.Rulesets.Edit.Checks
     public class CheckTooShortAudioFiles : ICheck
     {
         private const int ms_threshold = 25;
-        private const int min_bytes_threshold = 100;
 
         public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Too short audio files");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
             new IssueTemplateTooShort(this),
-            new IssueTemplateBadFormat(this)
         };
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
@@ -39,15 +37,7 @@ public IEnumerable<Issue> Run(BeatmapVerifierContext context)
                         var fileCallbacks = new FileCallbacks(new DataStreamFileProcedures(data));
                         int decodeStream = Bass.CreateStream(StreamSystem.NoBuffer, BassFlags.Decode | BassFlags.Prescan, fileCallbacks.Callbacks, fileCallbacks.Handle);
 
-                        if (decodeStream == 0)
-                        {
-                            // If the file is not likely to be properly parsed by Bass, we don't produce Error issues about it.
-                            // Image files and audio files devoid of audio data both fail, for example, but neither would be issues in this check.
-                            if (AudioCheckUtils.HasAudioExtension(file.Filename) && probablyHasAudioData(data))
-                                yield return new IssueTemplateBadFormat(this).Create(file.Filename);
-
-                            continue;
-                        }
+                        if (decodeStream == 0) continue;
 
                         long length = Bass.ChannelGetLength(decodeStream);
                         double ms = Bass.ChannelBytes2Seconds(decodeStream, length) * 1000;
@@ -60,8 +50,6 @@ public IEnumerable<Issue> Run(BeatmapVerifierContext context)
             }
         }
 
-        private bool probablyHasAudioData(Stream data) => data.Length > min_bytes_threshold;
-
         public class IssueTemplateTooShort : IssueTemplate
         {
             public IssueTemplateTooShort(ICheck check)
@@ -71,15 +59,5 @@ public IssueTemplateTooShort(ICheck check)
 
             public Issue Create(string filename, double ms) => new Issue(this, filename, ms, ms_threshold);
         }
-
-        public class IssueTemplateBadFormat : IssueTemplate
-        {
-            public IssueTemplateBadFormat(ICheck check)
-                : base(check, IssueType.Error, "Could not check whether \"{0}\" is too short (code \"{1}\").")
-            {
-            }
-
-            public Issue Create(string filename) => new Issue(this, filename, Bass.LastError);
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index 62ad2ce7e906..b9850a94a36e 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -63,6 +63,7 @@ public abstract partial class ComposerDistanceSnapProvider : Component, IDistanc
         public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
 
         private bool distanceSnapMomentary;
+        private TernaryState? distanceSnapStateBeforeMomentaryToggle;
 
         private EditorToolboxGroup? toolboxGroup;
 
@@ -213,10 +214,19 @@ private void handleToggleViaKey(KeyboardEvent key)
         {
             bool altPressed = key.AltPressed;
 
-            if (altPressed != distanceSnapMomentary)
+            if (altPressed && !distanceSnapMomentary)
             {
-                distanceSnapMomentary = altPressed;
+                distanceSnapStateBeforeMomentaryToggle = DistanceSnapToggle.Value;
                 DistanceSnapToggle.Value = DistanceSnapToggle.Value == TernaryState.False ? TernaryState.True : TernaryState.False;
+                distanceSnapMomentary = true;
+            }
+
+            if (!altPressed && distanceSnapMomentary)
+            {
+                Debug.Assert(distanceSnapStateBeforeMomentaryToggle != null);
+                DistanceSnapToggle.Value = distanceSnapStateBeforeMomentaryToggle.Value;
+                distanceSnapStateBeforeMomentaryToggle = null;
+                distanceSnapMomentary = false;
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 50e6393895c4..4d92a08bed55 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -212,6 +212,14 @@ private void load(OsuConfigManager config)
                                       .Select(t => new RadioButton(t.Name, () => toolSelected(t), t.CreateIcon))
                                       .ToList();
 
+            foreach (var item in toolboxCollection.Items)
+            {
+                item.Selected.DisabledChanged += isDisabled =>
+                {
+                    item.TooltipText = isDisabled ? "Add at least one timing point first!" : string.Empty;
+                };
+            }
+
             TernaryStates = CreateTernaryButtons().ToArray();
             togglesCollection.AddRange(TernaryStates.Select(b => new DrawableTernaryButton(b)));
 
@@ -244,6 +252,14 @@ protected override void LoadComplete()
                 if (!timing.NewValue)
                     setSelectTool();
             });
+
+            EditorBeatmap.HasTiming.BindValueChanged(hasTiming =>
+            {
+                foreach (var item in toolboxCollection.Items)
+                {
+                    item.Selected.Disabled = !hasTiming.NewValue;
+                }
+            }, true);
         }
 
         protected override void Update()
diff --git a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
index dd2ad2cbfa40..c374fe315dcf 100644
--- a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
+++ b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
@@ -1,7 +1,10 @@
 // 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.Generic;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 
@@ -18,11 +21,12 @@ public interface IRulesetFilterCriteria
         /// in addition to the ones mandated by song select.
         /// </summary>
         /// <param name="beatmapInfo">The beatmap to test the criteria against.</param>
+        /// <param name="criteria">The filter criteria.</param>
         /// <returns>
         /// <c>true</c> if the beatmap matches the ruleset-specific custom filtering criteria,
         /// <c>false</c> otherwise.
         /// </returns>
-        bool Matches(BeatmapInfo beatmapInfo);
+        bool Matches(BeatmapInfo beatmapInfo, FilterCriteria criteria);
 
         /// <summary>
         /// Attempts to parse a single custom keyword criterion, given by the user via the song select search box.
@@ -51,5 +55,12 @@ public interface IRulesetFilterCriteria
         /// while ignored criteria are included in <see cref="FilterCriteria.SearchText"/>.
         /// </returns>
         bool TryParseCustomKeywordCriteria(string key, Operator op, string value);
+
+        /// <summary>
+        /// Whether to reapply the filter as a result of the given change in applied mods.
+        /// </summary>
+        /// <param name="mods">The change in mods.</param>
+        /// <returns>Whether the filter should be re-applied.</returns>
+        bool FilterMayChangeFromMods(ValueChangedEvent<IReadOnlyList<Mod>> mods);
     }
 }
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index 18d86f477a99..e116f7a1a3fc 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -1,7 +1,9 @@
 // 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.Generic;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets
@@ -18,8 +20,7 @@ public interface ILegacyRuleset
         /// <summary>
         /// Retrieves the number of mania keys required to play the beatmap.
         /// </summary>
-        /// <returns></returns>
-        int GetKeyCount(IBeatmapInfo beatmapInfo) => 0;
+        int GetKeyCount(IBeatmapInfo beatmapInfo, IReadOnlyList<Mod>? mods = null) => 0;
 
         ILegacyScoreSimulator CreateLegacyScoreSimulator();
     }
diff --git a/osu.Game/Rulesets/Mods/DifficultyBindable.cs b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
index a207048882ba..5f6fd21860ca 100644
--- a/osu.Game/Rulesets/Mods/DifficultyBindable.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
@@ -48,7 +48,7 @@ public float MinValue
             }
         }
 
-        private float maxValue;
+        private float maxValue = 10; // matches default max value of `CurrentNumber`
 
         public float MaxValue
         {
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index 7c88a8a5881b..0c00eb6ae088 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -36,6 +36,8 @@ public void ApplyToHUD(HUDOverlay overlay)
         {
             overlay.ShowHud.Value = false;
             overlay.ShowHud.Disabled = true;
+
+            overlay.PlayfieldSkinLayer.Hide();
         }
 
         public void ApplyToPlayer(Player player)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index de052192126e..3ce6cc3cef6e 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -15,7 +15,6 @@
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Lists;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -632,7 +631,7 @@ public virtual void StopAllSamples()
 
         #endregion
 
-        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => false;
+        public override bool UpdateSubTreeMasking() => false;
 
         protected override void UpdateAfterChildren()
         {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 283a59b7edec..66b3033f9015 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -347,7 +347,7 @@ private IEnumerable<ArraySegment<PathControlPoint>> convertPoints(PathType type,
             // Edge-case rules (to match stable).
             if (type == PathType.PERFECT_CURVE)
             {
-                int endPointLength = endPoint is null ? 0 : 1;
+                int endPointLength = endPoint == null ? 0 : 1;
 
                 if (vertices.Length + endPointLength != 3)
                     type = PathType.BEZIER;
diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index 1f8e63b26952..32245e90802b 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -77,7 +77,7 @@ public PathControlPoint(Vector2 position, PathType? type = null)
 
         public bool Equals(PathControlPoint other) => Position == other?.Position && Type == other.Type;
 
-        public override string ToString() => type is null
+        public override string ToString() => type == null
             ? $"Position={Position}"
             : $"Position={Position}, Type={type}";
     }
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index f33a07f082d1..e8e769e3fa31 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -42,6 +42,17 @@ public class SliderPath
         private readonly List<double> cumulativeLength = new List<double>();
         private readonly Cached pathCache = new Cached();
 
+        /// <summary>
+        /// Any additional length of the path which was optimised out during piecewise approximation, but should still be considered as part of <see cref="calculatedLength"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is a hack for Catmull paths.
+        /// </remarks>
+        private double optimisedLength;
+
+        /// <summary>
+        /// The final calculated length of the path.
+        /// </summary>
         private double calculatedLength;
 
         private readonly List<int> segmentEnds = new List<int>();
@@ -123,6 +134,24 @@ public double CalculatedDistance
             }
         }
 
+        private bool optimiseCatmull;
+
+        /// <summary>
+        /// Whether to optimise Catmull path segments, usually resulting in removing bulbs around stacked knots.
+        /// </summary>
+        /// <remarks>
+        /// This changes the path shape and should therefore not be used.
+        /// </remarks>
+        public bool OptimiseCatmull
+        {
+            get => optimiseCatmull;
+            set
+            {
+                optimiseCatmull = value;
+                invalidate();
+            }
+        }
+
         /// <summary>
         /// Computes the slider path until a given progress that ranges from 0 (beginning of the slider)
         /// to 1 (end of the slider) and stores the generated path in the given list.
@@ -244,6 +273,7 @@ private void calculatePath()
         {
             calculatedPath.Clear();
             segmentEnds.Clear();
+            optimisedLength = 0;
 
             if (ControlPoints.Count == 0)
                 return;
@@ -269,6 +299,7 @@ private void calculatePath()
                 else if (segmentVertices.Length > 1)
                 {
                     List<Vector2> subPath = calculateSubPath(segmentVertices, segmentType);
+
                     // Skip the first vertex if it is the same as the last vertex from the previous segment
                     bool skipFirst = calculatedPath.Count > 0 && subPath.Count > 0 && calculatedPath.Last() == subPath[0];
 
@@ -295,6 +326,7 @@ private List<Vector2> calculateSubPath(ReadOnlySpan<Vector2> subControlPoints, P
                     return PathApproximator.LinearToPiecewiseLinear(subControlPoints);
 
                 case SplineType.PerfectCurve:
+                {
                     if (subControlPoints.Length != 3)
                         break;
 
@@ -305,9 +337,58 @@ private List<Vector2> calculateSubPath(ReadOnlySpan<Vector2> subControlPoints, P
                         break;
 
                     return subPath;
+                }
 
                 case SplineType.Catmull:
-                    return PathApproximator.CatmullToPiecewiseLinear(subControlPoints);
+                {
+                    List<Vector2> subPath = PathApproximator.CatmullToPiecewiseLinear(subControlPoints);
+
+                    if (!OptimiseCatmull)
+                        return subPath;
+
+                    // At draw time, osu!stable optimises paths by only keeping piecewise segments that are 6px apart.
+                    // For the most part we don't care about this optimisation, and its additional heuristics are hard to reproduce in every implementation.
+                    //
+                    // However, it matters for Catmull paths which form "bulbs" around sequential knots with identical positions,
+                    // so we'll apply a very basic form of the optimisation here and return a length representing the optimised portion.
+                    // The returned length is important so that the optimisation doesn't cause the path to get extended to match the value of ExpectedDistance.
+
+                    List<Vector2> optimisedPath = new List<Vector2>(subPath.Count);
+
+                    Vector2? lastStart = null;
+                    double lengthRemovedSinceStart = 0;
+
+                    for (int i = 0; i < subPath.Count; i++)
+                    {
+                        if (lastStart == null)
+                        {
+                            optimisedPath.Add(subPath[i]);
+                            lastStart = subPath[i];
+                            continue;
+                        }
+
+                        Debug.Assert(i > 0);
+
+                        double distFromStart = Vector2.Distance(lastStart.Value, subPath[i]);
+                        lengthRemovedSinceStart += Vector2.Distance(subPath[i - 1], subPath[i]);
+
+                        // See PathApproximator.catmull_detail.
+                        const int catmull_detail = 50;
+                        const int catmull_segment_length = catmull_detail * 2;
+
+                        // Either 6px from the start, the last vertex at every knot, or the end of the path.
+                        if (distFromStart > 6 || (i + 1) % catmull_segment_length == 0 || i == subPath.Count - 1)
+                        {
+                            optimisedPath.Add(subPath[i]);
+                            optimisedLength += lengthRemovedSinceStart - distFromStart;
+
+                            lastStart = null;
+                            lengthRemovedSinceStart = 0;
+                        }
+                    }
+
+                    return optimisedPath;
+                }
             }
 
             return PathApproximator.BSplineToPiecewiseLinear(subControlPoints, type.Degree ?? subControlPoints.Length);
@@ -315,7 +396,7 @@ private List<Vector2> calculateSubPath(ReadOnlySpan<Vector2> subControlPoints, P
 
         private void calculateLength()
         {
-            calculatedLength = 0;
+            calculatedLength = optimisedLength;
             cumulativeLength.Clear();
             cumulativeLength.Add(0);
 
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 29b34ae4f0cd..c03d3646da55 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -29,7 +29,7 @@ public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOff
         {
             var controlPoints = sliderPath.ControlPoints;
 
-            var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.LINEAR && p.Type is null).ToList();
+            var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.LINEAR && p.Type == null).ToList();
 
             // Inherited points after a linear point, as well as the first control point if it inherited,
             // should be treated as linear points, so their types are temporarily changed to linear.
@@ -53,7 +53,7 @@ public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOff
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate middle perfect curve control points at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PERFECT_CURVE && controlPoints[^2].Type is null && segmentEnds.Any())
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PERFECT_CURVE && controlPoints[^2].Type == null && segmentEnds.Any())
             {
                 double lastSegmentStart = segmentEnds.Length > 1 ? segmentEnds[^2] : 0;
                 double lastSegmentEnd = segmentEnds[^1];
diff --git a/osu.Game/Rulesets/RealmRulesetStore.cs b/osu.Game/Rulesets/RealmRulesetStore.cs
index ba6f4583d131..2455a9a73fde 100644
--- a/osu.Game/Rulesets/RealmRulesetStore.cs
+++ b/osu.Game/Rulesets/RealmRulesetStore.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -13,17 +16,20 @@ namespace osu.Game.Rulesets
 {
     public class RealmRulesetStore : RulesetStore
     {
+        private readonly RealmAccess realmAccess;
         public override IEnumerable<RulesetInfo> AvailableRulesets => availableRulesets;
 
         private readonly List<RulesetInfo> availableRulesets = new List<RulesetInfo>();
 
-        public RealmRulesetStore(RealmAccess realm, Storage? storage = null)
+        public RealmRulesetStore(RealmAccess realmAccess, Storage? storage = null)
             : base(storage)
         {
-            prepareDetachedRulesets(realm);
+            this.realmAccess = realmAccess;
+            prepareDetachedRulesets();
+            informUserAboutBrokenRulesets();
         }
 
-        private void prepareDetachedRulesets(RealmAccess realmAccess)
+        private void prepareDetachedRulesets()
         {
             realmAccess.Write(realm =>
             {
@@ -143,5 +149,48 @@ private void testRulesetCompatibility(RulesetInfo rulesetInfo)
 
             instance.CreateBeatmapProcessor(converter.Convert());
         }
+
+        private void informUserAboutBrokenRulesets()
+        {
+            if (RulesetStorage == null)
+                return;
+
+            foreach (string brokenRulesetDll in RulesetStorage.GetFiles(@".", @"*.dll.broken"))
+            {
+                Logger.Log($"Ruleset '{Path.GetFileNameWithoutExtension(brokenRulesetDll)}' has been disabled due to causing a crash.\n\n"
+                           + "Please update the ruleset or report the issue to the developers of the ruleset if no updates are available.", level: LogLevel.Important);
+            }
+        }
+
+        internal void TryDisableCustomRulesetsCausing(Exception exception)
+        {
+            try
+            {
+                var stackTrace = new StackTrace(exception);
+
+                foreach (var frame in stackTrace.GetFrames())
+                {
+                    var declaringAssembly = frame.GetMethod()?.DeclaringType?.Assembly;
+                    if (declaringAssembly == null)
+                        continue;
+
+                    if (UserRulesetAssemblies.Contains(declaringAssembly))
+                    {
+                        string sourceLocation = declaringAssembly.Location;
+                        string destinationLocation = Path.ChangeExtension(sourceLocation, @".dll.broken");
+
+                        if (File.Exists(sourceLocation))
+                        {
+                            Logger.Log($"Unhandled exception traced back to custom ruleset {Path.GetFileNameWithoutExtension(sourceLocation)}. Marking as broken.");
+                            File.Move(sourceLocation, destinationLocation);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Log($"Attempt to trace back crash to custom ruleset failed: {ex}");
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index ac36ee649483..f33d42a53eec 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -18,6 +18,8 @@ public abstract class RulesetStore : IDisposable, IRulesetStore
         private const string ruleset_library_prefix = @"osu.Game.Rulesets";
 
         protected readonly Dictionary<Assembly, Type> LoadedAssemblies = new Dictionary<Assembly, Type>();
+        protected readonly HashSet<Assembly> UserRulesetAssemblies = new HashSet<Assembly>();
+        protected readonly Storage? RulesetStorage;
 
         /// <summary>
         /// All available rulesets.
@@ -41,9 +43,9 @@ protected RulesetStore(Storage? storage = null)
             // to load as unable to locate the game core assembly.
             AppDomain.CurrentDomain.AssemblyResolve += resolveRulesetDependencyAssembly;
 
-            var rulesetStorage = storage?.GetStorageForDirectory(@"rulesets");
-            if (rulesetStorage != null)
-                loadUserRulesets(rulesetStorage);
+            RulesetStorage = storage?.GetStorageForDirectory(@"rulesets");
+            if (RulesetStorage != null)
+                loadUserRulesets(RulesetStorage);
         }
 
         /// <summary>
@@ -105,7 +107,11 @@ private void loadUserRulesets(Storage rulesetStorage)
             var rulesets = rulesetStorage.GetFiles(@".", @$"{ruleset_library_prefix}.*.dll");
 
             foreach (string? ruleset in rulesets.Where(f => !f.Contains(@"Tests")))
-                loadRulesetFromFile(rulesetStorage.GetFullPath(ruleset));
+            {
+                var assembly = loadRulesetFromFile(rulesetStorage.GetFullPath(ruleset));
+                if (assembly != null)
+                    UserRulesetAssemblies.Add(assembly);
+            }
         }
 
         private void loadFromDisk()
@@ -126,21 +132,25 @@ private void loadFromDisk()
             }
         }
 
-        private void loadRulesetFromFile(string file)
+        private Assembly? loadRulesetFromFile(string file)
         {
             string filename = Path.GetFileNameWithoutExtension(file);
 
             if (LoadedAssemblies.Values.Any(t => Path.GetFileNameWithoutExtension(t.Assembly.Location) == filename))
-                return;
+                return null;
 
             try
             {
-                addRuleset(Assembly.LoadFrom(file));
+                var assembly = Assembly.LoadFrom(file);
+                addRuleset(assembly);
+                return assembly;
             }
             catch (Exception e)
             {
                 LogFailedLoad(filename, e);
             }
+
+            return null;
         }
 
         private void addRuleset(Assembly assembly)
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
index 7d6906945597..f8b8567305bb 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -18,6 +18,16 @@ public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
         /// </summary>
         public IRulesetInfo SourceRuleset { get; set; } = new RulesetInfo();
 
+        /// <summary>
+        /// The beatmap drain rate.
+        /// </summary>
+        public float DrainRate { get; set; }
+
+        /// <summary>
+        /// The beatmap approach rate.
+        /// </summary>
+        public float ApproachRate { get; set; }
+
         /// <summary>
         /// The beatmap circle size.
         /// </summary>
@@ -41,8 +51,6 @@ public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
         /// </summary>
         public int TotalObjectCount { get; set; }
 
-        float IBeatmapDifficultyInfo.DrainRate => 0;
-        float IBeatmapDifficultyInfo.ApproachRate => 0;
         double IBeatmapDifficultyInfo.SliderMultiplier => 0;
         double IBeatmapDifficultyInfo.SliderTickRate => 0;
 
@@ -51,6 +59,8 @@ public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
         public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => new LegacyBeatmapConversionDifficultyInfo
         {
             SourceRuleset = beatmap.BeatmapInfo.Ruleset,
+            DrainRate = beatmap.Difficulty.DrainRate,
+            ApproachRate = beatmap.Difficulty.ApproachRate,
             CircleSize = beatmap.Difficulty.CircleSize,
             OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
             EndTimeObjectCount = beatmap.HitObjects.Count(h => h is IHasDuration),
@@ -60,6 +70,8 @@ public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
         public static LegacyBeatmapConversionDifficultyInfo FromBeatmapInfo(IBeatmapInfo beatmapInfo) => new LegacyBeatmapConversionDifficultyInfo
         {
             SourceRuleset = beatmapInfo.Ruleset,
+            DrainRate = beatmapInfo.Difficulty.DrainRate,
+            ApproachRate = beatmapInfo.Difficulty.ApproachRate,
             CircleSize = beatmapInfo.Difficulty.CircleSize,
             OverallDifficulty = beatmapInfo.Difficulty.OverallDifficulty,
             EndTimeObjectCount = beatmapInfo.EndTimeObjectCount,
diff --git a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
index 7cee5ebecf09..25c5b3643af6 100644
--- a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
@@ -129,6 +129,13 @@ protected override double ComputeDrainRate()
                     OnIterationFail?.Invoke($"FAILED drop {testDrop}: recovery too low ({recovery} < {hpRecoveryAvailable})");
                 }
 
+                if (!fail && double.IsInfinity(HpMultiplierNormal))
+                {
+                    OnIterationSuccess?.Invoke("Drain computation algorithm diverged to infinity. PASSING with zero drop, resetting HP multiplier to 1.");
+                    HpMultiplierNormal = 1;
+                    return 0;
+                }
+
                 if (!fail)
                 {
                     OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 9d12daad049e..70d7f0fe3767 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -56,6 +56,14 @@ public partial class ScoreProcessor : JudgementProcessor
         /// </summary>
         public readonly BindableLong TotalScore = new BindableLong { MinValue = 0 };
 
+        /// <summary>
+        /// The total number of points awarded for the score without including mod multipliers.
+        /// </summary>
+        /// <remarks>
+        /// The purpose of this property is to enable future lossless rebalances of mod multipliers.
+        /// </remarks>
+        public readonly BindableLong TotalScoreWithoutMods = new BindableLong { MinValue = 0 };
+
         /// <summary>
         /// The current accuracy.
         /// </summary>
@@ -363,7 +371,8 @@ private void updateScore()
             double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
             double accuracyProcess = maximumAccuracyJudgementCount > 0 ? (double)currentAccuracyJudgementCount / maximumAccuracyJudgementCount : 1;
 
-            TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion) * scoreMultiplier);
+            TotalScoreWithoutMods.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion));
+            TotalScore.Value = (long)Math.Round(TotalScoreWithoutMods.Value * scoreMultiplier);
         }
 
         private void updateRank()
@@ -446,6 +455,7 @@ public virtual void PopulateScore(ScoreInfo score)
                 score.MaximumStatistics[result] = MaximumResultCounts.GetValueOrDefault(result);
 
             // Populate total score after everything else.
+            score.TotalScoreWithoutMods = TotalScoreWithoutMods.Value;
             score.TotalScore = TotalScore.Value;
         }
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index a422761800e9..a28b2716cb7b 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -529,7 +529,7 @@ internal DrawableRuleset(Ruleset ruleset)
         public ResumeOverlay ResumeOverlay { get; protected set; }
 
         /// <summary>
-        /// Whether the <see cref="ResumeOverlay"/> should be used to return the user's cursor position to its previous location after a pause.
+        /// Whether a <see cref="ResumeOverlay"/> should be displayed on resuming after a pause.
         /// </summary>
         /// <remarks>
         /// Defaults to <c>true</c>.
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index b49924762e8e..c4feb249f420 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -119,7 +119,7 @@ public override bool UpdateSubTree()
                     break;
 
                 base.UpdateSubTree();
-                UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
+                UpdateSubTreeMasking();
             } while (state == PlaybackState.RequiresCatchUp && stopwatch.ElapsedMilliseconds < max_catchup_milliseconds);
 
             return true;
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index d1776c5c0b02..5d9fafd60ce9 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -177,7 +177,7 @@ private void updateMod(IMod value)
             modAcronym.Text = value.Acronym;
             modIcon.Icon = value.Icon ?? FontAwesome.Solid.Question;
 
-            if (value.Icon is null)
+            if (value.Icon == null)
             {
                 modIcon.FadeOut();
                 modAcronym.FadeIn();
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 4e72291b9c9e..7841e65935da 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -136,7 +136,7 @@ public override void Add(HitObjectLifetimeEntry entry)
             // Scroll info is not available until loaded.
             // The lifetime of all entries will be updated in the first Update.
             if (IsLoaded)
-                setComputedLifetimeStart(entry);
+                setComputedLifetime(entry);
 
             base.Add(entry);
         }
@@ -171,7 +171,7 @@ protected override void Update()
             layoutComputed.Clear();
 
             foreach (var entry in Entries)
-                setComputedLifetimeStart(entry);
+                setComputedLifetime(entry);
 
             algorithm.Value.Reset();
 
@@ -234,12 +234,20 @@ private double computeDisplayStartTime(HitObjectLifetimeEntry entry)
             return algorithm.Value.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
-        private void setComputedLifetimeStart(HitObjectLifetimeEntry entry)
+        private void setComputedLifetime(HitObjectLifetimeEntry entry)
         {
             double computedStartTime = computeDisplayStartTime(entry);
 
             // always load the hitobject before its first judgement offset
             entry.LifetimeStart = Math.Min(entry.HitObject.StartTime - entry.HitObject.MaximumJudgementOffset, computedStartTime);
+
+            // This is likely not entirely correct, but sets a sane expectation of the ending lifetime.
+            // A more correct lifetime will be overwritten after a DrawableHitObject is assigned via DrawableHitObject.updateState.
+            //
+            // It is required that we set a lifetime end here to ensure that in scenarios like loading a Player instance to a seeked
+            // location in a beatmap doesn't churn every hit object into a DrawableHitObject. Even in a pooled scenario, the overhead
+            // of this can be quite crippling.
+            entry.LifetimeEnd = entry.HitObject.GetEndTime() + timeRange.Value;
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject, double? parentHitObjectStartTime = null)
@@ -261,7 +269,7 @@ private void updateLayoutRecursive(DrawableHitObject hitObject, double? parentHi
 
                 // Nested hitobjects don't need to scroll, but they do need accurate positions and start lifetime
                 updatePosition(obj, hitObject.HitObject.StartTime, parentHitObjectStartTime);
-                setComputedLifetimeStart(obj.Entry);
+                setComputedLifetime(obj.Entry);
             }
         }
 
diff --git a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
index afdcef1d211e..c99f10441827 100644
--- a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
+++ b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
@@ -38,6 +39,16 @@ public class LegacyReplaySoloScoreInfo
         [JsonProperty("client_version")]
         public string ClientVersion = string.Empty;
 
+        [JsonProperty("rank")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public ScoreRank? Rank;
+
+        [JsonProperty("user_id")]
+        public int UserID = -1;
+
+        [JsonProperty("total_score_without_mods")]
+        public long? TotalScoreWithoutMods { get; set; }
+
         public static LegacyReplaySoloScoreInfo FromScore(ScoreInfo score) => new LegacyReplaySoloScoreInfo
         {
             OnlineID = score.OnlineID,
@@ -45,6 +56,9 @@ public class LegacyReplaySoloScoreInfo
             Statistics = score.Statistics.Where(kvp => kvp.Value != 0).ToDictionary(),
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(),
             ClientVersion = score.ClientVersion,
+            Rank = score.Rank,
+            UserID = score.User.OnlineID,
+            TotalScoreWithoutMods = score.TotalScoreWithoutMods > 0 ? score.TotalScoreWithoutMods : null,
         };
     }
 }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 65e2c026550b..4c709aa6455c 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -40,6 +40,7 @@ public Score Parse(Stream stream)
             };
 
             WorkingBeatmap workingBeatmap;
+            ScoreRank? decodedRank = null;
 
             using (SerializationReader sr = new SerializationReader(stream))
             {
@@ -129,6 +130,14 @@ public Score Parse(Stream stream)
                         score.ScoreInfo.MaximumStatistics = readScore.MaximumStatistics;
                         score.ScoreInfo.Mods = readScore.Mods.Select(m => m.ToMod(currentRuleset)).ToArray();
                         score.ScoreInfo.ClientVersion = readScore.ClientVersion;
+                        decodedRank = readScore.Rank;
+                        if (readScore.UserID > 1)
+                            score.ScoreInfo.RealmUser.OnlineID = readScore.UserID;
+
+                        if (readScore.TotalScoreWithoutMods is long totalScoreWithoutMods)
+                            score.ScoreInfo.TotalScoreWithoutMods = totalScoreWithoutMods;
+                        else
+                            PopulateTotalScoreWithoutMods(score.ScoreInfo);
                     });
                 }
             }
@@ -140,6 +149,9 @@ public Score Parse(Stream stream)
 
             StandardisedScoreMigrationTools.UpdateFromLegacy(score.ScoreInfo, workingBeatmap);
 
+            if (decodedRank != null)
+                score.ScoreInfo.Rank = decodedRank.Value;
+
             // before returning for database import, we must restore the database-sourced BeatmapInfo.
             // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
             score.ScoreInfo.BeatmapInfo = workingBeatmap.BeatmapInfo;
@@ -237,6 +249,16 @@ public static void PopulateMaximumStatistics(ScoreInfo score, WorkingBeatmap wor
 #pragma warning restore CS0618
         }
 
+        public static void PopulateTotalScoreWithoutMods(ScoreInfo score)
+        {
+            double modMultiplier = 1;
+
+            foreach (var mod in score.Mods)
+                modMultiplier *= mod.ScoreMultiplier;
+
+            score.TotalScoreWithoutMods = (long)Math.Round(score.TotalScore / modMultiplier);
+        }
+
         private void readLegacyReplay(Replay replay, StreamReader reader)
         {
             float lastTime = beatmapOffset;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 768c28cc38b6..69c53af16f56 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -103,6 +103,14 @@ protected override void Populate(ScoreInfo model, ArchiveReader? archive, Realm
         }
 
         // Very naive local caching to improve performance of large score imports (where the username is usually the same for most or all scores).
+
+        // TODO: `UserLookupCache` cannot currently be used here because of async foibles.
+        // It only supports lookups by user ID (username would require web changes), and even then the ID lookups cannot be used.
+        // That is because that component provides an async interface, and async functions cannot be consumed safely here due to the rigid structure of `RealmArchiveModelImporter`.
+        // The importer has two paths, one async and one sync; the async path runs the sync path in a task.
+        // This means that sometimes `PostImport()` is called from a sync context, and sometimes from an async one, whilst itself being a sync method.
+        // That in turn makes `.GetResultSafely()` not callable inside `PostImport()`, as it will throw when called from an async context,
+        private readonly Dictionary<int, APIUser> idLookupCache = new Dictionary<int, APIUser>();
         private readonly Dictionary<string, APIUser> usernameLookupCache = new Dictionary<string, APIUser>();
 
         protected override void PostImport(ScoreInfo model, Realm realm, ImportParameters parameters)
@@ -127,12 +135,54 @@ private void populateUserDetails(ScoreInfo model)
             if (model.RealmUser.OnlineID == APIUser.SYSTEM_USER_ID)
                 return;
 
-            string username = model.RealmUser.Username;
+            if (model.RealmUser.OnlineID > 1)
+            {
+                model.User = lookupUserById(model.RealmUser.OnlineID) ?? model.User;
+                return;
+            }
+
+            if (model.OnlineID < 0 && model.LegacyOnlineID <= 0)
+                return;
+
+            model.User = lookupUserByName(model.RealmUser.Username) ?? model.User;
+        }
+
+        private APIUser? lookupUserById(int id)
+        {
+            if (idLookupCache.TryGetValue(id, out var existing))
+            {
+                return existing;
+            }
+
+            var userRequest = new GetUserRequest(id);
+
+            api.Perform(userRequest);
+
+            if (userRequest.Response is APIUser user)
+            {
+                APIUser cachedUser;
 
+                idLookupCache.TryAdd(id, cachedUser = new APIUser
+                {
+                    // Because this is a permanent cache, let's only store the pieces we're interested in,
+                    // rather than the full API response. If we start to store more than these three fields
+                    // in realm, this should be undone.
+                    Id = user.Id,
+                    Username = user.Username,
+                    CountryCode = user.CountryCode,
+                });
+
+                return cachedUser;
+            }
+
+            return null;
+        }
+
+        private APIUser? lookupUserByName(string username)
+        {
             if (usernameLookupCache.TryGetValue(username, out var existing))
             {
-                model.User = existing;
-                return;
+                return existing;
             }
 
             var userRequest = new GetUserRequest(username);
@@ -141,7 +191,9 @@ private void populateUserDetails(ScoreInfo model)
 
             if (userRequest.Response is APIUser user)
             {
-                usernameLookupCache.TryAdd(username, new APIUser
+                APIUser cachedUser;
+
+                usernameLookupCache.TryAdd(username, cachedUser = new APIUser
                 {
                     // Because this is a permanent cache, let's only store the pieces we're interested in,
                     // rather than the full API response. If we start to store more than these three fields
@@ -151,8 +203,10 @@ private void populateUserDetails(ScoreInfo model)
                     CountryCode = user.CountryCode,
                 });
 
-                model.User = user;
+                return cachedUser;
             }
+
+            return null;
         }
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index fd9810779217..92c18c9c1eb4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -65,8 +65,19 @@ public class ScoreInfo : RealmObject, IHasGuidPrimaryKey, IHasRealmFiles, ISoftD
 
         public bool DeletePending { get; set; }
 
+        /// <summary>
+        /// The total number of points awarded for the score.
+        /// </summary>
         public long TotalScore { get; set; }
 
+        /// <summary>
+        /// The total number of points awarded for the score without including mod multipliers.
+        /// </summary>
+        /// <remarks>
+        /// The purpose of this property is to enable future lossless rebalances of mod multipliers.
+        /// </remarks>
+        public long TotalScoreWithoutMods { get; set; }
+
         /// <summary>
         /// The version of processing applied to calculate total score as stored in the database.
         /// If this does not match <see cref="LegacyScoreEncoder.LATEST_VERSION"/>,
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 1ee99e9e939e..df4735b5e63a 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -1,8 +1,6 @@
 // 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 System.Collections.Generic;
 using System.Diagnostics;
@@ -10,8 +8,8 @@
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -28,7 +26,7 @@ namespace osu.Game.Scoring
     public class ScoreManager : ModelManager<ScoreInfo>, IModelImporter<ScoreInfo>
     {
         private readonly Func<BeatmapManager> beatmaps;
-        private readonly OsuConfigManager configManager;
+        private readonly OsuConfigManager? configManager;
         private readonly ScoreImporter scoreImporter;
         private readonly LegacyScoreExporter scoreExporter;
 
@@ -43,7 +41,7 @@ public override bool PauseImports
         }
 
         public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api,
-                            OsuConfigManager configManager = null)
+                            OsuConfigManager? configManager = null)
             : base(storage, realm)
         {
             this.beatmaps = beatmaps;
@@ -60,18 +58,54 @@ public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storag
             };
         }
 
-        public Score GetScore(ScoreInfo score) => scoreImporter.GetScore(score);
+        /// <summary>
+        /// Retrieve a <see cref="Score"/> from a given <see cref="IScoreInfo"/>.
+        /// </summary>
+        /// <param name="scoreInfo">The <see cref="IScoreInfo"/> to convert.</param>
+        /// <returns>The <see cref="Score"/>. Null if the score cannot be found in the database.</returns>
+        /// <remarks>
+        /// The <see cref="IScoreInfo"/> is re-retrieved from the database to ensure all the required data
+        /// for retrieving a replay are present (may have missing properties if it was retrieved from online data).
+        /// </remarks>
+        public Score? GetScore(IScoreInfo scoreInfo)
+        {
+            ScoreInfo? databasedScoreInfo = getDatabasedScoreInfo(scoreInfo);
+
+            return databasedScoreInfo == null ? null : scoreImporter.GetScore(databasedScoreInfo);
+        }
 
         /// <summary>
         /// Perform a lookup query on available <see cref="ScoreInfo"/>s.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>The first result for the provided query, or null if no results were found.</returns>
-        public ScoreInfo Query(Expression<Func<ScoreInfo, bool>> query)
+        public ScoreInfo? Query(Expression<Func<ScoreInfo, bool>> query)
         {
             return Realm.Run(r => r.All<ScoreInfo>().FirstOrDefault(query)?.Detach());
         }
 
+        private ScoreInfo? getDatabasedScoreInfo(IScoreInfo originalScoreInfo)
+        {
+            ScoreInfo? databasedScoreInfo = null;
+
+            if (originalScoreInfo is ScoreInfo scoreInfo && !string.IsNullOrEmpty(scoreInfo.Hash))
+                databasedScoreInfo = Query(s => s.Hash == scoreInfo.Hash);
+
+            if (originalScoreInfo.OnlineID > 0)
+                databasedScoreInfo ??= Query(s => s.OnlineID == originalScoreInfo.OnlineID);
+
+            if (originalScoreInfo.LegacyOnlineID > 0)
+                databasedScoreInfo ??= Query(s => s.LegacyOnlineID == originalScoreInfo.LegacyOnlineID);
+
+            if (databasedScoreInfo == null)
+            {
+                Logger.Log("The requested score could not be found locally.", LoggingTarget.Information);
+                return null;
+            }
+
+            return databasedScoreInfo;
+        }
+
         /// <summary>
         /// Retrieves a bindable that represents the total score of a <see cref="ScoreInfo"/>.
         /// </summary>
@@ -80,7 +114,7 @@ public ScoreInfo Query(Expression<Func<ScoreInfo, bool>> query)
         /// </remarks>
         /// <param name="score">The <see cref="ScoreInfo"/> to retrieve the bindable for.</param>
         /// <returns>The bindable containing the total score.</returns>
-        public Bindable<long> GetBindableTotalScore([NotNull] ScoreInfo score) => new TotalScoreBindable(score, configManager);
+        public Bindable<long> GetBindableTotalScore(ScoreInfo score) => new TotalScoreBindable(score, configManager);
 
         /// <summary>
         /// Retrieves a bindable that represents the formatted total score string of a <see cref="ScoreInfo"/>.
@@ -90,7 +124,7 @@ public ScoreInfo Query(Expression<Func<ScoreInfo, bool>> query)
         /// </remarks>
         /// <param name="score">The <see cref="ScoreInfo"/> to retrieve the bindable for.</param>
         /// <returns>The bindable containing the formatted total score string.</returns>
-        public Bindable<string> GetBindableTotalScoreString([NotNull] ScoreInfo score) => new TotalScoreStringBindable(GetBindableTotalScore(score));
+        public Bindable<string> GetBindableTotalScoreString(ScoreInfo score) => new TotalScoreStringBindable(GetBindableTotalScore(score));
 
         /// <summary>
         /// Provides the total score of a <see cref="ScoreInfo"/>. Responds to changes in the currently-selected <see cref="ScoringMode"/>.
@@ -104,7 +138,7 @@ private class TotalScoreBindable : Bindable<long>
             /// </summary>
             /// <param name="score">The <see cref="ScoreInfo"/> to provide the total score of.</param>
             /// <param name="configManager">The config.</param>
-            public TotalScoreBindable(ScoreInfo score, OsuConfigManager configManager)
+            public TotalScoreBindable(ScoreInfo score, OsuConfigManager? configManager)
             {
                 configManager?.BindWith(OsuSetting.ScoreDisplayMode, scoringMode);
                 scoringMode.BindValueChanged(mode => Value = score.GetDisplayScore(mode.NewValue), true);
@@ -126,7 +160,7 @@ public TotalScoreStringBindable(IBindable<long> totalScore)
             }
         }
 
-        public void Delete([CanBeNull] Expression<Func<ScoreInfo, bool>> filter = null, bool silent = false)
+        public void Delete(Expression<Func<ScoreInfo, bool>>? filter = null, bool silent = false)
         {
             Realm.Run(r =>
             {
@@ -163,11 +197,25 @@ public override bool IsAvailableLocally(ScoreInfo model)
 
         public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, ImportTask[] tasks, ImportParameters parameters = default) => scoreImporter.Import(notification, tasks);
 
-        public Task Export(ScoreInfo score) => scoreExporter.ExportAsync(score.ToLive(Realm));
+        /// <summary>
+        /// Export a replay from a given <see cref="IScoreInfo"/>.
+        /// </summary>
+        /// <param name="scoreInfo">The <see cref="IScoreInfo"/> to export.</param>
+        /// <returns>The <see cref="Task"/>. Return <see cref="Task.CompletedTask"/> if the score cannot be found in the database.</returns>
+        /// <remarks>
+        /// The <see cref="IScoreInfo"/> is re-retrieved from the database to ensure all the required data
+        /// for exporting a replay are present (may have missing properties if it was retrieved from online data).
+        /// </remarks>
+        public Task Export(ScoreInfo scoreInfo)
+        {
+            ScoreInfo? databasedScoreInfo = getDatabasedScoreInfo(scoreInfo);
+
+            return databasedScoreInfo == null ? Task.CompletedTask : scoreExporter.ExportAsync(databasedScoreInfo.ToLive(Realm));
+        }
 
-        public Task<Live<ScoreInfo>> ImportAsUpdate(ProgressNotification notification, ImportTask task, ScoreInfo original) => scoreImporter.ImportAsUpdate(notification, task, original);
+        public Task<Live<ScoreInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask task, ScoreInfo original) => scoreImporter.ImportAsUpdate(notification, task, original);
 
-        public Live<ScoreInfo> Import(ScoreInfo item, ArchiveReader archive = null, ImportParameters parameters = default, CancellationToken cancellationToken = default) =>
+        public Live<ScoreInfo>? Import(ScoreInfo item, ArchiveReader? archive = null, ImportParameters parameters = default, CancellationToken cancellationToken = default) =>
             scoreImporter.ImportModel(item, archive, parameters, cancellationToken);
 
         /// <summary>
@@ -182,7 +230,7 @@ public void PopulateMaximumStatistics(ScoreInfo score)
 
         #region Implementation of IPresentImports<ScoreInfo>
 
-        public Action<IEnumerable<Live<ScoreInfo>>> PresentImport
+        public Action<IEnumerable<Live<ScoreInfo>>>? PresentImport
         {
             set => scoreImporter.PresentImport = value;
         }
diff --git a/osu.Game/Scoring/ScoreRank.cs b/osu.Game/Scoring/ScoreRank.cs
index 327e4191d74a..957cfc9b95b6 100644
--- a/osu.Game/Scoring/ScoreRank.cs
+++ b/osu.Game/Scoring/ScoreRank.cs
@@ -35,6 +35,7 @@ public enum ScoreRank
 
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.RankSH))]
         [Description(@"S+")]
+        // ReSharper disable once InconsistentNaming
         SH,
 
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.RankX))]
@@ -43,6 +44,7 @@ public enum ScoreRank
 
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.RankXH))]
         [Description(@"SS+")]
+        // ReSharper disable once InconsistentNaming
         XH,
     }
 }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index a552b22c114d..090e00667199 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -56,10 +56,6 @@ private void load(IAPIProvider api, SkinManager skinManager, OsuConfigManager co
             introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
 
             AddInternal(seasonalBackgroundLoader);
-
-            // Load first background asynchronously as part of BDL load.
-            currentDisplay = RNG.Next(0, background_count);
-            Next();
         }
 
         protected override void LoadComplete()
@@ -73,6 +69,9 @@ protected override void LoadComplete()
             introSequence.ValueChanged += _ => Scheduler.AddOnce(next);
             seasonalBackgroundLoader.SeasonalBackgroundChanged += () => Scheduler.AddOnce(next);
 
+            currentDisplay = RNG.Next(0, background_count);
+            Next();
+
             // helper function required for AddOnce usage.
             void next() => Next();
         }
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/EditorRadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/EditorRadioButton.cs
index 65f3e41c1377..29bb24eb432e 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/EditorRadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/EditorRadioButton.cs
@@ -33,9 +33,6 @@ public partial class EditorRadioButton : OsuButton, IHasTooltip
 
         private Drawable icon = null!;
 
-        [Resolved]
-        private EditorBeatmap? editorBeatmap { get; set; }
-
         public EditorRadioButton(RadioButton button)
         {
             Button = button;
@@ -76,8 +73,6 @@ protected override void LoadComplete()
                     Selected?.Invoke(Button);
             };
 
-            editorBeatmap?.HasTiming.BindValueChanged(hasTiming => Button.Selected.Disabled = !hasTiming.NewValue, true);
-
             Button.Selected.BindDisabledChanged(disabled => Enabled.Value = !disabled, true);
             updateSelectionState();
         }
@@ -99,6 +94,6 @@ private void updateSelectionState()
             X = 40f
         };
 
-        public LocalisableString TooltipText => Enabled.Value ? string.Empty : "Add at least one timing point first!";
+        public LocalisableString TooltipText => Button.TooltipText;
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
index 9dcd29bf834a..f49fc6f6ab23 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Screens.Edit.Components.RadioButtons
 {
@@ -11,6 +12,7 @@ public class RadioButton
     {
         /// <summary>
         /// Whether this <see cref="RadioButton"/> is selected.
+        /// Disable this bindable to disable the button.
         /// </summary>
         public readonly BindableBool Selected;
 
@@ -50,5 +52,8 @@ public void Select()
         /// Deselects this <see cref="RadioButton"/>.
         /// </summary>
         public void Deselect() => Selected.Value = false;
+
+        // Tooltip text that will be shown when hovered over
+        public LocalisableString TooltipText { get; set; } = string.Empty;
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 40b97d213761..005b96bfefcc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -580,7 +580,7 @@ protected override void LoadComplete()
             {
                 base.LoadComplete();
 
-                GetContainingInputManager().ChangeFocus(this);
+                GetContainingFocusManager().ChangeFocus(this);
                 SelectAll();
             }
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 2d6e234e57f8..c66be9060515 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -512,7 +512,9 @@ protected virtual void OnBlueprintSelected(SelectionBlueprint<T> blueprint)
 
         protected virtual void OnBlueprintDeselected(SelectionBlueprint<T> blueprint)
         {
-            SelectionBlueprints.ChangeChildDepth(blueprint, 0);
+            if (SelectionBlueprints.Contains(blueprint))
+                SelectionBlueprints.ChangeChildDepth(blueprint, 0);
+
             SelectionHandler.HandleDeselected(blueprint);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 0b16941bc479..31a5c30fffd0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -27,7 +27,9 @@ public partial class SelectionBox : CompositeDrawable
         [Resolved]
         private SelectionRotationHandler? rotationHandler { get; set; }
 
-        public Func<Vector2, Anchor, bool>? OnScale;
+        [Resolved]
+        private SelectionScaleHandler? scaleHandler { get; set; }
+
         public Func<Direction, bool, bool>? OnFlip;
         public Func<bool>? OnReverse;
 
@@ -57,60 +59,11 @@ public bool CanReverse
 
         private readonly IBindable<bool> canRotate = new BindableBool();
 
-        private bool canScaleX;
+        private readonly IBindable<bool> canScaleX = new BindableBool();
 
-        /// <summary>
-        /// Whether horizontal scaling (from the left or right edge) support should be enabled.
-        /// </summary>
-        public bool CanScaleX
-        {
-            get => canScaleX;
-            set
-            {
-                if (canScaleX == value) return;
+        private readonly IBindable<bool> canScaleY = new BindableBool();
 
-                canScaleX = value;
-                recreate();
-            }
-        }
-
-        private bool canScaleY;
-
-        /// <summary>
-        /// Whether vertical scaling (from the top or bottom edge) support should be enabled.
-        /// </summary>
-        public bool CanScaleY
-        {
-            get => canScaleY;
-            set
-            {
-                if (canScaleY == value) return;
-
-                canScaleY = value;
-                recreate();
-            }
-        }
-
-        private bool canScaleDiagonally;
-
-        /// <summary>
-        /// Whether diagonal scaling (from a corner) support should be enabled.
-        /// </summary>
-        /// <remarks>
-        /// There are some cases where we only want to allow proportional resizing, and not allow
-        /// one or both explicit directions of scale.
-        /// </remarks>
-        public bool CanScaleDiagonally
-        {
-            get => canScaleDiagonally;
-            set
-            {
-                if (canScaleDiagonally == value) return;
-
-                canScaleDiagonally = value;
-                recreate();
-            }
-        }
+        private readonly IBindable<bool> canScaleDiagonally = new BindableBool();
 
         private bool canFlipX;
 
@@ -174,9 +127,19 @@ public string Text
         private void load()
         {
             if (rotationHandler != null)
-                canRotate.BindTo(rotationHandler.CanRotate);
+                canRotate.BindTo(rotationHandler.CanRotateSelectionOrigin);
+
+            if (scaleHandler != null)
+            {
+                canScaleX.BindTo(scaleHandler.CanScaleX);
+                canScaleY.BindTo(scaleHandler.CanScaleY);
+                canScaleDiagonally.BindTo(scaleHandler.CanScaleDiagonally);
+            }
 
-            canRotate.BindValueChanged(_ => recreate(), true);
+            canRotate.BindValueChanged(_ => recreate());
+            canScaleX.BindValueChanged(_ => recreate());
+            canScaleY.BindValueChanged(_ => recreate());
+            canScaleDiagonally.BindValueChanged(_ => recreate(), true);
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -265,9 +228,9 @@ private void recreate()
                 }
             };
 
-            if (CanScaleX) addXScaleComponents();
-            if (CanScaleDiagonally) addFullScaleComponents();
-            if (CanScaleY) addYScaleComponents();
+            if (canScaleX.Value) addXScaleComponents();
+            if (canScaleDiagonally.Value) addFullScaleComponents();
+            if (canScaleY.Value) addYScaleComponents();
             if (CanFlipX) addXFlipComponents();
             if (CanFlipY) addYFlipComponents();
             if (canRotate.Value) addRotationComponents();
@@ -353,7 +316,6 @@ private void addScaleHandle(Anchor anchor)
             var handle = new SelectionBoxScaleHandle
             {
                 Anchor = anchor,
-                HandleScale = (delta, a) => OnScale?.Invoke(delta, a)
             };
 
             handle.OperationStarted += operationStarted;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
index 7943065c82d9..eca0c08ba1bc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
@@ -1,19 +1,21 @@
 // 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.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxScaleHandle : SelectionBoxDragHandle
     {
-        public Action<Vector2, Anchor> HandleScale { get; set; }
+        [Resolved]
+        private SelectionScaleHandler? scaleHandler { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -21,10 +23,108 @@ private void load()
             Size = new Vector2(10);
         }
 
+        private Anchor originalAnchor;
+
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (e.Button != MouseButton.Left)
+                return false;
+
+            if (scaleHandler == null) return false;
+
+            originalAnchor = Anchor;
+
+            scaleHandler.Begin();
+            return true;
+        }
+
+        private Vector2 rawScale;
+
         protected override void OnDrag(DragEvent e)
         {
-            HandleScale?.Invoke(e.Delta, Anchor);
             base.OnDrag(e);
+
+            if (scaleHandler == null) return;
+
+            rawScale = convertDragEventToScaleMultiplier(e);
+
+            applyScale(shouldLockAspectRatio: isCornerAnchor(originalAnchor) && e.ShiftPressed);
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (IsDragged)
+            {
+                applyScale(shouldLockAspectRatio: isCornerAnchor(originalAnchor) && e.ShiftPressed);
+                return true;
+            }
+
+            return base.OnKeyDown(e);
+        }
+
+        protected override void OnKeyUp(KeyUpEvent e)
+        {
+            base.OnKeyUp(e);
+
+            if (IsDragged)
+                applyScale(shouldLockAspectRatio: isCornerAnchor(originalAnchor) && e.ShiftPressed);
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            scaleHandler?.Commit();
+        }
+
+        private Vector2 convertDragEventToScaleMultiplier(DragEvent e)
+        {
+            Vector2 scale = e.MousePosition - e.MouseDownPosition;
+            adjustScaleFromAnchor(ref scale);
+
+            var surroundingQuad = scaleHandler!.OriginalSurroundingQuad!.Value;
+            scale.X = Precision.AlmostEquals(surroundingQuad.Width, 0) ? 0 : scale.X / surroundingQuad.Width;
+            scale.Y = Precision.AlmostEquals(surroundingQuad.Height, 0) ? 0 : scale.Y / surroundingQuad.Height;
+
+            return scale + Vector2.One;
+        }
+
+        private void adjustScaleFromAnchor(ref Vector2 scale)
+        {
+            // cancel out scale in axes we don't care about (based on which drag handle was used).
+            if ((originalAnchor & Anchor.x1) > 0) scale.X = 0;
+            if ((originalAnchor & Anchor.y1) > 0) scale.Y = 0;
+
+            // reverse the scale direction if dragging from top or left.
+            if ((originalAnchor & Anchor.x0) > 0) scale.X = -scale.X;
+            if ((originalAnchor & Anchor.y0) > 0) scale.Y = -scale.Y;
         }
+
+        private void applyScale(bool shouldLockAspectRatio)
+        {
+            var newScale = shouldLockAspectRatio
+                ? new Vector2((rawScale.X + rawScale.Y) * 0.5f)
+                : rawScale;
+
+            var scaleOrigin = originalAnchor.Opposite().PositionOnQuad(scaleHandler!.OriginalSurroundingQuad!.Value);
+            scaleHandler!.Update(newScale, scaleOrigin, getAdjustAxis());
+        }
+
+        private Axes getAdjustAxis()
+        {
+            switch (originalAnchor)
+            {
+                case Anchor.TopCentre:
+                case Anchor.BottomCentre:
+                    return Axes.Y;
+
+                case Anchor.CentreLeft:
+                case Anchor.CentreRight:
+                    return Axes.X;
+
+                default:
+                    return Axes.Both;
+            }
+        }
+
+        private bool isCornerAnchor(Anchor anchor) => !anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1);
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 3c859c65ff84..dd6bd43f4d26 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -57,6 +57,8 @@ public abstract partial class SelectionHandler<T> : CompositeDrawable, IKeyBindi
 
         public SelectionRotationHandler RotationHandler { get; private set; }
 
+        public SelectionScaleHandler ScaleHandler { get; private set; }
+
         protected SelectionHandler()
         {
             selectedBlueprints = new List<SelectionBlueprint<T>>();
@@ -69,6 +71,7 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
             dependencies.CacheAs(RotationHandler = CreateRotationHandler());
+            dependencies.CacheAs(ScaleHandler = CreateScaleHandler());
             return dependencies;
         }
 
@@ -78,6 +81,7 @@ private void load()
             AddRangeInternal(new Drawable[]
             {
                 RotationHandler,
+                ScaleHandler,
                 SelectionBox = CreateSelectionBox(),
             });
 
@@ -93,7 +97,6 @@ public SelectionBox CreateSelectionBox()
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                OnScale = HandleScale,
                 OnFlip = HandleFlip,
                 OnReverse = HandleReverse,
             };
@@ -157,6 +160,11 @@ protected virtual void OnOperationEnded()
         /// <returns>Whether any items could be scaled.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;
 
+        /// <summary>
+        /// Creates the handler to use for scale operations.
+        /// </summary>
+        public virtual SelectionScaleHandler CreateScaleHandler() => new SelectionScaleHandler();
+
         /// <summary>
         /// Handles the selected items being flipped.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index 5faa4a108dc5..459e4b0c4119 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -13,9 +13,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
     public partial class SelectionRotationHandler : Component
     {
         /// <summary>
-        /// Whether the rotation can currently be performed.
+        /// Whether rotation anchored by the selection origin can currently be performed.
         /// </summary>
-        public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
+        public Bindable<bool> CanRotateSelectionOrigin { get; private set; } = new BindableBool();
+
+        /// <summary>
+        /// Whether rotation anchored by the center of the playfield can currently be performed.
+        /// </summary>
+        public Bindable<bool> CanRotatePlayfieldOrigin { get; private set; } = new BindableBool();
 
         /// <summary>
         /// Performs a single, instant, atomic rotation operation.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs
new file mode 100644
index 000000000000..a96f627e5637
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionScaleHandler.cs
@@ -0,0 +1,104 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Base handler for editor scale operations.
+    /// </summary>
+    public partial class SelectionScaleHandler : Component
+    {
+        /// <summary>
+        /// Whether horizontal scaling (from the left or right edge) support should be enabled.
+        /// </summary>
+        public Bindable<bool> CanScaleX { get; private set; } = new BindableBool();
+
+        /// <summary>
+        /// Whether vertical scaling (from the top or bottom edge) support should be enabled.
+        /// </summary>
+        public Bindable<bool> CanScaleY { get; private set; } = new BindableBool();
+
+        /// <summary>
+        /// Whether diagonal scaling (from a corner) support should be enabled.
+        /// </summary>
+        /// <remarks>
+        /// There are some cases where we only want to allow proportional resizing, and not allow
+        /// one or both explicit directions of scale.
+        /// </remarks>
+        public Bindable<bool> CanScaleDiagonally { get; private set; } = new BindableBool();
+
+        public Quad? OriginalSurroundingQuad { get; protected set; }
+
+        /// <summary>
+        /// Performs a single, instant, atomic scale operation.
+        /// </summary>
+        /// <remarks>
+        /// This method is intended to be used in atomic contexts (such as when pressing a single button).
+        /// For continuous operations, see the <see cref="Begin"/>-<see cref="Update"/>-<see cref="Commit"/> flow.
+        /// </remarks>
+        /// <param name="scale">The scale to apply, as multiplier.</param>
+        /// <param name="origin">
+        /// The origin point to scale from.
+        /// If the default <see langword="null"/> value is supplied, a sane implementation-defined default will be used.
+        /// </param>
+        /// <param name="adjustAxis">The axes to adjust the scale in.</param>
+        public void ScaleSelection(Vector2 scale, Vector2? origin = null, Axes adjustAxis = Axes.Both)
+        {
+            Begin();
+            Update(scale, origin, adjustAxis);
+            Commit();
+        }
+
+        /// <summary>
+        /// Begins a continuous scale operation.
+        /// </summary>
+        /// <remarks>
+        /// This flow is intended to be used when a scale operation is made incrementally (such as when dragging a scale handle or slider).
+        /// For instantaneous, atomic operations, use the convenience <see cref="ScaleSelection"/> method.
+        /// </remarks>
+        public virtual void Begin()
+        {
+        }
+
+        /// <summary>
+        /// Updates a continuous scale operation.
+        /// Must be preceded by a <see cref="Begin"/> call.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This flow is intended to be used when a scale operation is made incrementally (such as when dragging a scale handle or slider).
+        /// As such, the values of <paramref name="scale"/> and <paramref name="origin"/> supplied should be relative to the state of the objects being scaled
+        /// when <see cref="Begin"/> was called, rather than instantaneous deltas.
+        /// </para>
+        /// <para>
+        /// For instantaneous, atomic operations, use the convenience <see cref="ScaleSelection"/> method.
+        /// </para>
+        /// </remarks>
+        /// <param name="scale">The Scale to apply, as multiplier.</param>
+        /// <param name="origin">
+        /// The origin point to scale from.
+        /// If the default <see langword="null"/> value is supplied, a sane implementation-defined default will be used.
+        /// </param>
+        /// <param name="adjustAxis">The axes to adjust the scale in.</param>
+        public virtual void Update(Vector2 scale, Vector2? origin = null, Axes adjustAxis = Axes.Both)
+        {
+        }
+
+        /// <summary>
+        /// Ends a continuous scale operation.
+        /// Must be preceded by a <see cref="Begin"/> call.
+        /// </summary>
+        /// <remarks>
+        /// This flow is intended to be used when a scale operation is made incrementally (such as when dragging a scale handle or slider).
+        /// For instantaneous, atomic operations, use the convenience <see cref="ScaleSelection"/> method.
+        /// </remarks>
+        public virtual void Commit()
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index fc240c570bc5..d9084a74770c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -138,7 +138,7 @@ private void load()
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(sliderVelocitySlider));
+                ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(sliderVelocitySlider));
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 28841fc9e5d2..5c4a9faaca21 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -142,7 +142,7 @@ private void load()
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(volume));
+                ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(volume));
             }
 
             private static string? getCommonBank(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetBankValue).Distinct().Count() == 1 ? GetBankValue(relevantSamples.First()) : null;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index c3adb43032cb..e16c8519e576 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -7,7 +7,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -20,7 +19,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     public partial class TimelineTickDisplay : TimelinePart<PointVisualisation>
     {
         // With current implementation every tick in the sub-tree should be visible, no need to check whether they are masked away.
-        public override bool UpdateSubTreeMasking(Drawable source, RectangleF maskingBounds) => false;
+        public override bool UpdateSubTreeMasking() => false;
 
         [Resolved]
         private EditorBeatmap beatmap { get; set; } = null!;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c1f6c0230162..07c32983f5f3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -372,7 +372,7 @@ private void load(OsuConfigManager config)
                                     }
                                 }
                             },
-                            new EditorScreenSwitcherControl
+                            screenSwitcher = new EditorScreenSwitcherControl
                             {
                                 Anchor = Anchor.BottomRight,
                                 Origin = Anchor.BottomRight,
@@ -662,23 +662,23 @@ public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
                     return true;
 
                 case GlobalAction.EditorComposeMode:
-                    Mode.Value = EditorScreenMode.Compose;
+                    screenSwitcher.SelectItem(EditorScreenMode.Compose);
                     return true;
 
                 case GlobalAction.EditorDesignMode:
-                    Mode.Value = EditorScreenMode.Design;
+                    screenSwitcher.SelectItem(EditorScreenMode.Design);
                     return true;
 
                 case GlobalAction.EditorTimingMode:
-                    Mode.Value = EditorScreenMode.Timing;
+                    screenSwitcher.SelectItem(EditorScreenMode.Timing);
                     return true;
 
                 case GlobalAction.EditorSetupMode:
-                    Mode.Value = EditorScreenMode.SongSetup;
+                    screenSwitcher.SelectItem(EditorScreenMode.SongSetup);
                     return true;
 
                 case GlobalAction.EditorVerifyMode:
-                    Mode.Value = EditorScreenMode.Verify;
+                    screenSwitcher.SelectItem(EditorScreenMode.Verify);
                     return true;
 
                 case GlobalAction.EditorTestGameplay:
@@ -719,6 +719,8 @@ private void dimBackground()
 
         public override bool OnExiting(ScreenExitEvent e)
         {
+            currentScreen?.OnExiting(e);
+
             if (!ExitConfirmed)
             {
                 // dialog overlay may not be available in visual tests.
@@ -959,6 +961,8 @@ private void onModeChanged(ValueChangedEvent<EditorScreenMode> e)
         [CanBeNull]
         private ScheduledDelegate playbackDisabledDebounce;
 
+        private EditorScreenSwitcherControl screenSwitcher;
+
         private void updateSampleDisabledState()
         {
             bool shouldDisableSamples = clock.SeekingOrStopped.Value
@@ -1086,6 +1090,13 @@ void delete()
 
                 var difficultiesBeforeDeletion = groupedOrderedBeatmaps.SelectMany(g => g).ToList();
 
+                // if the difficulty being currently deleted has unsaved changes,
+                // the editor exit flow would prompt for save *after* this method has done its thing.
+                // this is generally undesirable and also ends up leaving the user in a broken state.
+                // therefore, just update the last saved hash to make the exit flow think the deleted beatmap is not dirty,
+                // so that it will not show the save dialog on exit.
+                updateLastSavedHash();
+
                 beatmapManager.DeleteDifficultyImmediately(difficultyToDelete);
 
                 int deletedIndex = difficultiesBeforeDeletion.IndexOf(difficultyToDelete);
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index dc1fda13f49d..7a3ea474fb91 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -174,6 +174,8 @@ public ControlPointInfo ControlPointInfo
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
+        public List<string> UnhandledEventLines => PlayableBeatmap.UnhandledEventLines;
+
         public double TotalBreakTime => PlayableBeatmap.TotalBreakTime;
 
         public IReadOnlyList<HitObject> HitObjects => PlayableBeatmap.HitObjects;
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 3bc870b898f9..a795b310a2cf 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Screens;
 
 namespace osu.Game.Screens.Edit
 {
@@ -37,6 +38,10 @@ protected EditorScreen(EditorScreenMode type)
 
         protected override void PopOut() => this.FadeOut();
 
+        public virtual void OnExiting(ScreenExitEvent e)
+        {
+        }
+
         #region Clipboard operations
 
         public BindableBool CanCut { get; } = new BindableBool();
diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index e5dc540b0649..4d8393e82949 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -30,6 +30,10 @@ public abstract partial class EditorTable : TableContainer
 
         protected readonly FillFlowContainer<RowBackground> BackgroundFlow;
 
+        // We can avoid potentially thousands of objects being added to the input sub-tree since item selection is being handled by the BackgroundFlow
+        // and no items in the underlying table are clickable.
+        protected override bool ShouldBeConsideredForInput(Drawable child) => child == BackgroundFlow && base.ShouldBeConsideredForInput(child);
+
         protected EditorTable()
         {
             RelativeSizeAxes = Axes.X;
diff --git a/osu.Game/Screens/Edit/Setup/LabelledTextBoxWithPopover.cs b/osu.Game/Screens/Edit/Setup/LabelledTextBoxWithPopover.cs
index 79288e2977aa..5abf40dda732 100644
--- a/osu.Game/Screens/Edit/Setup/LabelledTextBoxWithPopover.cs
+++ b/osu.Game/Screens/Edit/Setup/LabelledTextBoxWithPopover.cs
@@ -45,7 +45,7 @@ protected override void OnFocus(FocusEvent e)
                 OnFocused?.Invoke();
                 base.OnFocus(e);
 
-                GetContainingInputManager().TriggerFocusContention(this);
+                GetContainingFocusManager().TriggerFocusContention(this);
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 752f59030826..b575472a1842 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -53,9 +53,6 @@ private void load()
                 sourceTextBox = createTextBox<LabelledTextBox>(BeatmapsetsStrings.ShowInfoSource, metadata.Source),
                 tagsTextBox = createTextBox<LabelledTextBox>(BeatmapsetsStrings.ShowInfoTags, metadata.Tags)
             };
-
-            foreach (var item in Children.OfType<LabelledTextBox>())
-                item.OnCommit += onCommit;
         }
 
         private TTextBox createTextBox<TTextBox>(LocalisableString label, string initialValue)
@@ -73,10 +70,14 @@ protected override void LoadComplete()
             base.LoadComplete();
 
             if (string.IsNullOrEmpty(ArtistTextBox.Current.Value))
-                ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(ArtistTextBox));
+                ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(ArtistTextBox));
 
             ArtistTextBox.Current.BindValueChanged(artist => transferIfRomanised(artist.NewValue, RomanisedArtistTextBox));
             TitleTextBox.Current.BindValueChanged(title => transferIfRomanised(title.NewValue, RomanisedTitleTextBox));
+
+            foreach (var item in Children.OfType<LabelledTextBox>())
+                item.OnCommit += onCommit;
+
             updateReadOnlyState();
         }
 
@@ -86,7 +87,6 @@ private void transferIfRomanised(string value, LabelledTextBox target)
                 target.Current.Value = value;
 
             updateReadOnlyState();
-            Scheduler.AddOnce(updateMetadata);
         }
 
         private void updateReadOnlyState()
@@ -101,7 +101,7 @@ private void onCommit(TextBox sender, bool newText)
 
             // for now, update on commit rather than making BeatmapMetadata bindables.
             // after switching database engines we can reconsider if switching to bindables is a good direction.
-            Scheduler.AddOnce(updateMetadata);
+            updateMetadata();
         }
 
         private void updateMetadata()
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 266ea1f929fb..7a7907d08a71 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -5,6 +5,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 
@@ -55,6 +56,17 @@ private void load(EditorBeatmap beatmap, OverlayColourProvider colourProvider)
             }));
         }
 
+        public override void OnExiting(ScreenExitEvent e)
+        {
+            base.OnExiting(e);
+
+            // Before exiting, trigger a focus loss.
+            //
+            // This is important to ensure that if the user is still editing a textbox, it will commit
+            // (and potentially block the exit procedure for save).
+            GetContainingFocusManager()?.TriggerFocusContention(this);
+        }
+
         private partial class SetupScreenSectionsContainer : SectionsContainer<SetupSection>
         {
             protected override UserTrackingScrollContainer CreateScrollContainer()
diff --git a/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
index 151d46941528..4f7a1bf5891d 100644
--- a/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.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 System;
+using System.Numerics;
 using System.Globalization;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -12,7 +12,7 @@
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
 using osu.Game.Utils;
-using osuTK;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Timing
     /// by providing an "indeterminate state".
     /// </summary>
     public partial class IndeterminateSliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T?>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
         /// <summary>
         /// A custom step value for each key press which actuates a change on this control.
@@ -126,7 +126,7 @@ public IndeterminateSliderWithTextBoxInput(LocalisableString labelText, Bindable
         protected override void OnFocus(FocusEvent e)
         {
             base.OnFocus(e);
-            GetContainingInputManager().ChangeFocus(textBox);
+            GetContainingFocusManager().ChangeFocus(textBox);
         }
 
         private void updateState()
@@ -136,7 +136,7 @@ private void updateState()
                 slider.Current.Value = nonNullValue;
 
                 // use the value from the slider to ensure that any precision/min/max set on it via the initial indeterminate value have been applied correctly.
-                decimal decimalValue = slider.Current.Value.ToDecimal(NumberFormatInfo.InvariantInfo);
+                decimal decimalValue = decimal.CreateTruncating(slider.Current.Value);
                 textBox.Text = decimalValue.ToString($@"N{FormatUtils.FindPrecision(decimalValue)}");
                 textBox.PlaceholderText = string.Empty;
             }
diff --git a/osu.Game/Screens/Select/FooterV2/FooterV2.cs b/osu.Game/Screens/Footer/ScreenFooter.cs
similarity index 84%
rename from osu.Game/Screens/Select/FooterV2/FooterV2.cs
rename to osu.Game/Screens/Footer/ScreenFooter.cs
index 0529f0d08265..01013bb46614 100644
--- a/osu.Game/Screens/Select/FooterV2/FooterV2.cs
+++ b/osu.Game/Screens/Footer/ScreenFooter.cs
@@ -11,9 +11,9 @@
 using osu.Game.Overlays;
 using osuTK;
 
-namespace osu.Game.Screens.Select.FooterV2
+namespace osu.Game.Screens.Footer
 {
-    public partial class FooterV2 : InputBlockingContainer
+    public partial class ScreenFooter : InputBlockingContainer
     {
         //Should be 60, setting to 50 for now for the sake of matching the current BackButton height.
         private const int height = 50;
@@ -23,7 +23,7 @@ public partial class FooterV2 : InputBlockingContainer
 
         /// <param name="button">The button to be added.</param>
         /// <param name="overlay">The <see cref="OverlayContainer"/> to be toggled by this button.</param>
-        public void AddButton(FooterButtonV2 button, OverlayContainer? overlay = null)
+        public void AddButton(ScreenFooterButton button, OverlayContainer? overlay = null)
         {
             if (overlay != null)
             {
@@ -46,9 +46,9 @@ private void showOverlay(OverlayContainer overlay)
             }
         }
 
-        private FillFlowContainer<FooterButtonV2> buttons = null!;
+        private FillFlowContainer<ScreenFooterButton> buttons = null!;
 
-        public FooterV2()
+        public ScreenFooter()
         {
             RelativeSizeAxes = Axes.X;
             Height = height;
@@ -66,13 +66,13 @@ private void load(OverlayColourProvider colourProvider)
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background5
                 },
-                buttons = new FillFlowContainer<FooterButtonV2>
+                buttons = new FillFlowContainer<ScreenFooterButton>
                 {
                     Position = new Vector2(TwoLayerButton.SIZE_EXTENDED.X + padding, 10),
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(-FooterButtonV2.SHEAR_WIDTH + 7, 0),
+                    Spacing = new Vector2(7, 0),
                     AutoSizeAxes = Axes.Both
                 }
             };
diff --git a/osu.Game/Screens/Footer/ScreenFooterButton.cs b/osu.Game/Screens/Footer/ScreenFooterButton.cs
new file mode 100644
index 000000000000..b3b3c9a8ecf6
--- /dev/null
+++ b/osu.Game/Screens/Footer/ScreenFooterButton.cs
@@ -0,0 +1,220 @@
+// 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.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Footer
+{
+    public partial class ScreenFooterButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
+    {
+        // This should be 12 by design, but an extra allowance is added due to the corner radius specification.
+        private const float shear_width = 13.5f;
+
+        protected const int CORNER_RADIUS = 10;
+        protected const int BUTTON_HEIGHT = 90;
+        protected const int BUTTON_WIDTH = 140;
+
+        public Bindable<Visibility> OverlayState = new Bindable<Visibility>();
+
+        protected static readonly Vector2 BUTTON_SHEAR = new Vector2(shear_width / BUTTON_HEIGHT, 0);
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        private Colour4 buttonAccentColour;
+
+        protected Colour4 AccentColour
+        {
+            set
+            {
+                buttonAccentColour = value;
+                bar.Colour = buttonAccentColour;
+                icon.Colour = buttonAccentColour;
+            }
+        }
+
+        protected IconUsage Icon
+        {
+            set => icon.Icon = value;
+        }
+
+        protected LocalisableString Text
+        {
+            set => text.Text = value;
+        }
+
+        private readonly SpriteText text;
+        private readonly SpriteIcon icon;
+
+        protected Container TextContainer;
+        private readonly Box bar;
+        private readonly Box backgroundBox;
+        private readonly Box glowBox;
+        private readonly Box flashLayer;
+
+        public ScreenFooterButton()
+        {
+            Size = new Vector2(BUTTON_WIDTH, BUTTON_HEIGHT);
+
+            Child = new Container
+            {
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 4,
+                    // Figma says 50% opacity, but it does not match up visually if taken at face value, and looks bad.
+                    Colour = Colour4.Black.Opacity(0.25f),
+                    Offset = new Vector2(0, 2),
+                },
+                Shear = BUTTON_SHEAR,
+                Masking = true,
+                CornerRadius = CORNER_RADIUS,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    backgroundBox = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    glowBox = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    // For elements that should not be sheared.
+                    new Container
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Shear = -BUTTON_SHEAR,
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            TextContainer = new Container
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Y = 42,
+                                AutoSizeAxes = Axes.Both,
+                                Child = text = new OsuSpriteText
+                                {
+                                    // figma design says the size is 16, but due to the issues with font sizes 19 matches better
+                                    Font = OsuFont.TorusAlternate.With(size: 19),
+                                    AlwaysPresent = true
+                                }
+                            },
+                            icon = new SpriteIcon
+                            {
+                                Y = 12,
+                                Size = new Vector2(20),
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre
+                            },
+                        }
+                    },
+                    new Container
+                    {
+                        Shear = -BUTTON_SHEAR,
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.Centre,
+                        Y = -CORNER_RADIUS,
+                        Size = new Vector2(120, 6),
+                        Masking = true,
+                        CornerRadius = 3,
+                        Child = bar = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        }
+                    },
+                    flashLayer = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Colour4.White.Opacity(0.9f),
+                        Blending = BlendingParameters.Additive,
+                        Alpha = 0,
+                    },
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            OverlayState.BindValueChanged(_ => updateDisplay());
+            Enabled.BindValueChanged(_ => updateDisplay(), true);
+
+            FinishTransforms(true);
+        }
+
+        public GlobalAction? Hotkey;
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            if (Enabled.Value)
+                Flash();
+
+            return base.OnClick(e);
+        }
+
+        protected virtual void Flash() => flashLayer.FadeOutFromOne(800, Easing.OutQuint);
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateDisplay();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e) => updateDisplay();
+
+        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (e.Action != Hotkey || e.Repeat) return false;
+
+            TriggerClick();
+            return true;
+        }
+
+        public virtual void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) { }
+
+        private void updateDisplay()
+        {
+            Color4 backgroundColour = OverlayState.Value == Visibility.Visible ? buttonAccentColour : colourProvider.Background3;
+            Color4 textColour = OverlayState.Value == Visibility.Visible ? colourProvider.Background6 : colourProvider.Content1;
+            Color4 accentColour = OverlayState.Value == Visibility.Visible ? colourProvider.Background6 : buttonAccentColour;
+
+            if (!Enabled.Value)
+                backgroundColour = backgroundColour.Darken(1f);
+            else if (IsHovered)
+                backgroundColour = backgroundColour.Lighten(0.2f);
+
+            backgroundBox.FadeColour(backgroundColour, 150, Easing.OutQuint);
+
+            if (!Enabled.Value)
+                textColour = textColour.Opacity(0.6f);
+
+            text.FadeColour(textColour, 150, Easing.OutQuint);
+            icon.FadeColour(accentColour, 150, Easing.OutQuint);
+            bar.FadeColour(accentColour, 150, Easing.OutQuint);
+
+            glowBox.FadeColour(ColourInfo.GradientVertical(buttonAccentColour.Opacity(0f), buttonAccentColour.Opacity(0.2f)), 150, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 15a274016093..e9fff9bb07f2 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -24,6 +24,7 @@
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
@@ -46,6 +47,7 @@ public partial class ButtonSystem : Container, IStateful<ButtonSystemState>, IKe
         public Action? OnSettings;
         public Action? OnMultiplayer;
         public Action? OnPlaylists;
+        public Action<Room>? OnDailyChallenge;
 
         private readonly IBindable<bool> isIdle = new BindableBool();
 
@@ -102,10 +104,13 @@ public ButtonSystem()
 
             buttonArea.AddRange(new Drawable[]
             {
-                new MainMenuButton(ButtonSystemStrings.Settings, string.Empty, OsuIcon.Settings, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O, Key.S),
-                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.PrevCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
-                    -WEDGE_WIDTH)
+                new MainMenuButton(ButtonSystemStrings.Settings, string.Empty, OsuIcon.Settings, new Color4(85, 85, 85, 255), _ => OnSettings?.Invoke(), Key.O, Key.S)
                 {
+                    Padding = new MarginPadding { Right = WEDGE_WIDTH },
+                },
+                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.PrevCircle, new Color4(51, 58, 94, 255), _ => State = ButtonSystemState.TopLevel)
+                {
+                    Padding = new MarginPadding { Right = WEDGE_WIDTH },
                     VisibleStateMin = ButtonSystemState.Play,
                     VisibleStateMax = ButtonSystemState.Edit,
                 },
@@ -127,21 +132,31 @@ public ButtonSystem()
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, IdleTracker? idleTracker, GameHost host)
         {
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-default-select", OsuIcon.Player, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-default-select", OsuIcon.Online, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Tournament, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-default-select", OsuIcon.Player, new Color4(102, 68, 204, 255), _ => OnSolo?.Invoke(), Key.P)
+            {
+                Padding = new MarginPadding { Left = WEDGE_WIDTH },
+            });
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-default-select", OsuIcon.Online, new Color4(94, 63, 186, 255), onMultiplayer, Key.M));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Tournament, new Color4(94, 63, 186, 255), onPlaylists, Key.L));
+            buttonsPlay.Add(new DailyChallengeButton(@"button-default-select", new Color4(94, 63, 186, 255), onDailyChallenge, Key.D));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsEdit.Add(new MainMenuButton(EditorStrings.BeatmapEditor.ToLower(), @"button-default-select", OsuIcon.Beatmap, new Color4(238, 170, 0, 255), () => OnEditBeatmap?.Invoke(), WEDGE_WIDTH, Key.B, Key.E));
-            buttonsEdit.Add(new MainMenuButton(SkinEditorStrings.SkinEditor.ToLower(), @"button-default-select", OsuIcon.SkinB, new Color4(220, 160, 0, 255), () => OnEditSkin?.Invoke(), 0, Key.S));
+            buttonsEdit.Add(new MainMenuButton(EditorStrings.BeatmapEditor.ToLower(), @"button-default-select", OsuIcon.Beatmap, new Color4(238, 170, 0, 255), _ => OnEditBeatmap?.Invoke(), Key.B, Key.E)
+            {
+                Padding = new MarginPadding { Left = WEDGE_WIDTH },
+            });
+            buttonsEdit.Add(new MainMenuButton(SkinEditorStrings.SkinEditor.ToLower(), @"button-default-select", OsuIcon.SkinB, new Color4(220, 160, 0, 255), _ => OnEditSkin?.Invoke(), Key.S));
             buttonsEdit.ForEach(b => b.VisibleState = ButtonSystemState.Edit);
 
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P, Key.M, Key.L));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-play-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => State = ButtonSystemState.Edit, 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.Beatmap, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), _ => State = ButtonSystemState.Play, Key.P, Key.M, Key.L)
+            {
+                Padding = new MarginPadding { Left = WEDGE_WIDTH },
+            });
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-play-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), _ => State = ButtonSystemState.Edit, Key.E));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.Beatmap, new Color4(165, 204, 0, 255), _ => OnBeatmapListing?.Invoke(), Key.B, Key.D));
 
             if (host.CanExit)
-                buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
+                buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), _ => OnExit?.Invoke(), Key.Q));
 
             buttonArea.AddRange(buttonsPlay);
             buttonArea.AddRange(buttonsEdit);
@@ -164,7 +179,7 @@ private void load(AudioManager audio, IdleTracker? idleTracker, GameHost host)
             sampleLogoSwoosh = audio.Samples.Get(@"Menu/osu-logo-swoosh");
         }
 
-        private void onMultiplayer()
+        private void onMultiplayer(MainMenuButton _)
         {
             if (api.State.Value != APIState.Online)
             {
@@ -175,7 +190,7 @@ private void onMultiplayer()
             OnMultiplayer?.Invoke();
         }
 
-        private void onPlaylists()
+        private void onPlaylists(MainMenuButton _)
         {
             if (api.State.Value != APIState.Online)
             {
@@ -186,6 +201,20 @@ private void onPlaylists()
             OnPlaylists?.Invoke();
         }
 
+        private void onDailyChallenge(MainMenuButton button)
+        {
+            if (api.State.Value != APIState.Online)
+            {
+                loginOverlay?.Show();
+                return;
+            }
+
+            var dailyChallengeButton = (DailyChallengeButton)button;
+
+            if (dailyChallengeButton.Room != null)
+                OnDailyChallenge?.Invoke(dailyChallengeButton.Room);
+        }
+
         private void updateIdleState(bool isIdle)
         {
             if (!ReturnToTopOnIdle)
diff --git a/osu.Game/Screens/Menu/DailyChallengeButton.cs b/osu.Game/Screens/Menu/DailyChallengeButton.cs
new file mode 100644
index 000000000000..c365994736bb
--- /dev/null
+++ b/osu.Game/Screens/Menu/DailyChallengeButton.cs
@@ -0,0 +1,221 @@
+// 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.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Threading;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps.Drawables.Cards;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Localisation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Metadata;
+using osu.Game.Online.Rooms;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+using osuTK.Input;
+
+namespace osu.Game.Screens.Menu
+{
+    public partial class DailyChallengeButton : MainMenuButton, IHasCustomTooltip<APIBeatmapSet?>
+    {
+        public Room? Room { get; private set; }
+
+        private readonly OsuSpriteText countdown;
+        private ScheduledDelegate? scheduledCountdownUpdate;
+
+        private UpdateableOnlineBeatmapSetCover cover = null!;
+        private IBindable<DailyChallengeInfo?> info = null!;
+
+        private Box gradientLayer = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        public DailyChallengeButton(string sampleName, Color4 colour, Action<MainMenuButton>? clickAction = null, params Key[] triggerKeys)
+            : base(ButtonSystemStrings.DailyChallenge, sampleName, OsuIcon.DailyChallenge, colour, clickAction, triggerKeys)
+        {
+            BaseSize = new Vector2(ButtonSystem.BUTTON_WIDTH * 1.3f, ButtonArea.BUTTON_AREA_HEIGHT);
+
+            Content.Add(countdown = new OsuSpriteText
+            {
+                Shadow = true,
+                AllowMultiline = false,
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                Margin = new MarginPadding
+                {
+                    Left = -3,
+                    Bottom = 22,
+                },
+                Font = OsuFont.Default.With(size: 12),
+                Alpha = 0,
+            });
+        }
+
+        protected override Drawable CreateBackground(Colour4 accentColour) => new BufferedContainer
+        {
+            Children = new Drawable[]
+            {
+                cover = new UpdateableOnlineBeatmapSetCover(timeBeforeLoad: 0, timeBeforeUnload: 600_000)
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.Both,
+                },
+                gradientLayer = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = ColourInfo.GradientVertical(accentColour.Opacity(0.2f), accentColour),
+                    Blending = BlendingParameters.Additive,
+                },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = accentColour.Opacity(0.7f)
+                },
+            },
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(MetadataClient metadataClient)
+        {
+            info = metadataClient.DailyChallengeInfo.GetBoundCopy();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            info.BindValueChanged(updateDisplay, true);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (cover.LatestTransformEndTime == Time.Current)
+            {
+                const double duration = 3000;
+
+                float scale = 1 + RNG.NextSingle();
+
+                cover.ScaleTo(scale, duration, Easing.InOutSine)
+                     .RotateTo(RNG.NextSingle(-4, 4) * (scale - 1), duration, Easing.InOutSine)
+                     .MoveTo(new Vector2(
+                         RNG.NextSingle(-0.5f, 0.5f) * (scale - 1),
+                         RNG.NextSingle(-0.5f, 0.5f) * (scale - 1)
+                     ), duration, Easing.InOutSine);
+
+                gradientLayer.FadeIn(duration / 2)
+                             .Then()
+                             .FadeOut(duration / 2);
+            }
+        }
+
+        private void updateDisplay(ValueChangedEvent<DailyChallengeInfo?> info)
+        {
+            UpdateState();
+
+            scheduledCountdownUpdate?.Cancel();
+            scheduledCountdownUpdate = null;
+
+            if (info.NewValue == null)
+            {
+                Room = null;
+                cover.OnlineInfo = TooltipContent = null;
+            }
+            else
+            {
+                var roomRequest = new GetRoomRequest(info.NewValue.Value.RoomID);
+
+                roomRequest.Success += room =>
+                {
+                    Room = room;
+                    cover.OnlineInfo = TooltipContent = room.Playlist.FirstOrDefault()?.Beatmap.BeatmapSet as APIBeatmapSet;
+
+                    updateCountdown();
+                    Scheduler.AddDelayed(updateCountdown, 1000, true);
+                };
+                api.Queue(roomRequest);
+            }
+        }
+
+        private void updateCountdown()
+        {
+            if (Room == null)
+                return;
+
+            var remaining = (Room.EndDate.Value - DateTimeOffset.Now) ?? TimeSpan.Zero;
+
+            if (remaining <= TimeSpan.Zero)
+            {
+                countdown.FadeOut(250, Easing.OutQuint);
+            }
+            else
+            {
+                if (countdown.Alpha == 0)
+                    countdown.FadeIn(250, Easing.OutQuint);
+
+                countdown.Text = remaining.ToString(@"hh\:mm\:ss");
+            }
+        }
+
+        protected override void UpdateState()
+        {
+            if (info.IsNotNull() && info.Value == null)
+            {
+                ContractStyle = 0;
+                State = ButtonState.Contracted;
+                return;
+            }
+
+            base.UpdateState();
+        }
+
+        public ITooltip<APIBeatmapSet?> GetCustomTooltip() => new DailyChallengeTooltip();
+
+        public APIBeatmapSet? TooltipContent { get; private set; }
+
+        internal partial class DailyChallengeTooltip : CompositeDrawable, ITooltip<APIBeatmapSet?>
+        {
+            [Cached]
+            private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+            private APIBeatmapSet? lastContent;
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                AutoSizeAxes = Axes.Both;
+            }
+
+            public void Move(Vector2 pos) => Position = pos;
+
+            public void SetContent(APIBeatmapSet? content)
+            {
+                if (content == lastContent)
+                    return;
+
+                lastContent = content;
+
+                ClearInternal();
+                if (content != null)
+                    AddInternal(new BeatmapCardNano(content));
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 235c5d5c56d0..722e776e3d19 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -147,6 +147,12 @@ private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings
                             OnSolo = loadSoloSongSelect,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new Playlists()),
+                            OnDailyChallenge = room =>
+                            {
+                                Playlists playlistsScreen;
+                                this.Push(playlistsScreen = new Playlists());
+                                playlistsScreen.Join(room);
+                            },
                             OnExit = () =>
                             {
                                 exitConfirmedViaHoldOrClick = true;
diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index 1dc79e9b1ab1..29a661066cc4 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -38,11 +38,8 @@ public partial class MainMenuButton : BeatSyncedContainer, IStateful<ButtonState
 
         public readonly Key[] TriggerKeys;
 
-        private readonly Container iconText;
-        private readonly Container box;
-        private readonly Box boxHoverLayer;
-        private readonly SpriteIcon icon;
-        private readonly string sampleName;
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
 
         /// <summary>
         /// The menu state for which we are visible for (assuming only one).
@@ -59,7 +56,24 @@ public ButtonSystemState VisibleState
         public ButtonSystemState VisibleStateMin = ButtonSystemState.TopLevel;
         public ButtonSystemState VisibleStateMax = ButtonSystemState.TopLevel;
 
-        private readonly Action? clickAction;
+        public new MarginPadding Padding
+        {
+            get => Content.Padding;
+            set => Content.Padding = value;
+        }
+
+        protected Vector2 BaseSize { get; init; } = new Vector2(ButtonSystem.BUTTON_WIDTH, ButtonArea.BUTTON_AREA_HEIGHT);
+
+        private readonly Action<MainMenuButton>? clickAction;
+
+        private readonly Container background;
+        private readonly Drawable backgroundContent;
+        private readonly Box boxHoverLayer;
+        private readonly SpriteIcon icon;
+
+        private Vector2 initialSize => BaseSize + Padding.Total;
+
+        private readonly string sampleName;
         private Sample? sampleClick;
         private Sample? sampleHover;
         private SampleChannel? sampleChannel;
@@ -68,9 +82,9 @@ public ButtonSystemState VisibleState
                                           // Allow keyboard interaction based on state rather than waiting for delayed animations.
                                           || state == ButtonState.Expanded;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => background.ReceivePositionalInputAt(screenSpacePos);
 
-        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action? clickAction = null, float extraWidth = 0, params Key[] triggerKeys)
+        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action<MainMenuButton>? clickAction = null, params Key[] triggerKeys)
         {
             this.sampleName = sampleName;
             this.clickAction = clickAction;
@@ -79,11 +93,9 @@ public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbo
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
 
-            Vector2 boxSize = new Vector2(ButtonSystem.BUTTON_WIDTH + Math.Abs(extraWidth), ButtonArea.BUTTON_AREA_HEIGHT);
-
-            Children = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
-                box = new Container
+                background = new Container
                 {
                     // box needs to be always present to ensure the button is always sized correctly for flow
                     AlwaysPresent = true,
@@ -98,35 +110,46 @@ public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbo
                     },
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Scale = new Vector2(0, 1),
-                    Size = boxSize,
-                    Shear = new Vector2(ButtonSystem.WEDGE_WIDTH / boxSize.Y, 0),
                     Children = new[]
                     {
-                        new Box
+                        backgroundContent = CreateBackground(colour).With(bg =>
                         {
-                            EdgeSmoothness = new Vector2(1.5f, 0),
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = colour,
-                        },
+                            bg.RelativeSizeAxes = Axes.Y;
+                            bg.X = -ButtonSystem.WEDGE_WIDTH;
+                            bg.Anchor = Anchor.Centre;
+                            bg.Origin = Anchor.Centre;
+                        }),
                         boxHoverLayer = new Box
                         {
                             EdgeSmoothness = new Vector2(1.5f, 0),
                             RelativeSizeAxes = Axes.Both,
                             Blending = BlendingParameters.Additive,
                             Colour = Color4.White,
+                            Depth = float.MinValue,
                             Alpha = 0,
                         },
                     }
                 },
-                iconText = new Container
+                content = new Container
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Position = new Vector2(extraWidth / 2, 0),
+                    RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
+                        new OsuSpriteText
+                        {
+                            Shadow = true,
+                            AllowMultiline = false,
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.BottomCentre,
+                            Margin = new MarginPadding
+                            {
+                                Left = -3,
+                                Bottom = 7,
+                            },
+                            Text = text
+                        },
                         icon = new SpriteIcon
                         {
                             Shadow = true,
@@ -136,20 +159,38 @@ public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbo
                             Position = new Vector2(0, 0),
                             Margin = new MarginPadding { Top = -4 },
                             Icon = symbol
-                        },
-                        new OsuSpriteText
-                        {
-                            Shadow = true,
-                            AllowMultiline = false,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Position = new Vector2(0, 35),
-                            Margin = new MarginPadding { Left = -3 },
-                            Text = text
                         }
                     }
                 }
-            };
+            });
+        }
+
+        protected virtual Drawable CreateBackground(Colour4 accentColour) => new Container
+        {
+            Child = new Box
+            {
+                EdgeSmoothness = new Vector2(1.5f, 0),
+                RelativeSizeAxes = Axes.Both,
+                Colour = accentColour,
+            }
+        };
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            background.Shear = new Vector2(ButtonSystem.WEDGE_WIDTH / initialSize.Y, 0);
+
+            // for whatever reason, attempting to size the background "just in time" to cover the visible width
+            // results in gaps when the width changes are quick (only visible when testing menu at 100% speed, not visible slowed down).
+            // to ensure there's no missing backdrop, just use a ballpark that should be enough to always cover the width and then some.
+            // note that while on a code inspections it would seem that `1.5 * initialSize.X` would be enough, elastic usings are used in this button
+            // (which can exceed the [0;1] range during interpolation).
+            backgroundContent.Width = 2 * initialSize.X;
+            backgroundContent.Shear = -background.Shear;
+
+            animateState();
+            FinishTransforms(true);
         }
 
         private bool rightward;
@@ -179,15 +220,15 @@ protected override bool OnHover(HoverEvent e)
         {
             if (State != ButtonState.Expanded) return true;
 
-            sampleHover?.Play();
-
-            box.ScaleTo(new Vector2(1.5f, 1), 500, Easing.OutElastic);
-
             double duration = TimeUntilNextBeat;
 
             icon.ClearTransforms();
             icon.RotateTo(rightward ? -BOUNCE_ROTATION : BOUNCE_ROTATION, duration, Easing.InOutSine);
             icon.ScaleTo(new Vector2(HOVER_SCALE, HOVER_SCALE * BOUNCE_COMPRESSION), duration, Easing.Out);
+
+            sampleHover?.Play();
+            background.ResizeTo(Vector2.Multiply(initialSize, new Vector2(1.5f, 1)), 500, Easing.OutElastic);
+
             return true;
         }
 
@@ -199,7 +240,7 @@ protected override void OnHoverLost(HoverLostEvent e)
             icon.ScaleTo(Vector2.One, 200, Easing.Out);
 
             if (State == ButtonState.Expanded)
-                box.ScaleTo(new Vector2(1, 1), 500, Easing.OutElastic);
+                background.ResizeTo(initialSize, 500, Easing.OutElastic);
         }
 
         [BackgroundDependencyLoader]
@@ -246,7 +287,7 @@ private void trigger()
             sampleChannel = sampleClick?.GetChannel();
             sampleChannel?.Play();
 
-            clickAction?.Invoke();
+            clickAction?.Invoke(this);
 
             boxHoverLayer.ClearTransforms();
             boxHoverLayer.Alpha = 0.9f;
@@ -254,13 +295,13 @@ private void trigger()
         }
 
         public override bool HandleNonPositionalInput => state == ButtonState.Expanded;
-        public override bool HandlePositionalInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
+        public override bool HandlePositionalInput => state != ButtonState.Exploded && background.Width / initialSize.X >= 0.8f;
 
         public void StopSamplePlayback() => sampleChannel?.Stop();
 
         protected override void Update()
         {
-            iconText.Alpha = Math.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1);
+            content.Alpha = Math.Clamp((background.Width / initialSize.X - 0.5f) / 0.3f, 0, 1);
             base.Update();
         }
 
@@ -279,67 +320,84 @@ public ButtonState State
 
                 state = value;
 
-                switch (state)
-                {
-                    case ButtonState.Contracted:
-                        switch (ContractStyle)
-                        {
-                            default:
-                                box.ScaleTo(new Vector2(0, 1), 500, Easing.OutExpo);
-                                this.FadeOut(500);
-                                break;
-
-                            case 1:
-                                box.ScaleTo(new Vector2(0, 1), 400, Easing.InSine);
-                                this.FadeOut(800);
-                                break;
-                        }
+                animateState();
 
-                        break;
+                StateChanged?.Invoke(State);
+            }
+        }
 
-                    case ButtonState.Expanded:
-                        const int expand_duration = 500;
-                        box.ScaleTo(new Vector2(1, 1), expand_duration, Easing.OutExpo);
-                        this.FadeIn(expand_duration / 6f);
-                        break;
+        private void animateState()
+        {
+            switch (state)
+            {
+                case ButtonState.Contracted:
+                    switch (ContractStyle)
+                    {
+                        default:
+                            background.ResizeTo(Vector2.Multiply(initialSize, new Vector2(0, 1)), 500, Easing.OutExpo);
+                            this.FadeOut(500);
+                            break;
+
+                        case 1:
+                            background.ResizeTo(Vector2.Multiply(initialSize, new Vector2(0, 1)), 400, Easing.InSine);
+                            this.FadeOut(800);
+                            break;
+                    }
 
-                    case ButtonState.Exploded:
-                        const int explode_duration = 200;
-                        box.ScaleTo(new Vector2(2, 1), explode_duration, Easing.OutExpo);
-                        this.FadeOut(explode_duration / 4f * 3);
-                        break;
-                }
+                    break;
 
-                StateChanged?.Invoke(State);
+                case ButtonState.Expanded:
+                    const int expand_duration = 500;
+                    background.ResizeTo(initialSize, expand_duration, Easing.OutExpo);
+                    this.FadeIn(expand_duration / 6f);
+                    break;
+
+                case ButtonState.Exploded:
+                    const int explode_duration = 200;
+                    background.ResizeTo(Vector2.Multiply(initialSize, new Vector2(2, 1)), explode_duration, Easing.OutExpo);
+                    this.FadeOut(explode_duration / 4f * 3);
+                    break;
             }
         }
 
+        private ButtonSystemState buttonSystemState;
+
         public ButtonSystemState ButtonSystemState
         {
+            get => buttonSystemState;
             set
             {
-                ContractStyle = 0;
+                if (buttonSystemState == value)
+                    return;
 
-                switch (value)
-                {
-                    case ButtonSystemState.Initial:
-                        State = ButtonState.Contracted;
-                        break;
+                buttonSystemState = value;
+                UpdateState();
+            }
+        }
 
-                    case ButtonSystemState.EnteringMode:
-                        ContractStyle = 1;
+        protected virtual void UpdateState()
+        {
+            ContractStyle = 0;
+
+            switch (ButtonSystemState)
+            {
+                case ButtonSystemState.Initial:
+                    State = ButtonState.Contracted;
+                    break;
+
+                case ButtonSystemState.EnteringMode:
+                    ContractStyle = 1;
+                    State = ButtonState.Contracted;
+                    break;
+
+                default:
+                    if (ButtonSystemState <= VisibleStateMax && ButtonSystemState >= VisibleStateMin)
+                        State = ButtonState.Expanded;
+                    else if (ButtonSystemState < VisibleStateMin)
                         State = ButtonState.Contracted;
-                        break;
-
-                    default:
-                        if (value <= VisibleStateMax && value >= VisibleStateMin)
-                            State = ButtonState.Expanded;
-                        else if (value < VisibleStateMin)
-                            State = ButtonState.Contracted;
-                        else
-                            State = ButtonState.Exploded;
-                        break;
-                }
+                    else
+                        State = ButtonState.Exploded;
+                    break;
             }
         }
     }
diff --git a/osu.Game/Screens/Menu/OnlineMenuBanner.cs b/osu.Game/Screens/Menu/OnlineMenuBanner.cs
index 6f98b73939d0..b9d269c82a27 100644
--- a/osu.Game/Screens/Menu/OnlineMenuBanner.cs
+++ b/osu.Game/Screens/Menu/OnlineMenuBanner.cs
@@ -13,6 +13,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -111,7 +112,9 @@ private void loadNewImages(ValueChangedEvent<APIMenuContent> images)
 
                 content.AddRange(loaded);
 
-                displayIndex = -1;
+                // Many users don't spend much time at the main menu, so let's randomise where in the
+                // carousel of available images we start at to give each a fair chance.
+                displayIndex = RNG.Next(0, images.NewValue.Images.Length) - 1;
                 showNext();
             }, (cancellationTokenSource ??= new CancellationTokenSource()).Token);
         }
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 1b8e2d8be6da..ab32ca255852 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -22,6 +22,7 @@
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Collections;
 using osu.Game.Database;
 using osu.Game.Graphics;
@@ -81,7 +82,7 @@ public partial class DrawableRoomPlaylistItem : OsuRearrangeableListItem<Playlis
         private Mod[] requiredMods = Array.Empty<Mod>();
 
         private Container maskingContainer;
-        private Container difficultyIconContainer;
+        private FillFlowContainer difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
         private ExplicitContentBeatmapBadge explicitContent;
@@ -93,6 +94,7 @@ public partial class DrawableRoomPlaylistItem : OsuRearrangeableListItem<Playlis
         private Drawable removeButton;
         private PanelBackground panelBackground;
         private FillFlowContainer mainFillFlow;
+        private BeatmapCardThumbnail thumbnail;
 
         [Resolved]
         private RealmAccess realm { get; set; }
@@ -282,10 +284,23 @@ private void refresh()
 
             if (beatmap != null)
             {
-                difficultyIconContainer.Child = new DifficultyIcon(beatmap, ruleset, requiredMods)
+                difficultyIconContainer.Children = new Drawable[]
                 {
-                    Size = new Vector2(icon_height),
-                    TooltipType = DifficultyIconTooltipType.Extended,
+                    thumbnail = new BeatmapCardThumbnail(beatmap.BeatmapSet!, (IBeatmapSetOnlineInfo)beatmap.BeatmapSet!)
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Width = 60,
+                        RelativeSizeAxes = Axes.Y,
+                        Dimmed = { Value = IsHovered }
+                    },
+                    new DifficultyIcon(beatmap, ruleset, requiredMods)
+                    {
+                        Size = new Vector2(icon_height),
+                        TooltipType = DifficultyIconTooltipType.Extended,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    },
                 };
             }
             else
@@ -329,7 +344,7 @@ private void refresh()
 
         protected override Drawable CreateContent()
         {
-            Action<SpriteText> fontParameters = s => s.Font = OsuFont.Default.With(weight: FontWeight.SemiBold);
+            Action<SpriteText> fontParameters = s => s.Font = OsuFont.Default.With(size: 14, weight: FontWeight.SemiBold);
 
             return maskingContainer = new Container
             {
@@ -364,12 +379,15 @@ protected override Drawable CreateContent()
                         {
                             new Drawable[]
                             {
-                                difficultyIconContainer = new Container
+                                difficultyIconContainer = new FillFlowContainer
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
-                                    AutoSizeAxes = Axes.Both,
-                                    Margin = new MarginPadding { Left = 8, Right = 8 },
+                                    AutoSizeAxes = Axes.X,
+                                    RelativeSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(4),
+                                    Margin = new MarginPadding { Right = 4 },
                                 },
                                 mainFillFlow = new MainFlow(() => SelectedItem.Value == Model || !AllowSelection)
                                 {
@@ -398,6 +416,8 @@ protected override Drawable CreateContent()
                                                 new FillFlowContainer
                                                 {
                                                     AutoSizeAxes = Axes.Both,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Origin = Anchor.CentreLeft,
                                                     Direction = FillDirection.Horizontal,
                                                     Spacing = new Vector2(10f, 0),
                                                     Children = new Drawable[]
@@ -420,7 +440,8 @@ protected override Drawable CreateContent()
                                                     Child = modDisplay = new ModDisplay
                                                     {
                                                         Scale = new Vector2(0.4f),
-                                                        ExpansionMode = ExpansionMode.AlwaysExpanded
+                                                        ExpansionMode = ExpansionMode.AlwaysExpanded,
+                                                        Margin = new MarginPadding { Vertical = -6 },
                                                     }
                                                 }
                                             }
@@ -484,6 +505,20 @@ private IEnumerable<Drawable> createButtons() => new[]
             },
         };
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            if (thumbnail != null)
+                thumbnail.Dimmed.Value = true;
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            if (thumbnail != null)
+                thumbnail.Dimmed.Value = false;
+            base.OnHoverLost(e);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             if (AllowSelection && valid.Value)
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index aae82b672149..96d698a18440 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -1,13 +1,11 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
-using osu.Game.Online.Rooms.RoomStatuses;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
@@ -36,18 +34,10 @@ protected override void LoadComplete()
 
         private void updateDisplay()
         {
-            RoomStatus status = getDisplayStatus();
+            RoomStatus status = Status.Value;
 
             Pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
             TextFlow.Text = status.Message;
         }
-
-        private RoomStatus getDisplayStatus()
-        {
-            if (EndDate.Value < DateTimeOffset.Now)
-                return new RoomStatusEnded();
-
-            return Status.Value;
-        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 66bbf92e5803..2f6a220c82a5 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -248,21 +248,21 @@ protected override void LoadComplete()
             {
                 base.LoadComplete();
 
-                ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(passwordTextBox));
+                ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(passwordTextBox));
                 passwordTextBox.OnCommit += (_, _) => performJoin();
             }
 
             private void performJoin()
             {
                 lounge?.Join(room, passwordTextBox.Text, null, joinFailed);
-                GetContainingInputManager().TriggerFocusContention(passwordTextBox);
+                GetContainingFocusManager().TriggerFocusContention(passwordTextBox);
             }
 
             private void joinFailed(string error) => Schedule(() =>
             {
                 passwordTextBox.Text = string.Empty;
 
-                GetContainingInputManager().ChangeFocus(passwordTextBox);
+                GetContainingFocusManager().ChangeFocus(passwordTextBox);
 
                 errorText.Text = error;
                 errorText
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs
index 995fce085ef0..477336e8ea91 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs
@@ -4,6 +4,8 @@
 #nullable disable
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -78,14 +80,17 @@ public GameTypePickerItem(MatchType value)
                             },
                         },
                     },
-                    new HoverClickSounds(),
+                    new HoverSounds(HoverSampleSet.TabSelect),
                 };
             }
 
+            private Sample selectSample;
+
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OsuColour colours, AudioManager audio)
             {
                 selection.Colour = colours.Yellow;
+                selectSample = audio.Samples.Get(@"UI/tabselect-select");
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -109,6 +114,8 @@ protected override void OnDeactivated()
             {
                 selection.FadeOut(transition_duration, Easing.OutQuint);
             }
+
+            protected override void OnActivatedByUser() => selectSample.Play();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 66acd6d1b056..5446211ced3f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -486,16 +486,16 @@ private enum StartMode
             Off = 0,
 
             [Description("30 seconds")]
-            Seconds_30 = 30,
+            Seconds30 = 30,
 
             [Description("1 minute")]
-            Seconds_60 = 60,
+            Seconds60 = 60,
 
             [Description("3 minutes")]
-            Seconds_180 = 180,
+            Seconds180 = 180,
 
             [Description("5 minutes")]
-            Seconds_300 = 300
+            Seconds300 = 300
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerTeamResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerTeamResultsScreen.cs
index a8c513603c51..ab83860ba70a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerTeamResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerTeamResultsScreen.cs
@@ -1,8 +1,6 @@
 // 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 System.Collections.Generic;
 using System.Linq;
@@ -28,8 +26,8 @@ public partial class MultiplayerTeamResultsScreen : MultiplayerResultsScreen
     {
         private readonly SortedDictionary<int, BindableLong> teamScores;
 
-        private Container winnerBackground;
-        private Drawable winnerText;
+        private Container winnerBackground = null!;
+        private Drawable winnerText = null!;
 
         public MultiplayerTeamResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem, SortedDictionary<int, BindableLong> teamScores)
             : base(score, roomId, playlistItem)
@@ -41,7 +39,7 @@ public MultiplayerTeamResultsScreen(ScoreInfo score, long roomId, PlaylistItem p
         }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
index 2afc187e406c..c240bbea0c13 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
@@ -1,8 +1,6 @@
 // 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 System.Collections.Generic;
 using osu.Game.Online.API;
@@ -25,8 +23,8 @@ protected override void LoadComplete()
             Scheduler.AddDelayed(() => StatisticsPanel.ToggleVisibility(), 1000);
         }
 
-        protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
+        protected override APIRequest? FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
-        protected override APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
+        protected override APIRequest? FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index e2159f0e3b37..cb00763e6b78 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -244,10 +244,19 @@ protected override void StartGameplay(int userId, SpectatorGameplayState spectat
             playerArea.LoadScore(spectatorGameplayState.Score);
         });
 
-        protected override void FailGameplay(int userId)
+        protected override void FailGameplay(int userId) => Schedule(() =>
         {
             // We probably want to visualise this in the future.
-        }
+
+            var instance = instances.Single(i => i.UserId == userId);
+            syncManager.RemoveManagedClock(instance.SpectatorPlayerClock);
+        });
+
+        protected override void PassGameplay(int userId) => Schedule(() =>
+        {
+            var instance = instances.Single(i => i.UserId == userId);
+            syncManager.RemoveManagedClock(instance.SpectatorPlayerClock);
+        });
 
         protected override void QuitGameplay(int userId) => Schedule(() =>
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
index fd61b60fe471..163810208911 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
@@ -76,6 +76,7 @@ public SpectatorPlayerClock CreateManagedClock()
         public void RemoveManagedClock(SpectatorPlayerClock clock)
         {
             playerClocks.Remove(clock);
+            Logger.Log($"Removing managed clock from {nameof(SpectatorSyncManager)} ({playerClocks.Count} remain)");
             clock.IsRunning = false;
         }
 
@@ -130,7 +131,7 @@ bool performStart()
         }
 
         /// <summary>
-        /// Updates the catchup states of all player clocks clocks.
+        /// Updates the catchup states of all player clocks.
         /// </summary>
         private void updatePlayerCatchup()
         {
@@ -176,7 +177,9 @@ private void updatePlayerCatchup()
         /// </summary>
         private void updateMasterState()
         {
-            MasterClockState newState = playerClocks.Any(s => !s.IsCatchingUp) ? MasterClockState.Synchronised : MasterClockState.TooFarAhead;
+            // Clocks are removed as players complete the beatmap.
+            // Once there are no clocks we want to make sure the track plays out to the end.
+            MasterClockState newState = playerClocks.Count == 0 || playerClocks.Any(s => !s.IsCatchingUp) ? MasterClockState.Synchronised : MasterClockState.TooFarAhead;
 
             if (masterState == newState)
                 return;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index f1d2384c2f1a..9e615ffa9849 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -1,6 +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 osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Lounge;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
@@ -10,5 +11,7 @@ public partial class Playlists : OnlinePlayScreen
         protected override string ScreenTitle => "Playlists";
 
         protected override LoungeSubScreen CreateLounge() => new PlaylistsLoungeSubScreen();
+
+        public void Join(Room room) => Schedule(() => Lounge.Join(room, string.Empty));
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
index add7aee8cdea..fdb83b5ae81d 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
@@ -1,13 +1,10 @@
 // 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 System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,23 +22,23 @@ public partial class PlaylistsResultsScreen : ResultsScreen
         private readonly long roomId;
         private readonly PlaylistItem playlistItem;
 
-        protected LoadingSpinner LeftSpinner { get; private set; }
-        protected LoadingSpinner CentreSpinner { get; private set; }
-        protected LoadingSpinner RightSpinner { get; private set; }
+        protected LoadingSpinner LeftSpinner { get; private set; } = null!;
+        protected LoadingSpinner CentreSpinner { get; private set; } = null!;
+        protected LoadingSpinner RightSpinner { get; private set; } = null!;
 
-        private MultiplayerScores higherScores;
-        private MultiplayerScores lowerScores;
+        private MultiplayerScores? higherScores;
+        private MultiplayerScores? lowerScores;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private ScoreManager scoreManager { get; set; }
+        private ScoreManager scoreManager { get; set; } = null!;
 
         [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private RulesetStore rulesets { get; set; } = null!;
 
-        public PlaylistsResultsScreen([CanBeNull] ScoreInfo score, long roomId, PlaylistItem playlistItem)
+        public PlaylistsResultsScreen(ScoreInfo? score, long roomId, PlaylistItem playlistItem)
             : base(score)
         {
             this.roomId = roomId;
@@ -123,11 +120,11 @@ protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresC
             return userScoreReq;
         }
 
-        protected override APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback)
+        protected override APIRequest? FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             Debug.Assert(direction == 1 || direction == -1);
 
-            MultiplayerScores pivot = direction == -1 ? higherScores : lowerScores;
+            MultiplayerScores? pivot = direction == -1 ? higherScores : lowerScores;
 
             if (pivot?.Cursor == null)
                 return null;
@@ -147,7 +144,7 @@ protected override APIRequest FetchNextPage(int direction, Action<IEnumerable<Sc
         /// <param name="scoresCallback">The callback to perform with the resulting scores.</param>
         /// <param name="pivot">An optional score pivot to retrieve scores around. Can be null to retrieve scores from the highest score.</param>
         /// <returns>The indexing <see cref="APIRequest"/>.</returns>
-        private APIRequest createIndexRequest(Action<IEnumerable<ScoreInfo>> scoresCallback, [CanBeNull] MultiplayerScores pivot = null)
+        private APIRequest createIndexRequest(Action<IEnumerable<ScoreInfo>> scoresCallback, MultiplayerScores? pivot = null)
         {
             var indexReq = pivot != null
                 ? new IndexPlaylistScoresRequest(roomId, playlistItem.ID, pivot.Cursor, pivot.Params)
@@ -180,7 +177,7 @@ private APIRequest createIndexRequest(Action<IEnumerable<ScoreInfo>> scoresCallb
         /// <param name="callback">The callback to invoke with the final <see cref="ScoreInfo"/>s.</param>
         /// <param name="scores">The <see cref="MultiplayerScore"/>s that were retrieved from <see cref="APIRequest"/>s.</param>
         /// <param name="pivot">An optional pivot around which the scores were retrieved.</param>
-        private void performSuccessCallback([NotNull] Action<IEnumerable<ScoreInfo>> callback, [NotNull] List<MultiplayerScore> scores, [CanBeNull] MultiplayerScores pivot = null) => Schedule(() =>
+        private void performSuccessCallback(Action<IEnumerable<ScoreInfo>> callback, List<MultiplayerScore> scores, MultiplayerScores? pivot = null) => Schedule(() =>
         {
             var scoreInfos = scores.Select(s => s.CreateScoreInfo(scoreManager, rulesets, playlistItem, Beatmap.Value.BeatmapInfo)).OrderByTotalScore().ToArray();
 
@@ -201,7 +198,7 @@ private void performSuccessCallback([NotNull] Action<IEnumerable<ScoreInfo>> cal
             hideLoadingSpinners(pivot);
         });
 
-        private void hideLoadingSpinners([CanBeNull] MultiplayerScores pivot = null)
+        private void hideLoadingSpinners(MultiplayerScores? pivot = null)
         {
             CentreSpinner.Hide();
 
@@ -217,7 +214,7 @@ private void hideLoadingSpinners([CanBeNull] MultiplayerScores pivot = null)
         /// <param name="scores">The <see cref="MultiplayerScores"/> to set positions on.</param>
         /// <param name="pivot">The pivot.</param>
         /// <param name="increment">The amount to increment the pivot position by for each <see cref="MultiplayerScore"/> in <paramref name="scores"/>.</param>
-        private void setPositions([NotNull] MultiplayerScores scores, [CanBeNull] MultiplayerScores pivot, int increment)
+        private void setPositions(MultiplayerScores scores, MultiplayerScores? pivot, int increment)
             => setPositions(scores, pivot?.Scores[^1].Position ?? 0, increment);
 
         /// <summary>
@@ -226,7 +223,7 @@ private void setPositions([NotNull] MultiplayerScores scores, [CanBeNull] Multip
         /// <param name="scores">The <see cref="MultiplayerScores"/> to set positions on.</param>
         /// <param name="pivotPosition">The pivot position.</param>
         /// <param name="increment">The amount to increment the pivot position by for each <see cref="MultiplayerScore"/> in <paramref name="scores"/>.</param>
-        private void setPositions([NotNull] MultiplayerScores scores, int pivotPosition, int increment)
+        private void setPositions(MultiplayerScores scores, int pivotPosition, int increment)
         {
             foreach (var s in scores.Scores)
             {
diff --git a/osu.Game/Screens/Play/Break/BlurredIcon.cs b/osu.Game/Screens/Play/Break/BlurredIcon.cs
index 2bf59ea63b5a..9cd617d3e318 100644
--- a/osu.Game/Screens/Play/Break/BlurredIcon.cs
+++ b/osu.Game/Screens/Play/Break/BlurredIcon.cs
@@ -1,52 +1,16 @@
-// 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.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osuTK;
 
 namespace osu.Game.Screens.Play.Break
 {
-    public partial class BlurredIcon : BufferedContainer
+    public partial class BlurredIcon : GlowIcon
     {
-        private readonly SpriteIcon icon;
-
-        public IconUsage Icon
-        {
-            set => icon.Icon = value;
-            get => icon.Icon;
-        }
-
-        public override Vector2 Size
-        {
-            set
-            {
-                icon.Size = value;
-                base.Size = value + BlurSigma * 5;
-                ForceRedraw();
-            }
-            get => base.Size;
-        }
-
         public BlurredIcon()
-            : base(cachedFrameBuffer: true)
-        {
-            RelativePositionAxes = Axes.X;
-            Child = icon = new SpriteIcon
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Shadow = false,
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
         {
-            Colour = colours.BlueLighter;
+            EffectBlending = BlendingParameters.Additive;
+            DrawOriginal = false;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/Break/BreakArrows.cs b/osu.Game/Screens/Play/Break/BreakArrows.cs
index 41277c75579d..40474a7137c7 100644
--- a/osu.Game/Screens/Play/Break/BreakArrows.cs
+++ b/osu.Game/Screens/Play/Break/BreakArrows.cs
@@ -18,7 +18,7 @@ public partial class BreakArrows : CompositeDrawable
 
         private const int blurred_icon_blur_sigma = 20;
         private const int blurred_icon_size = 130;
-        private const float blurred_icon_final_offset = 0.35f;
+        private const float blurred_icon_final_offset = 0.38f;
         private const float blurred_icon_offscreen_offset = 0.7f;
 
         private readonly GlowIcon leftGlowIcon;
diff --git a/osu.Game/Screens/Play/Break/GlowIcon.cs b/osu.Game/Screens/Play/Break/GlowIcon.cs
index 8e2b9da0ada5..a68cfdac427f 100644
--- a/osu.Game/Screens/Play/Break/GlowIcon.cs
+++ b/osu.Game/Screens/Play/Break/GlowIcon.cs
@@ -3,64 +3,45 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 
 namespace osu.Game.Screens.Play.Break
 {
-    public partial class GlowIcon : Container
+    public partial class GlowIcon : GlowingDrawable
     {
-        private readonly SpriteIcon spriteIcon;
-        private readonly BlurredIcon blurredIcon;
+        private SpriteIcon icon = null!;
 
-        public override Vector2 Size
+        public IconUsage Icon
         {
-            get => base.Size;
-            set
-            {
-                blurredIcon.Size = spriteIcon.Size = value;
-                blurredIcon.ForceRedraw();
-            }
+            set => icon.Icon = value;
+            get => icon.Icon;
         }
 
-        public Vector2 BlurSigma
+        public new Vector2 Size
         {
-            get => blurredIcon.BlurSigma;
-            set => blurredIcon.BlurSigma = value;
-        }
-
-        public IconUsage Icon
-        {
-            get => spriteIcon.Icon;
-            set => spriteIcon.Icon = blurredIcon.Icon = value;
+            set => icon.Size = value;
+            get => icon.Size;
         }
 
         public GlowIcon()
         {
             RelativePositionAxes = Axes.X;
-            AutoSizeAxes = Axes.Both;
-            Children = new Drawable[]
-            {
-                blurredIcon = new BlurredIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                spriteIcon = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Shadow = false,
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            blurredIcon.Colour = colours.Blue;
+            GlowColour = colours.BlueLighter;
         }
+
+        protected override Drawable CreateDrawable() => icon = new SpriteIcon
+        {
+            Origin = Anchor.Centre,
+            Anchor = Anchor.Centre,
+            Shadow = false,
+        };
     }
 }
diff --git a/osu.Game/Screens/Play/DelayedResumeOverlay.cs b/osu.Game/Screens/Play/DelayedResumeOverlay.cs
index 147d48ae0218..8acb94a5af29 100644
--- a/osu.Game/Screens/Play/DelayedResumeOverlay.cs
+++ b/osu.Game/Screens/Play/DelayedResumeOverlay.cs
@@ -11,7 +11,6 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
-using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
@@ -24,8 +23,9 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public partial class DelayedResumeOverlay : ResumeOverlay
     {
-        // todo: this shouldn't define its own colour provider, but nothing in Player screen does, so let's do that for now.
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+        // todo: this shouldn't define its own colour provider, but nothing in DrawableRuleset guarantees this, so let's do it locally for now.
+        // (of note, Player does cache one but any test which uses a DrawableRuleset without Player will fail without this).
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
         private const float outer_size = 200;
         private const float inner_size = 150;
@@ -34,9 +34,10 @@ public partial class DelayedResumeOverlay : ResumeOverlay
 
         private const double countdown_time = 2000;
 
+        private const int total_count = 3;
+
         protected override LocalisableString Message => string.Empty;
 
-        private ScheduledDelegate? scheduledResume;
         private int? countdownCount;
         private double countdownStartTime;
         private bool countdownComplete;
@@ -120,21 +121,17 @@ protected override void PopIn()
             innerContent.FadeIn().ScaleTo(Vector2.Zero).Then().ScaleTo(Vector2.One, 400, Easing.OutElasticHalf);
             countdownComponents.FadeOut().Delay(50).FadeTo(1, 100);
 
+            countdownProgress.Progress = 0;
+
             // Reset states for various components.
             countdownBackground.FadeIn();
             countdownText.FadeIn();
+            countdownText.Text = string.Empty;
             countdownProgress.FadeIn().ScaleTo(1);
 
             countdownComplete = false;
             countdownCount = null;
-            countdownStartTime = Time.Current;
-
-            scheduledResume?.Cancel();
-            scheduledResume = Scheduler.AddDelayed(() =>
-            {
-                countdownComplete = true;
-                Resume();
-            }, countdown_time);
+            countdownStartTime = Time.Current + 200;
         }
 
         protected override void PopOut()
@@ -152,8 +149,6 @@ protected override void PopOut()
             }
             else
                 countdownProgress.FadeOut();
-
-            scheduledResume?.Cancel();
         }
 
         protected override void Update()
@@ -164,12 +159,17 @@ protected override void Update()
 
         private void updateCountdown()
         {
-            double amountTimePassed = Math.Min(countdown_time, Time.Current - countdownStartTime) / countdown_time;
-            int newCount = 3 - (int)Math.Floor(amountTimePassed * 3);
+            if (State.Value == Visibility.Hidden || countdownComplete || Time.Current < countdownStartTime)
+                return;
+
+            double amountTimePassed = Math.Clamp((Time.Current - countdownStartTime) / countdown_time, 0, countdown_time);
+            int newCount = Math.Clamp(total_count - (int)Math.Floor(amountTimePassed * total_count), 0, total_count);
 
             countdownProgress.Progress = amountTimePassed;
             countdownProgress.InnerRadius = progress_stroke_width / progress_size / countdownProgress.Scale.X;
 
+            Alpha = 0.2f + 0.8f * newCount / total_count;
+
             if (countdownCount != newCount)
             {
                 if (newCount > 0)
@@ -191,6 +191,12 @@ private void updateCountdown()
             }
 
             countdownCount = newCount;
+
+            if (countdownCount == 0)
+            {
+                countdownComplete = true;
+                Resume();
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 443863fb2f40..a71a46ec2ac7 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -303,13 +303,13 @@ private void recreateLabels(LabelStyles style)
                     labelEarly.Child = new SpriteIcon
                     {
                         Size = new Vector2(icon_size),
-                        Icon = FontAwesome.Solid.ShippingFast,
+                        Icon = OsuIcon.Hare
                     };
 
                     labelLate.Child = new SpriteIcon
                     {
                         Size = new Vector2(icon_size),
-                        Icon = FontAwesome.Solid.Bicycle,
+                        Icon = OsuIcon.Tortoise
                     };
 
                     break;
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index ba948b516e6e..b37d41e7a20a 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -37,10 +37,13 @@ public Bindable<IReadOnlyList<Mod>> Current
             }
         }
 
+        private readonly bool showExtendedInformation;
         private readonly FillFlowContainer<ModIcon> iconsContainer;
 
-        public ModDisplay()
+        public ModDisplay(bool showExtendedInformation = true)
         {
+            this.showExtendedInformation = showExtendedInformation;
+
             AutoSizeAxes = Axes.Both;
 
             InternalChild = iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
@@ -57,6 +60,9 @@ protected override void LoadComplete()
             Current.BindValueChanged(updateDisplay, true);
 
             iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
+
+            if (ExpansionMode == ExpansionMode.AlwaysExpanded || ExpansionMode == ExpansionMode.AlwaysContracted)
+                FinishTransforms(true);
         }
 
         private void updateDisplay(ValueChangedEvent<IReadOnlyList<Mod>> mods)
@@ -64,7 +70,7 @@ private void updateDisplay(ValueChangedEvent<IReadOnlyList<Mod>> mods)
             iconsContainer.Clear();
 
             foreach (Mod mod in mods.NewValue.AsOrdered())
-                iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+                iconsContainer.Add(new ModIcon(mod, showExtendedInformation: showExtendedInformation) { Scale = new Vector2(0.6f) });
 
             appearTransform();
         }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 2ec2a011a69a..0c0941573c54 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -109,7 +109,10 @@ protected override bool ShouldBeConsideredForInput(Drawable child)
 
         private readonly List<Drawable> hideTargets;
 
-        private readonly Drawable playfieldComponents;
+        /// <summary>
+        /// The container for skin components attached to <see cref="SkinComponentsContainerLookup.TargetArea.Playfield"/>
+        /// </summary>
+        internal readonly Drawable PlayfieldSkinLayer;
 
         public HUDOverlay([CanBeNull] DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
@@ -129,7 +132,7 @@ public HUDOverlay([CanBeNull] DrawableRuleset drawableRuleset, IReadOnlyList<Mod
                 drawableRuleset != null
                     ? (rulesetComponents = new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, })
                     : Empty(),
-                playfieldComponents = drawableRuleset != null
+                PlayfieldSkinLayer = drawableRuleset != null
                     ? new SkinComponentsContainer(new SkinComponentsContainerLookup(SkinComponentsContainerLookup.TargetArea.Playfield, drawableRuleset.Ruleset.RulesetInfo)) { AlwaysPresent = true, }
                     : Empty(),
                 topRightElements = new FillFlowContainer
@@ -171,7 +174,7 @@ public HUDOverlay([CanBeNull] DrawableRuleset drawableRuleset, IReadOnlyList<Mod
                 },
             };
 
-            hideTargets = new List<Drawable> { mainComponents, playfieldComponents, topRightElements };
+            hideTargets = new List<Drawable> { mainComponents, topRightElements };
 
             if (rulesetComponents != null)
                 hideTargets.Add(rulesetComponents);
@@ -247,10 +250,10 @@ protected override void Update()
             {
                 Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
 
-                playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
-                playfieldComponents.Width = (ToLocalSpace(playfieldScreenSpaceDrawQuad.TopRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
-                playfieldComponents.Height = (ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomLeft) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
-                playfieldComponents.Rotation = drawableRuleset.Playfield.Rotation;
+                PlayfieldSkinLayer.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                PlayfieldSkinLayer.Width = (ToLocalSpace(playfieldScreenSpaceDrawQuad.TopRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                PlayfieldSkinLayer.Height = (ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomLeft) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                PlayfieldSkinLayer.Rotation = drawableRuleset.Playfield.Rotation;
             }
 
             float? lowestTopScreenSpaceLeft = null;
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 93bdcb1cab98..b2f0ae5561c8 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -124,7 +124,7 @@ public void Skip()
 
             double skipTarget = skipTargetTime - MINIMUM_SKIP_TIME;
 
-            if (GameplayClock.CurrentTime < 0 && skipTarget > 6000)
+            if (StartTime < -10000 && GameplayClock.CurrentTime < 0 && skipTarget > 6000)
                 // double skip exception for storyboards with very long intros
                 skipTarget = 0;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4fcc52bc5dcd..42ff1d74f3e4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -101,6 +101,11 @@ public abstract partial class Player : ScreenWithBeatmapBackground, ISamplePlayb
         /// </summary>
         public IBindable<bool> ShowingOverlayComponents = new Bindable<bool>();
 
+        // Should match PlayerLoader for consistency. Cached here for the rare case we push a Player
+        // without the loading screen (one such usage is the skin editor's scene library).
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
@@ -1200,6 +1205,7 @@ protected virtual Task ImportScore(Score score)
             var importableScore = score.ScoreInfo.DeepClone();
 
             var imported = scoreManager.Import(importableScore, replayReader);
+            Debug.Assert(imported != null);
 
             imported.PerformRead(s =>
             {
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 4f7e21dddf36..51a0c94ff092 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -113,7 +113,7 @@ protected bool BackgroundBrightnessReduction
             // not ready if the user is hovering one of the panes (logo is excluded), unless they are idle.
             (IsHovered || osuLogo?.IsHovered == true || idleTracker.IsIdle.Value)
             // not ready if the user is dragging a slider or otherwise.
-            && inputManager.DraggedDrawable == null
+            && (inputManager.DraggedDrawable == null || inputManager.DraggedDrawable is OsuLogo)
             // not ready if a focused overlay is visible, like settings.
             && inputManager.FocusedDrawable == null;
 
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
index 88b778fafb66..1fc1155c0b38 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.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 System;
+using System.Numerics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
@@ -11,7 +11,7 @@
 namespace osu.Game.Screens.Play.PlayerSettings
 {
     public partial class PlayerSliderBar<T> : SettingsSlider<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
+        where T : struct, INumber<T>, IMinMaxValue<T>
     {
         public RoundedSliderBar<T> Bar => (RoundedSliderBar<T>)Control;
 
diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index ef27aac1b913..4f665b87e82d 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -137,7 +137,7 @@ private void exportWhenReady(ValueChangedEvent<DownloadState> state)
         {
             if (state.NewValue != DownloadState.LocallyAvailable) return;
 
-            scoreManager.Export(importedScore);
+            if (importedScore != null) scoreManager.Export(importedScore);
 
             this.state.ValueChanged -= exportWhenReady;
         }
diff --git a/osu.Game/Screens/Play/SoloSpectatorScreen.cs b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
index 2db751402c6c..95eb2d4376ed 100644
--- a/osu.Game/Screens/Play/SoloSpectatorScreen.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
@@ -16,6 +16,7 @@
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -138,7 +139,7 @@ private void load(OsuConfigManager config)
                             },
                             automaticDownload = new SettingsCheckbox
                             {
-                                LabelText = "Automatically download beatmaps",
+                                LabelText = OnlineSettingsStrings.AutomaticallyDownloadMissingBeatmaps,
                                 Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps),
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 62226c46ddad..6c5f7fab9e82 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -152,6 +152,10 @@ void handleTokenFailure(Exception exception, bool displayNotification = false)
                                 Logger.Log($"Please ensure that you are using the latest version of the official game releases.\n\n{whatWillHappen}", level: LogLevel.Important);
                                 break;
 
+                            case @"invalid beatmap_hash":
+                                Logger.Log($"This beatmap does not match the online version. Please update or redownload it.\n\n{whatWillHappen}", level: LogLevel.Important);
+                                break;
+
                             case @"expired token":
                                 Logger.Log($"Your system clock is set incorrectly. Please check your system time, date and timezone.\n\n{whatWillHappen}", level: LogLevel.Important);
                                 break;
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs
index 93bc7c41e186..06d127b9729a 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelTopContent.cs
@@ -1,8 +1,6 @@
 // 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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -16,7 +14,7 @@ public partial class ContractedPanelTopContent : CompositeDrawable
     {
         public readonly Bindable<int?> ScorePosition = new Bindable<int?>();
 
-        private OsuSpriteText text;
+        private OsuSpriteText text = null!;
 
         public ContractedPanelTopContent()
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index f04e4a6444cc..cebc54f49028 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -1,8 +1,6 @@
 // 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 System.Collections.Generic;
 using System.Linq;
@@ -93,17 +91,17 @@ public partial class AccuracyCircle : CompositeDrawable
 
         private readonly ScoreInfo score;
 
-        private CircularProgress accuracyCircle;
-        private GradedCircles gradedCircles;
-        private Container<RankBadge> badges;
-        private RankText rankText;
+        private CircularProgress accuracyCircle = null!;
+        private GradedCircles gradedCircles = null!;
+        private Container<RankBadge> badges = null!;
+        private RankText rankText = null!;
 
-        private PoolableSkinnableSample scoreTickSound;
-        private PoolableSkinnableSample badgeTickSound;
-        private PoolableSkinnableSample badgeMaxSound;
-        private PoolableSkinnableSample swooshUpSound;
-        private PoolableSkinnableSample rankImpactSound;
-        private PoolableSkinnableSample rankApplauseSound;
+        private PoolableSkinnableSample? scoreTickSound;
+        private PoolableSkinnableSample? badgeTickSound;
+        private PoolableSkinnableSample? badgeMaxSound;
+        private PoolableSkinnableSample? swooshUpSound;
+        private PoolableSkinnableSample? rankImpactSound;
+        private PoolableSkinnableSample? rankApplauseSound;
 
         private readonly Bindable<double> tickPlaybackRate = new Bindable<double>();
 
@@ -119,7 +117,7 @@ public partial class AccuracyCircle : CompositeDrawable
         private readonly bool withFlair;
 
         private readonly bool isFailedSDueToMisses;
-        private RankText failedSRankText;
+        private RankText failedSRankText = null!;
 
         public AccuracyCircle(ScoreInfo score, bool withFlair = false)
         {
@@ -229,8 +227,8 @@ protected override void LoadComplete()
 
                 this.Delay(swoosh_pre_delay).Schedule(() =>
                 {
-                    swooshUpSound.VolumeTo(swoosh_volume);
-                    swooshUpSound.Play();
+                    swooshUpSound!.VolumeTo(swoosh_volume);
+                    swooshUpSound!.Play();
                 });
             }
 
@@ -287,8 +285,8 @@ protected override void LoadComplete()
                         this.TransformBindableTo(tickPlaybackRate, score_tick_debounce_rate_start);
                         this.TransformBindableTo(tickPlaybackRate, score_tick_debounce_rate_end, ACCURACY_TRANSFORM_DURATION, Easing.OutSine);
 
-                        scoreTickSound.FrequencyTo(1 + targetAccuracy, ACCURACY_TRANSFORM_DURATION, Easing.OutSine);
-                        scoreTickSound.VolumeTo(score_tick_volume_start).Then().VolumeTo(score_tick_volume_end, ACCURACY_TRANSFORM_DURATION, Easing.OutSine);
+                        scoreTickSound!.FrequencyTo(1 + targetAccuracy, ACCURACY_TRANSFORM_DURATION, Easing.OutSine);
+                        scoreTickSound!.VolumeTo(score_tick_volume_start).Then().VolumeTo(score_tick_volume_end, ACCURACY_TRANSFORM_DURATION, Easing.OutSine);
 
                         isTicking = true;
                     });
@@ -314,8 +312,8 @@ protected override void LoadComplete()
                                 {
                                     var dink = badgeNum < badges.Count - 1 ? badgeTickSound : badgeMaxSound;
 
-                                    dink.FrequencyTo(1 + badgeNum++ * 0.05);
-                                    dink.Play();
+                                    dink!.FrequencyTo(1 + badgeNum++ * 0.05);
+                                    dink!.Play();
                                 });
                             }
                         }
@@ -331,7 +329,7 @@ protected override void LoadComplete()
                         Schedule(() =>
                         {
                             isTicking = false;
-                            rankImpactSound.Play();
+                            rankImpactSound!.Play();
                         });
 
                         const double applause_pre_delay = 545f;
@@ -341,8 +339,8 @@ protected override void LoadComplete()
                         {
                             Schedule(() =>
                             {
-                                rankApplauseSound.VolumeTo(applause_volume);
-                                rankApplauseSound.Play();
+                                rankApplauseSound!.VolumeTo(applause_volume);
+                                rankApplauseSound!.Play();
                             });
                         }
                     }
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
index 8aea6045ebb4..0e798c7d6e68 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
@@ -1,8 +1,6 @@
 // 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.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -34,8 +32,8 @@ public partial class RankBadge : CompositeDrawable
 
         public readonly ScoreRank Rank;
 
-        private Drawable rankContainer;
-        private Drawable overlay;
+        private Drawable rankContainer = null!;
+        private Drawable overlay = null!;
 
         /// <summary>
         /// Creates a new <see cref="RankBadge"/>.
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
index b7adcb032fbb..76e59b32b827 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
@@ -1,8 +1,6 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -23,9 +21,9 @@ public partial class RankText : CompositeDrawable
     {
         private readonly ScoreRank rank;
 
-        private BufferedContainer flash;
-        private BufferedContainer superFlash;
-        private GlowingSpriteText rankText;
+        private BufferedContainer flash = null!;
+        private BufferedContainer superFlash = null!;
+        private GlowingSpriteText rankText = null!;
 
         public RankText(ScoreRank rank)
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
index f1f2c47e2062..a4672a475c27 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -1,8 +1,6 @@
 // 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;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -22,7 +20,7 @@ public partial class AccuracyStatistic : StatisticDisplay
     {
         private readonly double accuracy;
 
-        private RollingCounter<double> counter;
+        private RollingCounter<double> counter = null!;
 
         /// <summary>
         /// Creates a new <see cref="AccuracyStatistic"/>.
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
index 6290cee6dabe..7c91a37b7714 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
@@ -1,8 +1,6 @@
 // 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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -22,7 +20,7 @@ public partial class ComboStatistic : CounterStatistic
     {
         private readonly bool isPerfect;
 
-        private Drawable perfectText;
+        private Drawable perfectText = null!;
 
         /// <summary>
         /// Creates a new <see cref="ComboStatistic"/>.
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index 8528dac83b8e..4042724c75f7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -1,8 +1,6 @@
 // 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;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
@@ -21,7 +19,7 @@ public partial class CounterStatistic : StatisticDisplay
         private readonly int count;
         private readonly int? maxCount;
 
-        private RollingCounter<int> counter;
+        private RollingCounter<int> counter = null!;
 
         /// <summary>
         /// Creates a new <see cref="CounterStatistic"/>.
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 0a9c68eafc5d..7ea3cbe91714 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -1,9 +1,8 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -17,6 +16,7 @@
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Scoring;
 using osu.Game.Localisation;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
@@ -30,7 +30,7 @@ public partial class PerformanceStatistic : StatisticDisplay, IHasTooltip
 
         private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
 
-        private RollingCounter<int> counter;
+        private RollingCounter<int> counter = null!;
 
         public PerformanceStatistic(ScoreInfo score)
             : base(BeatmapsetsStrings.ShowScoreboardHeaderspp)
@@ -74,7 +74,7 @@ private void setPerformanceValue(ScoreInfo scoreInfo, double? pp)
                     Alpha = 0.5f;
                     TooltipText = ResultsScreenStrings.NoPPForUnrankedBeatmaps;
                 }
-                else if (scoreInfo.Mods.Any(m => !m.Ranked))
+                else if (hasUnrankedMods(scoreInfo))
                 {
                     Alpha = 0.5f;
                     TooltipText = ResultsScreenStrings.NoPPForUnrankedMods;
@@ -87,6 +87,16 @@ private void setPerformanceValue(ScoreInfo scoreInfo, double? pp)
             }
         }
 
+        private static bool hasUnrankedMods(ScoreInfo scoreInfo)
+        {
+            IEnumerable<Mod> modsToCheck = scoreInfo.Mods;
+
+            if (scoreInfo.IsLegacyScore)
+                modsToCheck = modsToCheck.Where(m => m is not ModClassic);
+
+            return modsToCheck.Any(m => !m.Ranked);
+        }
+
         public override void Appear()
         {
             base.Appear();
@@ -95,7 +105,7 @@ public override void Appear()
 
         protected override void Dispose(bool isDisposing)
         {
-            cancellationTokenSource?.Cancel();
+            cancellationTokenSource.Cancel();
             base.Dispose(isDisposing);
         }
 
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
index 686b6c7d47cb..9de60f013dbd 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
@@ -1,8 +1,6 @@
 // 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.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
@@ -21,10 +19,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     /// </summary>
     public abstract partial class StatisticDisplay : CompositeDrawable
     {
-        protected SpriteText HeaderText { get; private set; }
+        protected SpriteText HeaderText { get; private set; } = null!;
 
         private readonly LocalisableString header;
-        private Drawable content;
+        private Drawable content = null!;
 
         /// <summary>
         /// Creates a new <see cref="StatisticDisplay"/>.
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index e579c3fe512f..44b270db5392 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -1,12 +1,10 @@
 // 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 System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -45,25 +43,24 @@ public abstract partial class ResultsScreen : ScreenWithBeatmapBackground, IKeyB
 
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
-        public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
+        public readonly Bindable<ScoreInfo?> SelectedScore = new Bindable<ScoreInfo?>();
 
-        [CanBeNull]
-        public readonly ScoreInfo Score;
+        public readonly ScoreInfo? Score;
 
-        protected ScorePanelList ScorePanelList { get; private set; }
+        protected ScorePanelList ScorePanelList { get; private set; } = null!;
 
-        protected VerticalScrollContainer VerticalScrollContent { get; private set; }
+        protected VerticalScrollContainer VerticalScrollContent { get; private set; } = null!;
 
-        [Resolved(CanBeNull = true)]
-        private Player player { get; set; }
+        [Resolved]
+        private Player? player { get; set; }
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
-        protected StatisticsPanel StatisticsPanel { get; private set; }
+        protected StatisticsPanel StatisticsPanel { get; private set; } = null!;
 
-        private Drawable bottomPanel;
-        private Container<ScorePanel> detachedPanelContainer;
+        private Drawable bottomPanel = null!;
+        private Container<ScorePanel> detachedPanelContainer = null!;
 
         private bool lastFetchCompleted;
 
@@ -84,9 +81,9 @@ public abstract partial class ResultsScreen : ScreenWithBeatmapBackground, IKeyB
         /// </summary>
         public bool ShowUserStatistics { get; init; }
 
-        private Sample popInSample;
+        private Sample? popInSample;
 
-        protected ResultsScreen([CanBeNull] ScoreInfo score)
+        protected ResultsScreen(ScoreInfo? score)
         {
             Score = score;
 
@@ -182,11 +179,11 @@ private void load(AudioManager audio)
                 Scheduler.AddDelayed(() => OverlayActivationMode.Value = OverlayActivation.All, shouldFlair ? AccuracyCircle.TOTAL_DURATION + 1000 : 0);
             }
 
-            if (AllowWatchingReplay)
+            if (SelectedScore.Value != null && AllowWatchingReplay)
             {
                 buttons.Add(new ReplayDownloadButton(SelectedScore.Value)
                 {
-                    Score = { BindTarget = SelectedScore },
+                    Score = { BindTarget = SelectedScore! },
                     Width = 300
                 });
             }
@@ -225,7 +222,7 @@ protected override void Update()
 
             if (lastFetchCompleted)
             {
-                APIRequest nextPageRequest = null;
+                APIRequest? nextPageRequest = null;
 
                 if (ScorePanelList.IsScrolledToStart)
                     nextPageRequest = FetchNextPage(-1, fetchScoresCallback);
@@ -245,7 +242,7 @@ protected override void Update()
         /// </summary>
         /// <param name="scoresCallback">A callback which should be called when fetching is completed. Scheduling is not required.</param>
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
-        protected virtual APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
+        protected virtual APIRequest? FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
         /// <summary>
         /// Performs a fetch of the next page of scores. This is invoked every frame until a non-null <see cref="APIRequest"/> is returned.
@@ -253,7 +250,7 @@ protected override void Update()
         /// <param name="direction">The fetch direction. -1 to fetch scores greater than the current start of the list, and 1 to fetch scores lower than the current end of the list.</param>
         /// <param name="scoresCallback">A callback which should be called when fetching is completed. Scheduling is not required.</param>
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
-        protected virtual APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
+        protected virtual APIRequest? FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
         /// <summary>
         /// Creates the <see cref="Statistics.StatisticsPanel"/> to be used to display extended information about scores.
@@ -327,12 +324,13 @@ private void addScore(ScoreInfo score)
                 panel.Alpha = 0;
         }
 
-        private ScorePanel detachedPanel;
+        private ScorePanel? detachedPanel;
 
         private void onStatisticsStateChanged(ValueChangedEvent<Visibility> state)
         {
             if (state.NewValue == Visibility.Visible)
             {
+                Debug.Assert(SelectedScore.Value != null);
                 // Detach the panel in its original location, and move into the desired location in the local container.
                 var expandedPanel = ScorePanelList.GetPanelForScore(SelectedScore.Value);
                 var screenSpacePos = expandedPanel.ScreenSpaceDrawQuad.TopLeft;
@@ -390,6 +388,15 @@ public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
 
             switch (e.Action)
             {
+                case GlobalAction.QuickExit:
+                    if (this.IsCurrentScreen())
+                    {
+                        this.Exit();
+                        return true;
+                    }
+
+                    break;
+
                 case GlobalAction.Select:
                     StatisticsPanel.ToggleVisibility();
                     return true;
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 1f7ba3692aa9..e283749e32d1 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -1,10 +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.
 
-#nullable disable
-
 using System;
-using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -83,8 +80,7 @@ public partial class ScorePanel : CompositeDrawable, IStateful<PanelState>
         private static readonly Color4 contracted_top_layer_colour = Color4Extensions.FromHex("#353535");
         private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#353535");
 
-        [CanBeNull]
-        public event Action<PanelState> StateChanged;
+        public event Action<PanelState>? StateChanged;
 
         /// <summary>
         /// The position of the score in the rankings.
@@ -94,28 +90,30 @@ public partial class ScorePanel : CompositeDrawable, IStateful<PanelState>
         /// <summary>
         /// An action to be invoked if this <see cref="ScorePanel"/> is clicked while in an expanded state.
         /// </summary>
-        public Action PostExpandAction;
+        public Action? PostExpandAction;
 
         public readonly ScoreInfo Score;
 
         [Resolved]
-        private OsuGameBase game { get; set; }
+        private OsuGameBase game { get; set; } = null!;
 
-        private AudioContainer audioContent;
+        private AudioContainer audioContent = null!;
 
         private bool displayWithFlair;
 
-        private Container topLayerContainer;
-        private Drawable topLayerBackground;
-        private Container topLayerContentContainer;
-        private Drawable topLayerContent;
+        private Container topLayerContainer = null!;
+        private Drawable topLayerBackground = null!;
+        private Container topLayerContentContainer = null!;
+        private Drawable? topLayerContent;
+
+        private Container middleLayerContainer = null!;
+        private Drawable middleLayerBackground = null!;
+        private Container middleLayerContentContainer = null!;
+        private Drawable? middleLayerContent;
 
-        private Container middleLayerContainer;
-        private Drawable middleLayerBackground;
-        private Container middleLayerContentContainer;
-        private Drawable middleLayerContent;
+        private ScorePanelTrackingContainer? trackingContainer;
 
-        private DrawableSample samplePanelFocus;
+        private DrawableSample? samplePanelFocus;
 
         public ScorePanel(ScoreInfo score, bool isNewLocalScore = false)
         {
@@ -334,8 +332,6 @@ public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
                || topLayerContainer.ReceivePositionalInputAt(screenSpacePos)
                || middleLayerContainer.ReceivePositionalInputAt(screenSpacePos);
 
-        private ScorePanelTrackingContainer trackingContainer;
-
         /// <summary>
         /// Creates a <see cref="ScorePanelTrackingContainer"/> which this <see cref="ScorePanel"/> can reside inside.
         /// The <see cref="ScorePanelTrackingContainer"/> will track the size of this <see cref="ScorePanel"/>.
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 95c90e35a016..e711bed729a7 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -1,14 +1,11 @@
 // 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 System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -64,14 +61,14 @@ public partial class ScorePanelList : CompositeDrawable
         /// <summary>
         /// An action to be invoked if a <see cref="ScorePanel"/> is clicked while in an expanded state.
         /// </summary>
-        public Action PostExpandAction;
+        public Action? PostExpandAction;
 
-        public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
+        public readonly Bindable<ScoreInfo?> SelectedScore = new Bindable<ScoreInfo?>();
 
         private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
         private readonly Flow flow;
         private readonly Scroll scroll;
-        private ScorePanel expandedPanel;
+        private ScorePanel? expandedPanel;
 
         /// <summary>
         /// Creates a new <see cref="ScorePanelList"/>.
@@ -174,7 +171,7 @@ private void displayScore(ScorePanelTrackingContainer trackingContainer)
         /// Brings a <see cref="ScoreInfo"/> to the centre of the screen and expands it.
         /// </summary>
         /// <param name="score">The <see cref="ScoreInfo"/> to present.</param>
-        private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
+        private void selectedScoreChanged(ValueChangedEvent<ScoreInfo?> score)
         {
             // avoid contracting panels unnecessarily when TriggerChange is fired manually.
             if (score.OldValue != null && !score.OldValue.Equals(score.NewValue))
@@ -317,7 +314,7 @@ protected override bool OnKeyDown(KeyDownEvent e)
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            loadCancellationSource?.Cancel();
+            loadCancellationSource.Cancel();
         }
 
         private partial class Flow : FillFlowContainer<ScorePanelTrackingContainer>
@@ -326,11 +323,9 @@ private partial class Flow : FillFlowContainer<ScorePanelTrackingContainer>
 
             public int GetPanelIndex(ScoreInfo score) => applySorting(Children).TakeWhile(s => !s.Panel.Score.Equals(score)).Count();
 
-            [CanBeNull]
-            public ScoreInfo GetPreviousScore(ScoreInfo score) => applySorting(Children).TakeWhile(s => !s.Panel.Score.Equals(score)).LastOrDefault()?.Panel.Score;
+            public ScoreInfo? GetPreviousScore(ScoreInfo score) => applySorting(Children).TakeWhile(s => !s.Panel.Score.Equals(score)).LastOrDefault()?.Panel.Score;
 
-            [CanBeNull]
-            public ScoreInfo GetNextScore(ScoreInfo score) => applySorting(Children).SkipWhile(s => !s.Panel.Score.Equals(score)).ElementAtOrDefault(1)?.Panel.Score;
+            public ScoreInfo? GetNextScore(ScoreInfo score) => applySorting(Children).SkipWhile(s => !s.Panel.Score.Equals(score)).ElementAtOrDefault(1)?.Panel.Score;
 
             private IEnumerable<ScorePanelTrackingContainer> applySorting(IEnumerable<Drawable> drawables) => drawables.OfType<ScorePanelTrackingContainer>()
                                                                                                                        .OrderByDescending(GetLayoutPosition)
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index ee0251b5ac7e..33b4bf976ba0 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -27,7 +27,7 @@ public SoloResultsScreen(ScoreInfo score)
         {
         }
 
-        protected override APIRequest? FetchScores(Action<IEnumerable<ScoreInfo>>? scoresCallback)
+        protected override APIRequest? FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
             Debug.Assert(Score != null);
 
@@ -35,7 +35,7 @@ public SoloResultsScreen(ScoreInfo score)
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.BeatmapInfo, Score.Ruleset);
-            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => !s.MatchesOnlineID(Score)).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
+            getScoreRequest.Success += r => scoresCallback.Invoke(r.Scores.Where(s => !s.MatchesOnlineID(Score)).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
             return getScoreRequest;
         }
 
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 1260ec2339e0..47807a83468f 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -59,7 +59,7 @@ public partial class HitEventTimingDistributionGraph : CompositeDrawable
         /// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
         public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
         {
-            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList();
+            this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsBasic() && e.Result.IsHit()).ToList();
             bins = Enumerable.Range(0, total_timing_distribution_bins).Select(_ => new Dictionary<HitResult, int>()).ToArray<IDictionary<HitResult, int>>();
         }
 
diff --git a/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs b/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
index 8b13f0951c57..b5eed2d12a41 100644
--- a/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
+++ b/osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs
@@ -1,13 +1,10 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
@@ -31,16 +28,16 @@ public partial class PerformanceBreakdownChart : Container
         private readonly ScoreInfo score;
         private readonly IBeatmap playableBeatmap;
 
-        private Drawable spinner;
-        private Drawable content;
-        private GridContainer chart;
-        private OsuSpriteText achievedPerformance;
-        private OsuSpriteText maximumPerformance;
+        private Drawable spinner = null!;
+        private Drawable content = null!;
+        private GridContainer chart = null!;
+        private OsuSpriteText achievedPerformance = null!;
+        private OsuSpriteText maximumPerformance = null!;
 
         private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
 
         [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
+        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
         public PerformanceBreakdownChart(ScoreInfo score, IBeatmap playableBeatmap)
         {
@@ -147,7 +144,7 @@ private void load()
 
             new PerformanceBreakdownCalculator(playableBeatmap, difficultyCache)
                 .CalculateAsync(score, cancellationTokenSource.Token)
-                .ContinueWith(t => Schedule(() => setPerformanceValue(t.GetResultSafely())));
+                .ContinueWith(t => Schedule(() => setPerformanceValue(t.GetResultSafely()!)));
         }
 
         private void setPerformanceValue(PerformanceBreakdown breakdown)
@@ -189,8 +186,7 @@ private void setTotalValues(PerformanceDisplayAttribute attribute, PerformanceDi
             maximumPerformance.Text = Math.Round(perfectAttribute.Value, MidpointRounding.AwayFromZero).ToLocalisableString();
         }
 
-        [CanBeNull]
-        private Drawable[] createAttributeRow(PerformanceDisplayAttribute attribute, PerformanceDisplayAttribute perfectAttribute)
+        private Drawable[]? createAttributeRow(PerformanceDisplayAttribute attribute, PerformanceDisplayAttribute perfectAttribute)
         {
             // Don't display the attribute if its maximum is 0
             // For example, flashlight bonus would be zero if flashlight mod isn't on
@@ -239,7 +235,7 @@ private Drawable[] createAttributeRow(PerformanceDisplayAttribute attribute, Per
 
         protected override void Dispose(bool isDisposing)
         {
-            cancellationTokenSource?.Cancel();
+            cancellationTokenSource.Cancel();
             base.Dispose(isDisposing);
         }
     }
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
index 23ccc3d0b7e3..d8de1b07b56a 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticItem.cs
@@ -1,8 +1,6 @@
 // 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;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -61,7 +59,7 @@ protected SimpleStatisticItem(string name)
     /// </summary>
     public partial class SimpleStatisticItem<TValue> : SimpleStatisticItem
     {
-        private TValue value;
+        private TValue value = default!;
 
         /// <summary>
         /// The statistic's value to be displayed.
@@ -80,7 +78,7 @@ public partial class SimpleStatisticItem<TValue> : SimpleStatisticItem
         /// Used to convert <see cref="Value"/> to a text representation.
         /// Defaults to using <see cref="object.ToString"/>.
         /// </summary>
-        protected virtual string DisplayValue(TValue value) => value.ToString();
+        protected virtual string DisplayValue(TValue value) => value!.ToString() ?? string.Empty;
 
         public SimpleStatisticItem(string name)
             : base(name)
diff --git a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
index 4abf0007a796..da79fdb12b37 100644
--- a/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
+++ b/osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
@@ -1,12 +1,9 @@
 // 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 System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -24,14 +21,14 @@ public partial class SimpleStatisticTable : CompositeDrawable
         private readonly SimpleStatisticItem[] items;
         private readonly int columnCount;
 
-        private FillFlowContainer[] columns;
+        private FillFlowContainer[] columns = null!;
 
         /// <summary>
         /// Creates a statistic row for the supplied <see cref="SimpleStatisticItem"/>s.
         /// </summary>
         /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
         /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
-        public SimpleStatisticTable(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items)
+        public SimpleStatisticTable(int columnCount, IEnumerable<SimpleStatisticItem> items)
         {
             ArgumentOutOfRangeException.ThrowIfNegativeOrZero(columnCount);
 
diff --git a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
index 19bd0c4393da..f9f5254bc28c 100644
--- a/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
+++ b/osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
@@ -1,8 +1,6 @@
 // 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.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -28,19 +26,20 @@ public partial class StatisticsPanel : VisibilityContainer
     {
         public const float SIDE_PADDING = 30;
 
-        public readonly Bindable<ScoreInfo> Score = new Bindable<ScoreInfo>();
+        public readonly Bindable<ScoreInfo?> Score = new Bindable<ScoreInfo?>();
 
         protected override bool StartHidden => true;
 
         [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
+        private BeatmapManager beatmapManager { get; set; } = null!;
 
         private readonly Container content;
         private readonly LoadingSpinner spinner;
 
         private bool wasOpened;
-        private Sample popInSample;
-        private Sample popOutSample;
+        private Sample? popInSample;
+        private Sample? popOutSample;
+        private CancellationTokenSource? loadCancellation;
 
         public StatisticsPanel()
         {
@@ -71,9 +70,7 @@ private void load(AudioManager audio)
             popOutSample = audio.Samples.Get(@"Results/statistics-panel-pop-out");
         }
 
-        private CancellationTokenSource loadCancellation;
-
-        private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
+        private void populateStatistics(ValueChangedEvent<ScoreInfo?> score)
         {
             loadCancellation?.Cancel();
             loadCancellation = null;
@@ -187,7 +184,7 @@ private void populateStatistics(ValueChangedEvent<ScoreInfo> score)
 
                 LoadComponentAsync(container, d =>
                 {
-                    if (!Score.Value.Equals(newScore))
+                    if (Score.Value?.Equals(newScore) != true)
                         return;
 
                     spinner.Hide();
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 43461a48bb1f..8f38ae710c5e 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -85,7 +85,7 @@ private bool checkMatch(FilterCriteria criteria)
 
             match &= criteria.CollectionBeatmapMD5Hashes?.Contains(BeatmapInfo.MD5Hash) ?? true;
             if (match && criteria.RulesetCriteria != null)
-                match &= criteria.RulesetCriteria.Matches(BeatmapInfo);
+                match &= criteria.RulesetCriteria.Matches(BeatmapInfo, criteria);
 
             return match;
         }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 01e58d4ab22f..f725d98342cb 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -28,6 +28,7 @@
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 
@@ -75,6 +76,9 @@ public partial class DrawableCarouselBeatmap : DrawableCarouselItem, IHasContext
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
+
         private IBindable<StarDifficulty?> starDifficultyBindable = null!;
         private CancellationTokenSource? starDifficultyCancellationSource;
 
@@ -185,6 +189,7 @@ protected override void LoadComplete()
             base.LoadComplete();
 
             ruleset.BindValueChanged(_ => updateKeyCount());
+            mods.BindValueChanged(_ => updateKeyCount());
         }
 
         protected override void Selected()
@@ -255,7 +260,7 @@ private void updateKeyCount()
                 ILegacyRuleset legacyRuleset = (ILegacyRuleset)ruleset.Value.CreateInstance();
 
                 keyCountText.Alpha = 1;
-                keyCountText.Text = $"[{legacyRuleset.GetKeyCount(beatmapInfo)}K]";
+                keyCountText.Text = $"[{legacyRuleset.GetKeyCount(beatmapInfo, mods.Value)}K]";
             }
             else
                 keyCountText.Alpha = 0;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 1aba977f44f3..cb820f4da91b 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -199,7 +199,7 @@ private void updateStatistics()
                     // For the time being, the key count is static no matter what, because:
                     // a) The method doesn't have knowledge of the active keymods. Doing so may require considerations for filtering.
                     // b) Using the difficulty adjustment mod to adjust OD doesn't have an effect on conversion.
-                    int keyCount = baseDifficulty == null ? 0 : legacyRuleset.GetKeyCount(BeatmapInfo);
+                    int keyCount = baseDifficulty == null ? 0 : legacyRuleset.GetKeyCount(BeatmapInfo, mods.Value);
 
                     FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania;
                     FirstValue.Value = (keyCount, keyCount);
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 17297c9ebf28..30eb4a849189 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -4,7 +4,10 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -22,6 +25,7 @@
 using osu.Game.Localisation;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select.Filter;
 using osuTK;
 using osuTK.Graphics;
@@ -46,15 +50,14 @@ public LocalisableString InformationalText
         }
 
         private OsuTabControl<SortMode> sortTabs;
-
         private Bindable<SortMode> sortMode;
-
         private Bindable<GroupMode> groupMode;
-
         private FilterControlTextBox searchTextBox;
-
         private CollectionDropdown collectionDropdown;
 
+        [CanBeNull]
+        private FilterCriteria currentCriteria;
+
         public FilterCriteria CreateCriteria()
         {
             string query = searchTextBox.Text;
@@ -65,6 +68,7 @@ public FilterCriteria CreateCriteria()
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
                 Ruleset = ruleset.Value,
+                Mods = mods.Value,
                 CollectionBeatmapMD5Hashes = collectionDropdown.Current.Value?.Collection?.PerformRead(c => c.BeatmapMD5Hashes).ToImmutableHashSet()
             };
 
@@ -84,7 +88,7 @@ public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             base.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config)
         {
             sortMode = config.GetBindable<SortMode>(OsuSetting.SongSelectSortingMode);
             groupMode = config.GetBindable<GroupMode>(OsuSetting.SongSelectGroupingMode);
@@ -214,8 +218,19 @@ private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuCo
             config.BindWith(OsuSetting.DisplayStarsMaximum, maximumStars);
             maximumStars.ValueChanged += _ => updateCriteria();
 
-            ruleset.BindTo(parentRuleset);
             ruleset.BindValueChanged(_ => updateCriteria());
+            mods.BindValueChanged(m =>
+            {
+                // Mods are updated once by the mod select overlay when song select is entered,
+                // regardless of if there are any mods or any changes have taken place.
+                // Updating the criteria here so early triggers a re-ordering of panels on song select, via... some mechanism.
+                // Todo: Investigate/fix and potentially remove this.
+                if (m.NewValue.SequenceEqual(m.OldValue))
+                    return;
+
+                if (currentCriteria?.RulesetCriteria?.FilterMayChangeFromMods(m) == true)
+                    updateCriteria();
+            });
 
             groupMode.BindValueChanged(_ => updateCriteria());
             sortMode.BindValueChanged(_ => updateCriteria());
@@ -230,7 +245,7 @@ public void Deactivate()
             searchTextBox.ReadOnly = true;
             searchTextBox.HoldFocus = false;
             if (searchTextBox.HasFocus)
-                GetContainingInputManager().ChangeFocus(searchTextBox);
+                GetContainingFocusManager().ChangeFocus(searchTextBox);
         }
 
         public void Activate()
@@ -239,13 +254,17 @@ public void Activate()
             searchTextBox.HoldFocus = true;
         }
 
-        private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
+
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
         private readonly Bindable<bool> showConverted = new Bindable<bool>();
         private readonly Bindable<double> minimumStars = new BindableDouble();
         private readonly Bindable<double> maximumStars = new BindableDouble();
 
-        private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
+        private void updateCriteria() => FilterChanged?.Invoke(currentCriteria = CreateCriteria());
 
         protected override bool OnClick(ClickEvent e) => true;
 
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 01b0e9b7d99c..190efd0fb08e 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -10,6 +10,7 @@
 using osu.Game.Collections;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Filter;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
@@ -50,6 +51,7 @@ public class FilterCriteria
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
 
         public RulesetInfo? Ruleset;
+        public IReadOnlyList<Mod>? Mods;
         public bool AllowConvertedBeatmaps;
 
         private string searchText = string.Empty;
diff --git a/osu.Game/Screens/Select/FooterV2/FooterButtonModsV2.cs b/osu.Game/Screens/Select/FooterV2/FooterButtonModsV2.cs
deleted file mode 100644
index b8c9f0b34b50..000000000000
--- a/osu.Game/Screens/Select/FooterV2/FooterButtonModsV2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.Sprites;
-using osu.Game.Graphics;
-
-namespace osu.Game.Screens.Select.FooterV2
-{
-    public partial class FooterButtonModsV2 : FooterButtonV2
-    {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
-        {
-            Text = "Mods";
-            Icon = FontAwesome.Solid.ExchangeAlt;
-            AccentColour = colour.Lime1;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs b/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
deleted file mode 100644
index a1559d32dc96..000000000000
--- a/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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.Bindables;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
-using osu.Game.Input.Bindings;
-
-namespace osu.Game.Screens.Select.FooterV2
-{
-    public partial class FooterButtonOptionsV2 : FooterButtonV2, IHasPopover
-    {
-        public readonly BindableBool IsActive = new BindableBool();
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
-        {
-            Text = "Options";
-            Icon = FontAwesome.Solid.Cog;
-            AccentColour = colour.Purple1;
-            Hotkey = GlobalAction.ToggleBeatmapOptions;
-
-            Action = () => IsActive.Toggle();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            IsActive.BindValueChanged(active =>
-            {
-                OverlayState.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
-            });
-
-            OverlayState.BindValueChanged(state =>
-            {
-                switch (state.NewValue)
-                {
-                    case Visibility.Hidden:
-                        this.HidePopover();
-                        break;
-
-                    case Visibility.Visible:
-                        this.ShowPopover();
-                        break;
-                }
-            });
-        }
-
-        public Popover GetPopover() => new BeatmapOptionsPopover(this);
-    }
-}
diff --git a/osu.Game/Screens/Select/FooterV2/FooterButtonV2.cs b/osu.Game/Screens/Select/FooterV2/FooterButtonV2.cs
deleted file mode 100644
index 2f5046d2bbec..000000000000
--- a/osu.Game/Screens/Select/FooterV2/FooterButtonV2.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// 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.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Input.Bindings;
-using osu.Game.Overlays;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Select.FooterV2
-{
-    public partial class FooterButtonV2 : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
-    {
-        private const int button_height = 90;
-        private const int button_width = 140;
-        private const int corner_radius = 10;
-        private const int transition_length = 500;
-
-        // This should be 12 by design, but an extra allowance is added due to the corner radius specification.
-        public const float SHEAR_WIDTH = 13.5f;
-
-        public Bindable<Visibility> OverlayState = new Bindable<Visibility>();
-
-        protected static readonly Vector2 SHEAR = new Vector2(SHEAR_WIDTH / button_height, 0);
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        private Colour4 buttonAccentColour;
-
-        protected Colour4 AccentColour
-        {
-            set
-            {
-                buttonAccentColour = value;
-                bar.Colour = buttonAccentColour;
-                icon.Colour = buttonAccentColour;
-            }
-        }
-
-        protected IconUsage Icon
-        {
-            set => icon.Icon = value;
-        }
-
-        protected LocalisableString Text
-        {
-            set => text.Text = value;
-        }
-
-        private readonly SpriteText text;
-        private readonly SpriteIcon icon;
-
-        protected Container TextContainer;
-        private readonly Box bar;
-        private readonly Box backgroundBox;
-
-        public FooterButtonV2()
-        {
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Shadow,
-                Radius = 4,
-                // Figma says 50% opacity, but it does not match up visually if taken at face value, and looks bad.
-                Colour = Colour4.Black.Opacity(0.25f),
-                Offset = new Vector2(0, 2),
-            };
-            Shear = SHEAR;
-            Size = new Vector2(button_width, button_height);
-            Masking = true;
-            CornerRadius = corner_radius;
-            Children = new Drawable[]
-            {
-                backgroundBox = new Box
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-
-                // For elements that should not be sheared.
-                new Container
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Shear = -SHEAR,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        TextContainer = new Container
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Y = 42,
-                            AutoSizeAxes = Axes.Both,
-                            Child = text = new OsuSpriteText
-                            {
-                                // figma design says the size is 16, but due to the issues with font sizes 19 matches better
-                                Font = OsuFont.TorusAlternate.With(size: 19),
-                                AlwaysPresent = true
-                            }
-                        },
-                        icon = new SpriteIcon
-                        {
-                            Y = 12,
-                            Size = new Vector2(20),
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre
-                        },
-                    }
-                },
-                new Container
-                {
-                    Shear = -SHEAR,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.Centre,
-                    Y = -corner_radius,
-                    Size = new Vector2(120, 6),
-                    Masking = true,
-                    CornerRadius = 3,
-                    Child = bar = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    }
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            OverlayState.BindValueChanged(_ => updateDisplay());
-            Enabled.BindValueChanged(_ => updateDisplay(), true);
-
-            FinishTransforms(true);
-        }
-
-        public GlobalAction? Hotkey;
-
-        private bool handlingMouse;
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            updateDisplay();
-            return true;
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            handlingMouse = true;
-            updateDisplay();
-            return base.OnMouseDown(e);
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            handlingMouse = false;
-            updateDisplay();
-            base.OnMouseUp(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e) => updateDisplay();
-
-        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-        {
-            if (e.Action != Hotkey || e.Repeat) return false;
-
-            TriggerClick();
-            return true;
-        }
-
-        public virtual void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) { }
-
-        private void updateDisplay()
-        {
-            Color4 backgroundColour = colourProvider.Background3;
-
-            if (!Enabled.Value)
-            {
-                backgroundColour = colourProvider.Background3.Darken(0.4f);
-            }
-            else
-            {
-                if (OverlayState.Value == Visibility.Visible)
-                    backgroundColour = buttonAccentColour.Darken(0.5f);
-
-                if (IsHovered)
-                {
-                    backgroundColour = backgroundColour.Lighten(0.3f);
-
-                    if (handlingMouse)
-                        backgroundColour = backgroundColour.Lighten(0.3f);
-                }
-            }
-
-            backgroundBox.FadeColour(backgroundColour, transition_length, Easing.OutQuint);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Select/ModSpeedHotkeyHandler.cs b/osu.Game/Screens/Select/ModSpeedHotkeyHandler.cs
new file mode 100644
index 000000000000..af64002bcfeb
--- /dev/null
+++ b/osu.Game/Screens/Select/ModSpeedHotkeyHandler.cs
@@ -0,0 +1,105 @@
+// 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.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Utils;
+using osu.Game.Configuration;
+using osu.Game.Overlays;
+using osu.Game.Overlays.OSD;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
+
+namespace osu.Game.Screens.Select
+{
+    public partial class ModSpeedHotkeyHandler : Component
+    {
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
+
+        [Resolved]
+        private OsuConfigManager config { get; set; } = null!;
+
+        [Resolved]
+        private OnScreenDisplay? onScreenDisplay { get; set; }
+
+        private ModRateAdjust? lastActiveRateAdjustMod;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedMods.BindValueChanged(val =>
+            {
+                lastActiveRateAdjustMod = val.NewValue.OfType<ModRateAdjust>().SingleOrDefault() ?? lastActiveRateAdjustMod;
+            }, true);
+        }
+
+        public bool ChangeSpeed(double delta, IEnumerable<Mod> availableMods)
+        {
+            double targetSpeed = (selectedMods.Value.OfType<ModRateAdjust>().SingleOrDefault()?.SpeedChange.Value ?? 1) + delta;
+
+            if (Precision.AlmostEquals(targetSpeed, 1, 0.005))
+            {
+                selectedMods.Value = selectedMods.Value.Where(m => m is not ModRateAdjust).ToList();
+                onScreenDisplay?.Display(new SpeedChangeToast(config, targetSpeed));
+                return true;
+            }
+
+            ModRateAdjust? targetMod;
+
+            if (lastActiveRateAdjustMod is ModDaycore || lastActiveRateAdjustMod is ModNightcore)
+            {
+                targetMod = targetSpeed < 1
+                    ? availableMods.OfType<ModDaycore>().SingleOrDefault()
+                    : availableMods.OfType<ModNightcore>().SingleOrDefault();
+            }
+            else
+            {
+                targetMod = targetSpeed < 1
+                    ? availableMods.OfType<ModHalfTime>().SingleOrDefault()
+                    : availableMods.OfType<ModDoubleTime>().SingleOrDefault();
+            }
+
+            if (targetMod == null)
+                return false;
+
+            // preserve other settings from latest rate adjust mod instance seen
+            if (lastActiveRateAdjustMod != null)
+            {
+                foreach (var (_, sourceProperty) in lastActiveRateAdjustMod.GetSettingsSourceProperties())
+                {
+                    if (sourceProperty.Name == nameof(ModRateAdjust.SpeedChange))
+                        continue;
+
+                    var targetProperty = targetMod.GetType().GetProperty(sourceProperty.Name);
+
+                    if (targetProperty == null)
+                        continue;
+
+                    var targetBindable = (IBindable)targetProperty.GetValue(targetMod)!;
+                    var sourceBindable = (IBindable)sourceProperty.GetValue(lastActiveRateAdjustMod)!;
+
+                    if (targetBindable.GetType() != sourceBindable.GetType())
+                        continue;
+
+                    lastActiveRateAdjustMod.CopyAdjustedSetting(targetBindable, sourceBindable);
+                }
+            }
+
+            targetMod.SpeedChange.Value = targetSpeed;
+
+            var intendedMods = selectedMods.Value.Where(m => m is not ModRateAdjust).Append(targetMod).ToList();
+
+            if (!ModUtils.CheckCompatibleSet(intendedMods))
+                return false;
+
+            selectedMods.Value = intendedMods;
+            onScreenDisplay?.Display(new SpeedChangeToast(config, targetMod.SpeedChange.Value));
+            return true;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 15469fad5bf2..269ca37ff52b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -39,6 +39,7 @@
 using osu.Game.Screens.Select.Details;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -98,6 +99,9 @@ public abstract partial class SongSelect : ScreenWithBeatmapBackground, IKeyBind
             new OsuMenuItem(@"Select", MenuItemType.Highlighted, () => FinaliseSelection(getBeatmap()))
         };
 
+        [Resolved]
+        private OsuGameBase game { get; set; } = null!;
+
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
@@ -133,6 +137,7 @@ public abstract partial class SongSelect : ScreenWithBeatmapBackground, IKeyBind
         private double audioFeedbackLastPlaybackTime;
 
         private IDisposable? modSelectOverlayRegistration;
+        private ModSpeedHotkeyHandler modSpeedHotkeyHandler = null!;
 
         private AdvancedStats advancedStats = null!;
 
@@ -319,6 +324,7 @@ private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
+                modSpeedHotkeyHandler = new ModSpeedHotkeyHandler(),
             });
 
             if (ShowFooter)
@@ -425,7 +431,8 @@ public void Edit(BeatmapInfo? beatmapInfo = null)
             if (!AllowEditing)
                 throw new InvalidOperationException($"Attempted to edit when {nameof(AllowEditing)} is disabled");
 
-            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo ?? beatmapInfoNoDebounce);
+            // Forced refetch is important here to guarantee correct invalidation across all difficulties.
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo ?? beatmapInfoNoDebounce, true);
             this.Push(new EditorLoader());
         }
 
@@ -1006,11 +1013,20 @@ public void ClearScores(BeatmapInfo? beatmapInfo)
 
         public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
+            if (!this.IsCurrentScreen()) return false;
+
+            switch (e.Action)
+            {
+                case GlobalAction.IncreaseModSpeed:
+                    return modSpeedHotkeyHandler.ChangeSpeed(0.05, ModUtils.FlattenMods(game.AvailableMods.Value.SelectMany(kv => kv.Value)));
+
+                case GlobalAction.DecreaseModSpeed:
+                    return modSpeedHotkeyHandler.ChangeSpeed(-0.05, ModUtils.FlattenMods(game.AvailableMods.Value.SelectMany(kv => kv.Value)));
+            }
+
             if (e.Repeat)
                 return false;
 
-            if (!this.IsCurrentScreen()) return false;
-
             switch (e.Action)
             {
                 case GlobalAction.Select:
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/SelectV2/Footer/BeatmapOptionsPopover.cs
similarity index 94%
rename from osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
rename to osu.Game/Screens/SelectV2/Footer/BeatmapOptionsPopover.cs
index f81036f74585..2827a9cb5073 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/SelectV2/Footer/BeatmapOptionsPopover.cs
@@ -20,24 +20,25 @@
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
+using osu.Game.Screens.Select;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
-namespace osu.Game.Screens.Select.FooterV2
+namespace osu.Game.Screens.SelectV2.Footer
 {
     public partial class BeatmapOptionsPopover : OsuPopover
     {
         private FillFlowContainer buttonFlow = null!;
-        private readonly FooterButtonOptionsV2 footerButton;
+        private readonly ScreenFooterButtonOptions footerButton;
 
         private WorkingBeatmap beatmapWhenOpening = null!;
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
-        public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
+        public BeatmapOptionsPopover(ScreenFooterButtonOptions footerButton)
         {
             this.footerButton = footerButton;
         }
@@ -77,7 +78,7 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
+            ScheduleAfterChildren(() => GetContainingFocusManager().ChangeFocus(this));
 
             beatmap.BindValueChanged(_ => Hide());
         }
@@ -188,9 +189,7 @@ protected override bool OnKeyDown(KeyDownEvent e)
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
             base.UpdateState(state);
-
-            if (state.NewValue == Visibility.Hidden)
-                footerButton.IsActive.Value = false;
+            footerButton.OverlayState.Value = state.NewValue;
         }
     }
 }
diff --git a/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonMods.cs b/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonMods.cs
new file mode 100644
index 000000000000..49961c60f87a
--- /dev/null
+++ b/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonMods.cs
@@ -0,0 +1,342 @@
+// 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.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Localisation;
+using osu.Game.Overlays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Footer;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Utils;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.SelectV2.Footer
+{
+    public partial class ScreenFooterButtonMods : ScreenFooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    {
+        // todo: see https://github.com/ppy/osu-framework/issues/3271
+        private const float torus_scale_factor = 1.2f;
+        private const float bar_shear_width = 7f;
+        private const float bar_height = 37f;
+        private const float mod_display_portion = 0.65f;
+
+        private static readonly Vector2 bar_shear = new Vector2(bar_shear_width / bar_height, 0);
+
+        private readonly BindableWithCurrent<IReadOnlyList<Mod>> current = new BindableWithCurrent<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private Container modDisplayBar = null!;
+
+        private Drawable unrankedBadge = null!;
+
+        private ModDisplay modDisplay = null!;
+        private OsuSpriteText modCountText = null!;
+
+        protected OsuSpriteText MultiplierText { get; private set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Text = "Mods";
+            Icon = FontAwesome.Solid.ExchangeAlt;
+            AccentColour = colours.Lime1;
+
+            AddRange(new[]
+            {
+                unrankedBadge = new UnrankedBadge(),
+                modDisplayBar = new Container
+                {
+                    Y = -5f,
+                    Depth = float.MaxValue,
+                    Origin = Anchor.BottomLeft,
+                    Shear = bar_shear,
+                    CornerRadius = CORNER_RADIUS,
+                    Size = new Vector2(BUTTON_WIDTH, bar_height),
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 4,
+                        // Figma says 50% opacity, but it does not match up visually if taken at face value, and looks bad.
+                        Colour = Colour4.Black.Opacity(0.25f),
+                        Offset = new Vector2(0, 2),
+                    },
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colourProvider.Background4,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new Container
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 1f - mod_display_portion,
+                            Masking = true,
+                            Child = MultiplierText = new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Shear = -bar_shear,
+                                UseFullGlyphHeight = false,
+                                Font = OsuFont.Torus.With(size: 14 * torus_scale_factor, weight: FontWeight.Bold)
+                            }
+                        },
+                        new Container
+                        {
+                            CornerRadius = CORNER_RADIUS,
+                            RelativeSizeAxes = Axes.Both,
+                            Width = mod_display_portion,
+                            Masking = true,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Colour = colourProvider.Background3,
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                modDisplay = new ModDisplay(showExtendedInformation: false)
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Shear = -bar_shear,
+                                    Scale = new Vector2(0.6f),
+                                    Current = { BindTarget = Current },
+                                    ExpansionMode = ExpansionMode.AlwaysContracted,
+                                },
+                                modCountText = new ModCountText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Shear = -bar_shear,
+                                    Font = OsuFont.Torus.With(size: 14 * torus_scale_factor, weight: FontWeight.Bold),
+                                    Mods = { BindTarget = Current },
+                                }
+                            }
+                        },
+                    }
+                },
+            });
+        }
+
+        private ModSettingChangeTracker? modSettingChangeTracker;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(m =>
+            {
+                modSettingChangeTracker?.Dispose();
+
+                updateDisplay();
+
+                if (m.NewValue != null)
+                {
+                    modSettingChangeTracker = new ModSettingChangeTracker(m.NewValue);
+                    modSettingChangeTracker.SettingChanged += _ => updateDisplay();
+                }
+            }, true);
+
+            FinishTransforms(true);
+        }
+
+        private const double duration = 240;
+        private const Easing easing = Easing.OutQuint;
+
+        private void updateDisplay()
+        {
+            if (Current.Value.Count == 0)
+            {
+                modDisplayBar.MoveToY(20, duration, easing);
+                modDisplayBar.FadeOut(duration, easing);
+                modDisplay.FadeOut(duration, easing);
+                modCountText.FadeOut(duration, easing);
+
+                unrankedBadge.MoveToY(20, duration, easing);
+                unrankedBadge.FadeOut(duration, easing);
+
+                // add delay to let unranked indicator hide first before resizing the button back to its original width.
+                this.Delay(duration).ResizeWidthTo(BUTTON_WIDTH, duration, easing);
+            }
+            else
+            {
+                modDisplay.Hide();
+                modCountText.Hide();
+
+                if (Current.Value.Count >= 5)
+                    modCountText.Show();
+                else
+                    modDisplay.Show();
+
+                if (Current.Value.Any(m => !m.Ranked))
+                {
+                    unrankedBadge.MoveToX(0, duration, easing);
+                    unrankedBadge.FadeIn(duration, easing);
+
+                    this.ResizeWidthTo(BUTTON_WIDTH + 5 + unrankedBadge.DrawWidth, duration, easing);
+                }
+                else
+                {
+                    unrankedBadge.MoveToX(-unrankedBadge.DrawWidth, duration, easing);
+                    unrankedBadge.FadeOut(duration, easing);
+
+                    this.ResizeWidthTo(BUTTON_WIDTH, duration, easing);
+                }
+
+                modDisplayBar.MoveToY(-5, duration, Easing.OutQuint);
+                unrankedBadge.MoveToY(-5, duration, easing);
+                modDisplayBar.FadeIn(duration, easing);
+            }
+
+            double multiplier = Current.Value?.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier) ?? 1;
+            MultiplierText.Text = ModUtils.FormatScoreMultiplier(multiplier);
+
+            if (multiplier > 1)
+                MultiplierText.FadeColour(colours.Red1, duration, easing);
+            else if (multiplier < 1)
+                MultiplierText.FadeColour(colours.Lime1, duration, easing);
+            else
+                MultiplierText.FadeColour(Color4.White, duration, easing);
+        }
+
+        private partial class ModCountText : OsuSpriteText, IHasCustomTooltip<IReadOnlyList<Mod>>
+        {
+            public readonly Bindable<IReadOnlyList<Mod>> Mods = new Bindable<IReadOnlyList<Mod>>();
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; } = null!;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Mods.BindValueChanged(v => Text = ModSelectOverlayStrings.Mods(v.NewValue.Count).ToUpper(), true);
+            }
+
+            public ITooltip<IReadOnlyList<Mod>> GetCustomTooltip() => new ModTooltip(colourProvider);
+
+            public IReadOnlyList<Mod>? TooltipContent => Mods.Value;
+
+            public partial class ModTooltip : VisibilityContainer, ITooltip<IReadOnlyList<Mod>>
+            {
+                private ModDisplay extendedModDisplay = null!;
+
+                [Cached]
+                private OverlayColourProvider colourProvider;
+
+                public ModTooltip(OverlayColourProvider colourProvider)
+                {
+                    this.colourProvider = colourProvider;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load()
+                {
+                    AutoSizeAxes = Axes.Both;
+                    CornerRadius = CORNER_RADIUS;
+                    Masking = true;
+
+                    InternalChildren = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colourProvider.Background5,
+                        },
+                        extendedModDisplay = new ModDisplay
+                        {
+                            Margin = new MarginPadding { Vertical = 2f, Horizontal = 10f },
+                            Scale = new Vector2(0.6f),
+                            ExpansionMode = ExpansionMode.AlwaysExpanded,
+                        },
+                    };
+                }
+
+                public void SetContent(IReadOnlyList<Mod> content)
+                {
+                    extendedModDisplay.Current.Value = content;
+                }
+
+                public void Move(Vector2 pos) => Position = pos;
+
+                protected override void PopIn() => this.FadeIn(240, Easing.OutQuint);
+                protected override void PopOut() => this.FadeOut(240, Easing.OutQuint);
+            }
+        }
+
+        internal partial class UnrankedBadge : CompositeDrawable, IHasTooltip
+        {
+            public LocalisableString TooltipText { get; }
+
+            public UnrankedBadge()
+            {
+                Margin = new MarginPadding { Left = BUTTON_WIDTH + 5f };
+                Y = -5f;
+                Depth = float.MaxValue;
+                Origin = Anchor.BottomLeft;
+                Shear = bar_shear;
+                CornerRadius = CORNER_RADIUS;
+                AutoSizeAxes = Axes.X;
+                Height = bar_height;
+                Masking = true;
+                BorderColour = Color4.White;
+                BorderThickness = 2f;
+                TooltipText = ModSelectOverlayStrings.UnrankedExplanation;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = colours.Orange2,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Shear = -bar_shear,
+                        Text = ModSelectOverlayStrings.Unranked.ToUpper(),
+                        Margin = new MarginPadding { Horizontal = 15 },
+                        UseFullGlyphHeight = false,
+                        Font = OsuFont.Torus.With(size: 14 * torus_scale_factor, weight: FontWeight.Bold),
+                        Colour = Color4.Black,
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonOptions.cs b/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonOptions.cs
new file mode 100644
index 000000000000..74fe3e3d11e1
--- /dev/null
+++ b/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonOptions.cs
@@ -0,0 +1,30 @@
+// 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.Extensions;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
+using osu.Game.Screens.Footer;
+
+namespace osu.Game.Screens.SelectV2.Footer
+{
+    public partial class ScreenFooterButtonOptions : ScreenFooterButton, IHasPopover
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            Text = "Options";
+            Icon = FontAwesome.Solid.Cog;
+            AccentColour = colour.Purple1;
+            Hotkey = GlobalAction.ToggleBeatmapOptions;
+
+            Action = this.ShowPopover;
+        }
+
+        public Popover GetPopover() => new BeatmapOptionsPopover(this);
+    }
+}
diff --git a/osu.Game/Screens/Select/FooterV2/FooterButtonRandomV2.cs b/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonRandom.cs
similarity index 97%
rename from osu.Game/Screens/Select/FooterV2/FooterButtonRandomV2.cs
rename to osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonRandom.cs
index 70d1c0c19ec8..e8e850a9cebf 100644
--- a/osu.Game/Screens/Select/FooterV2/FooterButtonRandomV2.cs
+++ b/osu.Game/Screens/SelectV2/Footer/ScreenFooterButtonRandom.cs
@@ -10,12 +10,13 @@
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
+using osu.Game.Screens.Footer;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Screens.Select.FooterV2
+namespace osu.Game.Screens.SelectV2.Footer
 {
-    public partial class FooterButtonRandomV2 : FooterButtonV2
+    public partial class ScreenFooterButtonRandom : ScreenFooterButton
     {
         public Action? NextRandom { get; set; }
         public Action? PreviousRandom { get; set; }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index c4aef3c87829..ddc638b7c539 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -135,6 +135,7 @@ private void onUserStateChanged(int userId, SpectatorState newState)
 
                 case SpectatedUserState.Passed:
                     markReceivedAllFrames(userId);
+                    PassGameplay(userId);
                     break;
 
                 case SpectatedUserState.Failed:
@@ -233,6 +234,12 @@ private void quitGameplay(int userId)
         /// <param name="spectatorGameplayState">The gameplay state.</param>
         protected abstract void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState);
 
+        /// <summary>
+        /// Fired when a user passes gameplay.
+        /// </summary>
+        /// <param name="userId">The user which passed.</param>
+        protected virtual void PassGameplay(int userId) { }
+
         /// <summary>
         /// Quits gameplay for a user.
         /// Thread safety is not guaranteed – should be scheduled as required.
diff --git a/osu.Game/Skinning/Components/BeatmapAttributeText.cs b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
index 52c439a6246d..c467b2e94621 100644
--- a/osu.Game/Skinning/Components/BeatmapAttributeText.cs
+++ b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
@@ -48,6 +48,7 @@ public partial class BeatmapAttributeText : FontAdjustableSkinComponent
             [BeatmapAttribute.Artist] = EditorSetupStrings.Artist,
             [BeatmapAttribute.DifficultyName] = EditorSetupStrings.DifficultyHeader,
             [BeatmapAttribute.Creator] = EditorSetupStrings.Creator,
+            [BeatmapAttribute.Source] = EditorSetupStrings.Source,
             [BeatmapAttribute.Length] = ArtistStrings.TracklistLength.ToTitle(),
             [BeatmapAttribute.RankedStatus] = BeatmapDiscussionsStrings.IndexFormBeatmapsetStatusDefault,
             [BeatmapAttribute.BPM] = BeatmapsetsStrings.ShowStatsBpm,
@@ -88,6 +89,7 @@ private void updateBeatmapContent(WorkingBeatmap workingBeatmap)
             valueDictionary[BeatmapAttribute.Artist] = new RomanisableString(workingBeatmap.BeatmapInfo.Metadata.ArtistUnicode, workingBeatmap.BeatmapInfo.Metadata.Artist);
             valueDictionary[BeatmapAttribute.DifficultyName] = workingBeatmap.BeatmapInfo.DifficultyName;
             valueDictionary[BeatmapAttribute.Creator] = workingBeatmap.BeatmapInfo.Metadata.Author.Username;
+            valueDictionary[BeatmapAttribute.Source] = workingBeatmap.BeatmapInfo.Metadata.Source;
             valueDictionary[BeatmapAttribute.Length] = TimeSpan.FromMilliseconds(workingBeatmap.BeatmapInfo.Length).ToFormattedDuration();
             valueDictionary[BeatmapAttribute.RankedStatus] = workingBeatmap.BeatmapInfo.Status.GetLocalisableDescription();
             valueDictionary[BeatmapAttribute.BPM] = workingBeatmap.BeatmapInfo.BPM.ToLocalisableString(@"F2");
@@ -123,6 +125,8 @@ private void updateLabel()
         protected override void SetFont(FontUsage font) => text.Font = font.With(size: 40);
     }
 
+    // WARNING: DO NOT ADD ANY VALUES TO THIS ENUM ANYWHERE ELSE THAN AT THE END.
+    // Doing so will break existing user skins.
     public enum BeatmapAttribute
     {
         CircleSize,
@@ -137,5 +141,6 @@ public enum BeatmapAttribute
         Length,
         RankedStatus,
         BPM,
+        Source,
     }
 }
diff --git a/osu.Game/Skinning/GameplaySkinComponentLookup.cs b/osu.Game/Skinning/GameplaySkinComponentLookup.cs
index ec159873f89d..c317a17e2137 100644
--- a/osu.Game/Skinning/GameplaySkinComponentLookup.cs
+++ b/osu.Game/Skinning/GameplaySkinComponentLookup.cs
@@ -24,8 +24,5 @@ public GameplaySkinComponentLookup(T component)
         {
             Component = component;
         }
-
-        protected virtual string RulesetPrefix => string.Empty;
-        protected virtual string ComponentName => Component.ToString();
     }
 }
diff --git a/osu.Game/Skinning/ISerialisableDrawableContainer.cs b/osu.Game/Skinning/ISerialisableDrawableContainer.cs
index a19c8c51627f..57ea75bc7eb1 100644
--- a/osu.Game/Skinning/ISerialisableDrawableContainer.cs
+++ b/osu.Game/Skinning/ISerialisableDrawableContainer.cs
@@ -30,11 +30,6 @@ public interface ISerialisableDrawableContainer : IDrawable
         /// </summary>
         void Reload();
 
-        /// <summary>
-        /// Reload this target from the provided skinnable information.
-        /// </summary>
-        void Reload(SerialisedDrawableInfo[] skinnableInfo);
-
         /// <summary>
         /// Add a new skinnable component to this target.
         /// </summary>
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index cacca0de23b8..1550fc8a4731 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -67,7 +67,10 @@ public enum LegacyManiaSkinConfigurationLookups
         LeftStageImage,
         RightStageImage,
         BottomStageImage,
+
+        // ReSharper disable once InconsistentNaming
         Hit300g,
+
         Hit300,
         Hit200,
         Hit100,
diff --git a/osu.Game/Skinning/SerialisedDrawableInfo.cs b/osu.Game/Skinning/SerialisedDrawableInfo.cs
index 2d6113ff7022..ac1aa80d295a 100644
--- a/osu.Game/Skinning/SerialisedDrawableInfo.cs
+++ b/osu.Game/Skinning/SerialisedDrawableInfo.cs
@@ -34,15 +34,15 @@ public sealed class SerialisedDrawableInfo
 
         public float Rotation { get; set; }
 
-        public Vector2 Scale { get; set; }
+        public Vector2 Scale { get; set; } = Vector2.One;
 
         public float? Width { get; set; }
 
         public float? Height { get; set; }
 
-        public Anchor Anchor { get; set; }
+        public Anchor Anchor { get; set; } = Anchor.TopLeft;
 
-        public Anchor Origin { get; set; }
+        public Anchor Origin { get; set; } = Anchor.TopLeft;
 
         /// <inheritdoc cref="ISerialisableDrawable.UsesFixedAnchor"/>
         public bool UsesFixedAnchor { get; set; }
diff --git a/osu.Game/Skinning/SkinComponentsContainer.cs b/osu.Game/Skinning/SkinComponentsContainer.cs
index adf0a288b427..02ba43fd39cc 100644
--- a/osu.Game/Skinning/SkinComponentsContainer.cs
+++ b/osu.Game/Skinning/SkinComponentsContainer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using osu.Framework.Bindables;
@@ -44,20 +43,6 @@ public SkinComponentsContainer(SkinComponentsContainerLookup lookup)
             Lookup = lookup;
         }
 
-        public void Reload(SerialisedDrawableInfo[] skinnableInfo)
-        {
-            var drawables = new List<Drawable>();
-
-            foreach (var i in skinnableInfo)
-                drawables.Add(i.CreateInstance());
-
-            Reload(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = drawables,
-            });
-        }
-
         public void Reload() => Reload(CurrentSkin.GetDrawableComponent(Lookup) as Container);
 
         public void Reload(Container? componentsContainer)
diff --git a/osu.Game/Storyboards/CommandLoop.cs b/osu.Game/Storyboards/CommandLoop.cs
deleted file mode 100644
index 480d69c12f42..000000000000
--- a/osu.Game/Storyboards/CommandLoop.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// 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;
-
-namespace osu.Game.Storyboards
-{
-    public class CommandLoop : CommandTimelineGroup
-    {
-        public double LoopStartTime;
-
-        /// <summary>
-        /// The total number of times this loop is played back. Always greater than zero.
-        /// </summary>
-        public readonly int TotalIterations;
-
-        public override double StartTime => LoopStartTime + CommandsStartTime;
-
-        public override double EndTime =>
-            // In an ideal world, we would multiply the command duration by TotalIterations here.
-            // Unfortunately this would clash with how stable handled end times, and results in some storyboards playing outro
-            // sequences for minutes or hours.
-            StartTime + CommandsDuration;
-
-        /// <summary>
-        /// Construct a new command loop.
-        /// </summary>
-        /// <param name="startTime">The start time of the loop.</param>
-        /// <param name="repeatCount">The number of times the loop should repeat. Should be greater than zero. Zero means a single playback.</param>
-        public CommandLoop(double startTime, int repeatCount)
-        {
-            if (repeatCount < 0) throw new ArgumentException("Repeat count must be zero or above.", nameof(repeatCount));
-
-            LoopStartTime = startTime;
-            TotalIterations = repeatCount + 1;
-        }
-
-        public override IEnumerable<CommandTimeline<T>.TypedCommand> GetCommands<T>(CommandTimelineSelector<T> timelineSelector, double offset = 0)
-        {
-            for (int loop = 0; loop < TotalIterations; loop++)
-            {
-                double loopOffset = LoopStartTime + loop * CommandsDuration;
-                foreach (var command in base.GetCommands(timelineSelector, offset + loopOffset))
-                    yield return command;
-            }
-        }
-
-        public override string ToString()
-            => $"{LoopStartTime} x{TotalIterations}";
-    }
-}
diff --git a/osu.Game/Storyboards/CommandTimeline.cs b/osu.Game/Storyboards/CommandTimeline.cs
deleted file mode 100644
index 0650c971659a..000000000000
--- a/osu.Game/Storyboards/CommandTimeline.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 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;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace osu.Game.Storyboards
-{
-    public class CommandTimeline<T> : ICommandTimeline
-    {
-        private readonly List<TypedCommand> commands = new List<TypedCommand>();
-
-        public IEnumerable<TypedCommand> Commands => commands.OrderBy(c => c.StartTime);
-
-        public bool HasCommands => commands.Count > 0;
-
-        public double StartTime { get; private set; } = double.MaxValue;
-        public double EndTime { get; private set; } = double.MinValue;
-
-        public T StartValue { get; private set; }
-        public T EndValue { get; private set; }
-
-        public void Add(Easing easing, double startTime, double endTime, T startValue, T endValue)
-        {
-            if (endTime < startTime)
-            {
-                endTime = startTime;
-            }
-
-            commands.Add(new TypedCommand { Easing = easing, StartTime = startTime, EndTime = endTime, StartValue = startValue, EndValue = endValue });
-
-            if (startTime < StartTime)
-            {
-                StartValue = startValue;
-                StartTime = startTime;
-            }
-
-            if (endTime > EndTime)
-            {
-                EndValue = endValue;
-                EndTime = endTime;
-            }
-        }
-
-        public override string ToString()
-            => $"{commands.Count} command(s)";
-
-        public class TypedCommand : ICommand
-        {
-            public Easing Easing { get; set; }
-            public double StartTime { get; set; }
-            public double EndTime { get; set; }
-            public double Duration => EndTime - StartTime;
-
-            public T StartValue;
-            public T EndValue;
-
-            public int CompareTo(ICommand other)
-            {
-                int result = StartTime.CompareTo(other.StartTime);
-                if (result != 0) return result;
-
-                return EndTime.CompareTo(other.EndTime);
-            }
-
-            public override string ToString()
-                => $"{StartTime} -> {EndTime}, {StartValue} -> {EndValue} {Easing}";
-        }
-    }
-
-    public interface ICommandTimeline
-    {
-        double StartTime { get; }
-        double EndTime { get; }
-        bool HasCommands { get; }
-    }
-
-    public interface ICommand : IComparable<ICommand>
-    {
-        Easing Easing { get; set; }
-        double StartTime { get; set; }
-        double EndTime { get; set; }
-        double Duration { get; }
-    }
-}
diff --git a/osu.Game/Storyboards/CommandTimelineGroup.cs b/osu.Game/Storyboards/CommandTimelineGroup.cs
deleted file mode 100644
index c899cf77d3d6..000000000000
--- a/osu.Game/Storyboards/CommandTimelineGroup.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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 osuTK.Graphics;
-using osu.Framework.Graphics;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace osu.Game.Storyboards
-{
-    public delegate CommandTimeline<T> CommandTimelineSelector<T>(CommandTimelineGroup commandTimelineGroup);
-
-    public class CommandTimelineGroup
-    {
-        public CommandTimeline<float> X = new CommandTimeline<float>();
-        public CommandTimeline<float> Y = new CommandTimeline<float>();
-        public CommandTimeline<float> Scale = new CommandTimeline<float>();
-        public CommandTimeline<Vector2> VectorScale = new CommandTimeline<Vector2>();
-        public CommandTimeline<float> Rotation = new CommandTimeline<float>();
-        public CommandTimeline<Color4> Colour = new CommandTimeline<Color4>();
-        public CommandTimeline<float> Alpha = new CommandTimeline<float>();
-        public CommandTimeline<BlendingParameters> BlendingParameters = new CommandTimeline<BlendingParameters>();
-        public CommandTimeline<bool> FlipH = new CommandTimeline<bool>();
-        public CommandTimeline<bool> FlipV = new CommandTimeline<bool>();
-
-        private readonly ICommandTimeline[] timelines;
-
-        public CommandTimelineGroup()
-        {
-            timelines = new ICommandTimeline[]
-            {
-                X,
-                Y,
-                Scale,
-                VectorScale,
-                Rotation,
-                Colour,
-                Alpha,
-                BlendingParameters,
-                FlipH,
-                FlipV
-            };
-        }
-
-        [JsonIgnore]
-        public double CommandsStartTime => timelines.Min(static t => t.StartTime);
-
-        [JsonIgnore]
-        public double CommandsEndTime => timelines.Max(static t => t.EndTime);
-
-        [JsonIgnore]
-        public double CommandsDuration => CommandsEndTime - CommandsStartTime;
-
-        [JsonIgnore]
-        public virtual double StartTime => CommandsStartTime;
-
-        [JsonIgnore]
-        public virtual double EndTime => CommandsEndTime;
-
-        [JsonIgnore]
-        public bool HasCommands => timelines.Any(static t => t.HasCommands);
-
-        public virtual IEnumerable<CommandTimeline<T>.TypedCommand> GetCommands<T>(CommandTimelineSelector<T> timelineSelector, double offset = 0)
-        {
-            if (offset != 0)
-            {
-                return timelineSelector(this).Commands.Select(command =>
-                    new CommandTimeline<T>.TypedCommand
-                    {
-                        Easing = command.Easing,
-                        StartTime = offset + command.StartTime,
-                        EndTime = offset + command.EndTime,
-                        StartValue = command.StartValue,
-                        EndValue = command.EndValue,
-                    });
-            }
-
-            return timelineSelector(this).Commands;
-        }
-    }
-}
diff --git a/osu.Game/Storyboards/Commands/IStoryboardCommand.cs b/osu.Game/Storyboards/Commands/IStoryboardCommand.cs
new file mode 100644
index 000000000000..ea14f5fa400a
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/IStoryboardCommand.cs
@@ -0,0 +1,46 @@
+// 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.Transforms;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public interface IStoryboardCommand
+    {
+        /// <summary>
+        /// The start time of the storyboard command.
+        /// </summary>
+        double StartTime { get; }
+
+        /// <summary>
+        /// The end time of the storyboard command.
+        /// </summary>
+        double EndTime { get; }
+
+        /// <summary>
+        /// The name of the <see cref="Drawable"/> property affected by this storyboard command.
+        /// Used to apply initial property values based on the list of commands given in <see cref="StoryboardSprite"/>.
+        /// </summary>
+        string PropertyName { get; }
+
+        /// <summary>
+        /// Sets the value of the corresponding property in <see cref="Drawable"/> to the start value of this command.
+        /// </summary>
+        /// <remarks>
+        /// Parameter commands (e.g. <see cref="StoryboardFlipHCommand"/> / <see cref="StoryboardFlipVCommand"/> / <see cref="StoryboardBlendingParametersCommand"/>) only apply the start value if they have zero duration, i.e. take "permanent" effect regardless of time.
+        /// </remarks>
+        /// <param name="d">The target drawable.</param>
+        void ApplyInitialValue<TDrawable>(TDrawable d)
+            where TDrawable : Drawable, IFlippable, IVectorScalable;
+
+        /// <summary>
+        /// Applies the transforms described by this storyboard command to the target drawable.
+        /// </summary>
+        /// <param name="d">The target drawable.</param>
+        /// <returns>The sequence of transforms applied to the target drawable.</returns>
+        TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            where TDrawable : Drawable, IFlippable, IVectorScalable;
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs b/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs
new file mode 100644
index 000000000000..1c17da7592d2
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs
@@ -0,0 +1,23 @@
+// 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.Transforms;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardAlphaCommand : StoryboardCommand<float>
+    {
+        public StoryboardAlphaCommand(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.Alpha);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.Alpha = StartValue;
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.FadeTo(StartValue).Then().FadeTo(EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs b/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs
new file mode 100644
index 000000000000..cf9cadf1a783
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs
@@ -0,0 +1,28 @@
+// 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.Transforms;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardBlendingParametersCommand : StoryboardCommand<BlendingParameters>
+    {
+        public StoryboardBlendingParametersCommand(Easing easing, double startTime, double endTime, BlendingParameters startValue, BlendingParameters endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.Blending);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d)
+        {
+            if (StartTime == EndTime)
+                d.Blending = StartValue;
+        }
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.TransformTo(nameof(d.Blending), StartValue).Delay(Duration)
+                .TransformTo(nameof(d.Blending), EndValue);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs b/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs
new file mode 100644
index 000000000000..da8a20647cfa
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs
@@ -0,0 +1,24 @@
+// 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.Transforms;
+using osuTK.Graphics;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardColourCommand : StoryboardCommand<Color4>
+    {
+        public StoryboardColourCommand(Easing easing, double startTime, double endTime, Color4 startValue, Color4 endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.Colour);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.Colour = StartValue;
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.FadeColour(StartValue).Then().FadeColour(EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardCommand.cs b/osu.Game/Storyboards/Commands/StoryboardCommand.cs
new file mode 100644
index 000000000000..60c28e7833c6
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardCommand.cs
@@ -0,0 +1,56 @@
+// 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 osu.Framework.Graphics.Transforms;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public abstract class StoryboardCommand<T> : IStoryboardCommand, IComparable<StoryboardCommand<T>>
+    {
+        public double StartTime { get; }
+        public double EndTime { get; }
+
+        public T StartValue { get; }
+        public T EndValue { get; }
+        public Easing Easing { get; }
+
+        public double Duration => EndTime - StartTime;
+
+        protected StoryboardCommand(Easing easing, double startTime, double endTime, T startValue, T endValue)
+        {
+            if (endTime < startTime)
+                endTime = startTime;
+
+            StartTime = startTime;
+            StartValue = startValue;
+            EndTime = endTime;
+            EndValue = endValue;
+            Easing = easing;
+        }
+
+        public abstract string PropertyName { get; }
+
+        public abstract void ApplyInitialValue<TDrawable>(TDrawable d)
+            where TDrawable : Drawable, IFlippable, IVectorScalable;
+
+        public abstract TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            where TDrawable : Drawable, IFlippable, IVectorScalable;
+
+        public int CompareTo(StoryboardCommand<T>? other)
+        {
+            if (other == null)
+                return 1;
+
+            int result = StartTime.CompareTo(other.StartTime);
+            if (result != 0)
+                return result;
+
+            return EndTime.CompareTo(other.EndTime);
+        }
+
+        public override string ToString() => $"{StartTime} -> {EndTime}, {StartValue} -> {EndValue} {Easing}";
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs b/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs
new file mode 100644
index 000000000000..092523141218
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs
@@ -0,0 +1,130 @@
+// 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.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using osu.Framework.Graphics;
+using osu.Framework.Lists;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardCommandGroup
+    {
+        private readonly SortedList<StoryboardCommand<float>> x = new SortedList<StoryboardCommand<float>>();
+
+        public IReadOnlyList<StoryboardCommand<float>> X => x;
+
+        private readonly SortedList<StoryboardCommand<float>> y = new SortedList<StoryboardCommand<float>>();
+
+        public IReadOnlyList<StoryboardCommand<float>> Y => y;
+
+        private readonly SortedList<StoryboardCommand<float>> scale = new SortedList<StoryboardCommand<float>>();
+
+        public IReadOnlyList<StoryboardCommand<float>> Scale => scale;
+
+        private readonly SortedList<StoryboardCommand<Vector2>> vectorScale = new SortedList<StoryboardCommand<Vector2>>();
+
+        public IReadOnlyList<StoryboardCommand<Vector2>> VectorScale => vectorScale;
+
+        private readonly SortedList<StoryboardCommand<float>> rotation = new SortedList<StoryboardCommand<float>>();
+
+        public IReadOnlyList<StoryboardCommand<float>> Rotation => rotation;
+
+        private readonly SortedList<StoryboardCommand<Color4>> colour = new SortedList<StoryboardCommand<Color4>>();
+
+        public IReadOnlyList<StoryboardCommand<Color4>> Colour => colour;
+
+        private readonly SortedList<StoryboardCommand<float>> alpha = new SortedList<StoryboardCommand<float>>();
+
+        public IReadOnlyList<StoryboardCommand<float>> Alpha => alpha;
+
+        private readonly SortedList<StoryboardCommand<BlendingParameters>> blendingParameters = new SortedList<StoryboardCommand<BlendingParameters>>();
+
+        public IReadOnlyList<StoryboardCommand<BlendingParameters>> BlendingParameters => blendingParameters;
+
+        private readonly SortedList<StoryboardCommand<bool>> flipH = new SortedList<StoryboardCommand<bool>>();
+
+        public IReadOnlyList<StoryboardCommand<bool>> FlipH => flipH;
+
+        private readonly SortedList<StoryboardCommand<bool>> flipV = new SortedList<StoryboardCommand<bool>>();
+
+        public IReadOnlyList<StoryboardCommand<bool>> FlipV => flipV;
+
+        /// <summary>
+        /// Returns the earliest start time of the commands added to this group.
+        /// </summary>
+        [JsonIgnore]
+        public double StartTime { get; private set; } = double.MaxValue;
+
+        /// <summary>
+        /// Returns the latest end time of the commands added to this group.
+        /// </summary>
+        [JsonIgnore]
+        public double EndTime { get; private set; } = double.MinValue;
+
+        [JsonIgnore]
+        public double Duration => EndTime - StartTime;
+
+        [JsonIgnore]
+        public bool HasCommands { get; private set; }
+
+        private readonly IReadOnlyList<IStoryboardCommand>[] lists;
+
+        public IEnumerable<IStoryboardCommand> AllCommands => lists.SelectMany(g => g);
+
+        public StoryboardCommandGroup()
+        {
+            lists = new IReadOnlyList<IStoryboardCommand>[] { X, Y, Scale, VectorScale, Rotation, Colour, Alpha, BlendingParameters, FlipH, FlipV };
+        }
+
+        public void AddX(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            => AddCommand(x, new StoryboardXCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddY(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            => AddCommand(y, new StoryboardYCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddScale(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            => AddCommand(scale, new StoryboardScaleCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddVectorScale(Easing easing, double startTime, double endTime, Vector2 startValue, Vector2 endValue)
+            => AddCommand(vectorScale, new StoryboardVectorScaleCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddRotation(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            => AddCommand(rotation, new StoryboardRotationCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddColour(Easing easing, double startTime, double endTime, Color4 startValue, Color4 endValue)
+            => AddCommand(colour, new StoryboardColourCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddAlpha(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            => AddCommand(alpha, new StoryboardAlphaCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddBlendingParameters(Easing easing, double startTime, double endTime, BlendingParameters startValue, BlendingParameters endValue)
+            => AddCommand(blendingParameters, new StoryboardBlendingParametersCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddFlipH(Easing easing, double startTime, double endTime, bool startValue, bool endValue)
+            => AddCommand(flipH, new StoryboardFlipHCommand(easing, startTime, endTime, startValue, endValue));
+
+        public void AddFlipV(Easing easing, double startTime, double endTime, bool startValue, bool endValue)
+            => AddCommand(flipV, new StoryboardFlipVCommand(easing, startTime, endTime, startValue, endValue));
+
+        /// <summary>
+        /// Adds the given storyboard <paramref name="command"/> to the target <paramref name="list"/>.
+        /// Can be overriden to apply custom effects to the given command before adding it to the list (e.g. looping or time offsets).
+        /// </summary>
+        /// <typeparam name="T">The value type of the target property affected by this storyboard command.</typeparam>
+        protected virtual void AddCommand<T>(ICollection<StoryboardCommand<T>> list, StoryboardCommand<T> command)
+        {
+            list.Add(command);
+            HasCommands = true;
+
+            if (command.StartTime < StartTime)
+                StartTime = command.StartTime;
+
+            if (command.EndTime > EndTime)
+                EndTime = command.EndTime;
+        }
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs b/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs
new file mode 100644
index 000000000000..fbf7295f15b2
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs
@@ -0,0 +1,29 @@
+// 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.Transforms;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardFlipHCommand : StoryboardCommand<bool>
+    {
+        public StoryboardFlipHCommand(Easing easing, double startTime, double endTime, bool startValue, bool endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(IFlippable.FlipH);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d)
+        {
+            if (StartTime == EndTime)
+                d.FlipH = StartValue;
+        }
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.TransformTo(nameof(IFlippable.FlipH), StartValue).Delay(Duration)
+                .TransformTo(nameof(IFlippable.FlipH), EndValue);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs b/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs
new file mode 100644
index 000000000000..136bd52f1fc8
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs
@@ -0,0 +1,29 @@
+// 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.Transforms;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardFlipVCommand : StoryboardCommand<bool>
+    {
+        public StoryboardFlipVCommand(Easing easing, double startTime, double endTime, bool startValue, bool endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(IFlippable.FlipV);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d)
+        {
+            if (StartTime == EndTime)
+                d.FlipV = StartValue;
+        }
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.TransformTo(nameof(IFlippable.FlipV), StartValue).Delay(Duration)
+                .TransformTo(nameof(IFlippable.FlipV), EndValue);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs b/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs
new file mode 100644
index 000000000000..fe334ad60814
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs
@@ -0,0 +1,66 @@
+// 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.Transforms;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardLoopingGroup : StoryboardCommandGroup
+    {
+        private readonly double loopStartTime;
+
+        /// <summary>
+        /// The total number of times this loop is played back. Always greater than zero.
+        /// </summary>
+        public readonly int TotalIterations;
+
+        /// <summary>
+        /// Construct a new command loop.
+        /// </summary>
+        /// <param name="startTime">The start time of the loop.</param>
+        /// <param name="repeatCount">The number of times the loop should repeat. Should be greater than zero. Zero means a single playback.</param>
+        public StoryboardLoopingGroup(double startTime, int repeatCount)
+        {
+            ArgumentOutOfRangeException.ThrowIfNegative(repeatCount);
+
+            loopStartTime = startTime;
+            TotalIterations = repeatCount + 1;
+        }
+
+        protected override void AddCommand<T>(ICollection<StoryboardCommand<T>> list, StoryboardCommand<T> command)
+            => base.AddCommand(list, new StoryboardLoopingCommand<T>(command, this));
+
+        public override string ToString() => $"{loopStartTime} x{TotalIterations}";
+
+        private class StoryboardLoopingCommand<T> : StoryboardCommand<T>
+        {
+            private readonly StoryboardCommand<T> command;
+            private readonly StoryboardLoopingGroup loopingGroup;
+
+            public StoryboardLoopingCommand(StoryboardCommand<T> command, StoryboardLoopingGroup loopingGroup)
+                // In an ideal world, we would multiply the command duration by TotalIterations in command end time.
+                // Unfortunately this would clash with how stable handled end times, and results in some storyboards playing outro
+                // sequences for minutes or hours.
+                : base(command.Easing, loopingGroup.loopStartTime + command.StartTime, loopingGroup.loopStartTime + command.EndTime, command.StartValue, command.EndValue)
+            {
+                this.command = command;
+                this.loopingGroup = loopingGroup;
+            }
+
+            public override string PropertyName => command.PropertyName;
+
+            public override void ApplyInitialValue<TDrawable>(TDrawable d) => command.ApplyInitialValue(d);
+
+            public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            {
+                if (loopingGroup.TotalIterations == 0)
+                    return command.ApplyTransforms(d);
+
+                double loopingGroupDuration = loopingGroup.Duration;
+                return command.ApplyTransforms(d).Loop(loopingGroupDuration - Duration, loopingGroup.TotalIterations);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs b/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs
new file mode 100644
index 000000000000..7e097fce2552
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs
@@ -0,0 +1,23 @@
+// 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.Transforms;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardRotationCommand : StoryboardCommand<float>
+    {
+        public StoryboardRotationCommand(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.Rotation);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.Rotation = StartValue;
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.RotateTo(StartValue).Then().RotateTo(EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs b/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs
new file mode 100644
index 000000000000..832533af5ebd
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs
@@ -0,0 +1,24 @@
+// 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.Transforms;
+using osuTK;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardScaleCommand : StoryboardCommand<float>
+    {
+        public StoryboardScaleCommand(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.Scale);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.Scale = new Vector2(StartValue);
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.ScaleTo(StartValue).Then().ScaleTo(EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/CommandTrigger.cs b/osu.Game/Storyboards/Commands/StoryboardTriggerGroup.cs
similarity index 74%
rename from osu.Game/Storyboards/CommandTrigger.cs
rename to osu.Game/Storyboards/Commands/StoryboardTriggerGroup.cs
index 011f345df2d6..89a68e9ec042 100644
--- a/osu.Game/Storyboards/CommandTrigger.cs
+++ b/osu.Game/Storyboards/Commands/StoryboardTriggerGroup.cs
@@ -1,16 +1,16 @@
 // 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.
 
-namespace osu.Game.Storyboards
+namespace osu.Game.Storyboards.Commands
 {
-    public class CommandTrigger : CommandTimelineGroup
+    public class StoryboardTriggerGroup : StoryboardCommandGroup
     {
         public string TriggerName;
         public double TriggerStartTime;
         public double TriggerEndTime;
         public int GroupNumber;
 
-        public CommandTrigger(string triggerName, double startTime, double endTime, int groupNumber)
+        public StoryboardTriggerGroup(string triggerName, double startTime, double endTime, int groupNumber)
         {
             TriggerName = triggerName;
             TriggerStartTime = startTime;
diff --git a/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs b/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs
new file mode 100644
index 000000000000..06983a159066
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs
@@ -0,0 +1,26 @@
+// 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.Transforms;
+using osu.Game.Storyboards.Drawables;
+using osuTK;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardVectorScaleCommand : StoryboardCommand<Vector2>
+    {
+        public StoryboardVectorScaleCommand(Easing easing, double startTime, double endTime, Vector2 startValue, Vector2 endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(IVectorScalable.VectorScale);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.VectorScale = StartValue;
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.TransformTo(nameof(d.VectorScale), StartValue).Then()
+                .TransformTo(nameof(d.VectorScale), EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardXCommand.cs b/osu.Game/Storyboards/Commands/StoryboardXCommand.cs
new file mode 100644
index 000000000000..d52e9c8a05a4
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardXCommand.cs
@@ -0,0 +1,23 @@
+// 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.Transforms;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardXCommand : StoryboardCommand<float>
+    {
+        public StoryboardXCommand(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.X);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.X = StartValue;
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.MoveToX(StartValue).Then().MoveToX(EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/Commands/StoryboardYCommand.cs b/osu.Game/Storyboards/Commands/StoryboardYCommand.cs
new file mode 100644
index 000000000000..90dfe4d9952d
--- /dev/null
+++ b/osu.Game/Storyboards/Commands/StoryboardYCommand.cs
@@ -0,0 +1,23 @@
+// 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.Transforms;
+
+namespace osu.Game.Storyboards.Commands
+{
+    public class StoryboardYCommand : StoryboardCommand<float>
+    {
+        public StoryboardYCommand(Easing easing, double startTime, double endTime, float startValue, float endValue)
+            : base(easing, startTime, endTime, startValue, endValue)
+        {
+        }
+
+        public override string PropertyName => nameof(Drawable.Y);
+
+        public override void ApplyInitialValue<TDrawable>(TDrawable d) => d.Y = StartValue;
+
+        public override TransformSequence<TDrawable> ApplyTransforms<TDrawable>(TDrawable d)
+            => d.MoveToY(StartValue).Then().MoveToY(EndValue, Duration, Easing);
+    }
+}
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index fae9ec7f2e45..f66f84af7a58 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -83,6 +83,7 @@ public DrawableStoryboardAnimation(StoryboardAnimation animation)
             Origin = animation.Origin;
             Position = animation.InitialPosition;
             Loop = animation.LoopType == AnimationLoopType.LoopForever;
+            Name = animation.Path;
 
             LifetimeStart = animation.StartTime;
             LifetimeEnd = animation.EndTimeForDisplay;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index ec875219b634..c5d70ddecc45 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -85,6 +85,7 @@ public DrawableStoryboardSprite(StoryboardSprite sprite)
             Sprite = sprite;
             Origin = sprite.Origin;
             Position = sprite.InitialPosition;
+            Name = sprite.Path;
 
             LifetimeStart = sprite.StartTime;
             LifetimeEnd = sprite.EndTimeForDisplay;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index 9a5db4bb39c3..329564a345cb 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -1,13 +1,16 @@
 // 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.IO;
+using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
-using osu.Game.Beatmaps;
+using osu.Framework.Utils;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -15,7 +18,7 @@ public partial class DrawableStoryboardVideo : CompositeDrawable
     {
         public readonly StoryboardVideo Video;
 
-        private Video? drawableVideo;
+        private DrawableVideo? drawableVideo;
 
         public override bool RemoveWhenNotAlive => false;
 
@@ -23,25 +26,37 @@ public DrawableStoryboardVideo(StoryboardVideo video)
         {
             Video = video;
 
-            RelativeSizeAxes = Axes.Both;
+            // In osu-stable, a mapper can add a scale command for a storyboard video.
+            // This allows scaling based on the video's absolute size.
+            //
+            // If not specified we take up the full available space.
+            bool useRelative = !video.Commands.Scale.Any();
+
+            RelativeSizeAxes = useRelative ? Axes.Both : Axes.None;
+            AutoSizeAxes = useRelative ? Axes.None : Axes.Both;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
+        private void load(TextureStore textureStore)
         {
             var stream = textureStore.GetStream(Video.Path);
 
             if (stream == null)
                 return;
 
-            InternalChild = drawableVideo = new Video(stream, false)
+            InternalChild = drawableVideo = new DrawableVideo(stream, false)
             {
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = RelativeSizeAxes,
                 FillMode = FillMode.Fill,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Alpha = 0,
             };
+
+            Video.ApplyTransforms(drawableVideo);
         }
 
         protected override void LoadComplete()
@@ -60,5 +75,65 @@ protected override void LoadComplete()
                     drawableVideo.FadeOut(500);
             }
         }
+
+        private partial class DrawableVideo : Video, IFlippable, IVectorScalable
+        {
+            private bool flipH;
+
+            public bool FlipH
+            {
+                get => flipH;
+                set
+                {
+                    if (flipH == value)
+                        return;
+
+                    flipH = value;
+                    Invalidate(Invalidation.MiscGeometry);
+                }
+            }
+
+            private bool flipV;
+
+            public bool FlipV
+            {
+                get => flipV;
+                set
+                {
+                    if (flipV == value)
+                        return;
+
+                    flipV = value;
+                    Invalidate(Invalidation.MiscGeometry);
+                }
+            }
+
+            private Vector2 vectorScale = Vector2.One;
+
+            public Vector2 VectorScale
+            {
+                get => vectorScale;
+                set
+                {
+                    if (vectorScale == value)
+                        return;
+
+                    if (!Validation.IsFinite(value)) throw new ArgumentException($@"{nameof(VectorScale)} must be finite, but is {value}.");
+
+                    vectorScale = value;
+                    Invalidate(Invalidation.MiscGeometry);
+                }
+            }
+
+            protected override Vector2 DrawScale
+                => new Vector2(FlipH ? -base.DrawScale.X : base.DrawScale.X, FlipV ? -base.DrawScale.Y : base.DrawScale.Y) * VectorScale;
+
+            public override Anchor Origin => StoryboardExtensions.AdjustOrigin(base.Origin, VectorScale, FlipH, FlipV);
+
+            public DrawableVideo(Stream stream, bool startAtCurrentTime = true)
+                : base(stream, startAtCurrentTime)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs b/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs
deleted file mode 100644
index bbc55a336d26..000000000000
--- a/osu.Game/Storyboards/Drawables/DrawablesExtensions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.Transforms;
-
-namespace osu.Game.Storyboards.Drawables
-{
-    public static class DrawablesExtensions
-    {
-        /// <summary>
-        /// Adjusts <see cref="Drawable.Blending"/> after a delay.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public static TransformSequence<T> TransformBlendingMode<T>(this T drawable, BlendingParameters newValue, double delay = 0)
-            where T : Drawable
-            => drawable.TransformTo(drawable.PopulateTransform(new TransformBlendingParameters(), newValue, delay));
-    }
-
-    public class TransformBlendingParameters : Transform<BlendingParameters, Drawable>
-    {
-        private BlendingParameters valueAt(double time)
-            => time < EndTime ? StartValue : EndValue;
-
-        public override string TargetMember => nameof(Drawable.Blending);
-
-        protected override void Apply(Drawable d, double time) => d.Blending = valueAt(time);
-        protected override void ReadIntoStartValue(Drawable d) => StartValue = d.Blending;
-    }
-}
diff --git a/osu.Game/Storyboards/Drawables/IFlippable.cs b/osu.Game/Storyboards/Drawables/IFlippable.cs
index 165b3d97cc7a..79f98ea6ef31 100644
--- a/osu.Game/Storyboards/Drawables/IFlippable.cs
+++ b/osu.Game/Storyboards/Drawables/IFlippable.cs
@@ -1,55 +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 osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    internal interface IFlippable : ITransformable
+    public interface IFlippable : IDrawable
     {
         bool FlipH { get; set; }
         bool FlipV { get; set; }
     }
-
-    internal class TransformFlipH : Transform<bool, IFlippable>
-    {
-        private bool valueAt(double time)
-            => time < EndTime ? StartValue : EndValue;
-
-        public override string TargetMember => nameof(IFlippable.FlipH);
-
-        protected override void Apply(IFlippable d, double time) => d.FlipH = valueAt(time);
-        protected override void ReadIntoStartValue(IFlippable d) => StartValue = d.FlipH;
-    }
-
-    internal class TransformFlipV : Transform<bool, IFlippable>
-    {
-        private bool valueAt(double time)
-            => time < EndTime ? StartValue : EndValue;
-
-        public override string TargetMember => nameof(IFlippable.FlipV);
-
-        protected override void Apply(IFlippable d, double time) => d.FlipV = valueAt(time);
-        protected override void ReadIntoStartValue(IFlippable d) => StartValue = d.FlipV;
-    }
-
-    internal static class FlippableExtensions
-    {
-        /// <summary>
-        /// Adjusts <see cref="IFlippable.FlipH"/> after a delay.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public static TransformSequence<T> TransformFlipH<T>(this T flippable, bool newValue, double delay = 0)
-            where T : class, IFlippable
-            => flippable.TransformTo(flippable.PopulateTransform(new TransformFlipH(), newValue, delay));
-
-        /// <summary>
-        /// Adjusts <see cref="IFlippable.FlipV"/> after a delay.
-        /// </summary>
-        /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
-        public static TransformSequence<T> TransformFlipV<T>(this T flippable, bool newValue, double delay = 0)
-            where T : class, IFlippable
-            => flippable.TransformTo(flippable.PopulateTransform(new TransformFlipV(), newValue, delay));
-    }
 }
diff --git a/osu.Game/Storyboards/Drawables/IVectorScalable.cs b/osu.Game/Storyboards/Drawables/IVectorScalable.cs
index 60a297e1267b..ce6047c8f6ef 100644
--- a/osu.Game/Storyboards/Drawables/IVectorScalable.cs
+++ b/osu.Game/Storyboards/Drawables/IVectorScalable.cs
@@ -1,21 +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 osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
 using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    internal interface IVectorScalable : ITransformable
+    public interface IVectorScalable : IDrawable
     {
         Vector2 VectorScale { get; set; }
     }
-
-    internal static class VectorScalableExtensions
-    {
-        public static TransformSequence<T> VectorScaleTo<T>(this T target, Vector2 newVectorScale, double duration = 0, Easing easing = Easing.None)
-            where T : class, IVectorScalable
-            => target.TransformTo(nameof(IVectorScalable.VectorScale), newVectorScale, duration, easing);
-    }
 }
diff --git a/osu.Game/Storyboards/StoryboardAnimation.cs b/osu.Game/Storyboards/StoryboardAnimation.cs
index 1a4b6bb923f6..0b714633c9b6 100644
--- a/osu.Game/Storyboards/StoryboardAnimation.cs
+++ b/osu.Game/Storyboards/StoryboardAnimation.cs
@@ -21,8 +21,7 @@ public StoryboardAnimation(string path, Anchor origin, Vector2 initialPosition,
             LoopType = loopType;
         }
 
-        public override Drawable CreateDrawable()
-            => new DrawableStoryboardAnimation(this);
+        public override Drawable CreateDrawable() => new DrawableStoryboardAnimation(this);
     }
 
     public enum AnimationLoopType
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 4992ae128d1d..42426c8c85b4 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Storyboards.Commands;
 using osu.Game.Storyboards.Drawables;
 using osuTK;
 
@@ -12,8 +13,8 @@ namespace osu.Game.Storyboards
 {
     public class StoryboardSprite : IStoryboardElementWithDuration
     {
-        private readonly List<CommandLoop> loops = new List<CommandLoop>();
-        private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();
+        private readonly List<StoryboardLoopingGroup> loopingGroups = new List<StoryboardLoopingGroup>();
+        private readonly List<StoryboardTriggerGroup> triggerGroups = new List<StoryboardTriggerGroup>();
 
         public string Path { get; }
         public bool IsDrawable => HasCommands;
@@ -21,7 +22,7 @@ public class StoryboardSprite : IStoryboardElementWithDuration
         public Anchor Origin;
         public Vector2 InitialPosition;
 
-        public readonly CommandTimelineGroup TimelineGroup = new CommandTimelineGroup();
+        public readonly StoryboardCommandGroup Commands = new StoryboardCommandGroup();
 
         public double StartTime
         {
@@ -34,13 +35,13 @@ public double StartTime
                 // anything before that point can be ignored (the sprite is not visible after all).
                 var alphaCommands = new List<(double startTime, bool isZeroStartValue)>();
 
-                var command = TimelineGroup.Alpha.Commands.FirstOrDefault();
+                var command = Commands.Alpha.FirstOrDefault();
                 if (command != null) alphaCommands.Add((command.StartTime, command.StartValue == 0));
 
-                foreach (var loop in loops)
+                foreach (var loop in loopingGroups)
                 {
-                    command = loop.Alpha.Commands.FirstOrDefault();
-                    if (command != null) alphaCommands.Add((command.StartTime + loop.LoopStartTime, command.StartValue == 0));
+                    command = loop.Alpha.FirstOrDefault();
+                    if (command != null) alphaCommands.Add((command.StartTime, command.StartValue == 0));
                 }
 
                 if (alphaCommands.Count > 0)
@@ -61,8 +62,8 @@ public double EarliestTransformTime
             {
                 // If we got to this point, either no alpha commands were present, or the earliest had a non-zero start value.
                 // The sprite's StartTime will be determined by the earliest command, regardless of type.
-                double earliestStartTime = TimelineGroup.StartTime;
-                foreach (var l in loops)
+                double earliestStartTime = Commands.StartTime;
+                foreach (var l in loopingGroups)
                     earliestStartTime = Math.Min(earliestStartTime, l.StartTime);
                 return earliestStartTime;
             }
@@ -72,9 +73,9 @@ public double EndTime
         {
             get
             {
-                double latestEndTime = TimelineGroup.EndTime;
+                double latestEndTime = Commands.EndTime;
 
-                foreach (var l in loops)
+                foreach (var l in loopingGroups)
                     latestEndTime = Math.Max(latestEndTime, l.EndTime);
 
                 return latestEndTime;
@@ -85,31 +86,16 @@ public double EndTimeForDisplay
         {
             get
             {
-                double latestEndTime = double.MaxValue;
+                double latestEndTime = Commands.EndTime;
 
-                // Ignore the whole setup if there are loops. In theory they can be handled here too, however the logic will be overly complex.
-                if (loops.Count == 0)
-                {
-                    // Take the minimum time of all the potential "death" reasons.
-                    latestEndTime = calculateOptimisedEndTime(TimelineGroup);
-                }
-
-                // If the logic above fails to find anything or discarded by the fact that there are loops present, latestEndTime will be double.MaxValue
-                // and thus conservativeEndTime will be used.
-                double conservativeEndTime = TimelineGroup.EndTime;
-
-                foreach (var l in loops)
-                    conservativeEndTime = Math.Max(conservativeEndTime, l.StartTime + l.CommandsDuration * l.TotalIterations);
+                foreach (var l in loopingGroups)
+                    latestEndTime = Math.Max(latestEndTime, l.StartTime + l.Duration * l.TotalIterations);
 
-                return Math.Min(latestEndTime, conservativeEndTime);
+                return latestEndTime;
             }
         }
 
-        public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
-
-        private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);
-
-        private delegate void DrawableTransformer<in T>(Drawable drawable, T value, double duration, Easing easing);
+        public bool HasCommands => Commands.HasCommands || loopingGroups.Any(l => l.HasCommands);
 
         public StoryboardSprite(string path, Anchor origin, Vector2 initialPosition)
         {
@@ -118,168 +104,39 @@ public StoryboardSprite(string path, Anchor origin, Vector2 initialPosition)
             InitialPosition = initialPosition;
         }
 
-        public CommandLoop AddLoop(double startTime, int repeatCount)
+        public virtual Drawable CreateDrawable() => new DrawableStoryboardSprite(this);
+
+        public StoryboardLoopingGroup AddLoopingGroup(double loopStartTime, int repeatCount)
         {
-            var loop = new CommandLoop(startTime, repeatCount);
-            loops.Add(loop);
+            var loop = new StoryboardLoopingGroup(loopStartTime, repeatCount);
+            loopingGroups.Add(loop);
             return loop;
         }
 
-        public CommandTrigger AddTrigger(string triggerName, double startTime, double endTime, int groupNumber)
+        public StoryboardTriggerGroup AddTriggerGroup(string triggerName, double startTime, double endTime, int groupNumber)
         {
-            var trigger = new CommandTrigger(triggerName, startTime, endTime, groupNumber);
-            triggers.Add(trigger);
+            var trigger = new StoryboardTriggerGroup(triggerName, startTime, endTime, groupNumber);
+            triggerGroups.Add(trigger);
             return trigger;
         }
 
-        public virtual Drawable CreateDrawable()
-            => new DrawableStoryboardSprite(this);
-
-        public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<CommandTimelineGroup, double>>? triggeredGroups = null)
+        public void ApplyTransforms<TDrawable>(TDrawable drawable)
+            where TDrawable : Drawable, IFlippable, IVectorScalable
         {
-            // For performance reasons, we need to apply the commands in order by start time. Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity.
-            // To achieve this, commands are "generated" as pairs of (command, initFunc, transformFunc) and batched into a contiguous list
-            // The list is then stably-sorted (to preserve command order), and applied to the drawable sequentially.
-
-            List<IGeneratedCommand> generated = new List<IGeneratedCommand>();
+            HashSet<string> appliedProperties = new HashSet<string>();
 
-            generateCommands(generated, getCommands(g => g.X, triggeredGroups), (d, value) => d.X = value, (d, value, duration, easing) => d.MoveToX(value, duration, easing));
-            generateCommands(generated, getCommands(g => g.Y, triggeredGroups), (d, value) => d.Y = value, (d, value, duration, easing) => d.MoveToY(value, duration, easing));
-            generateCommands(generated, getCommands(g => g.Scale, triggeredGroups), (d, value) => d.Scale = new Vector2(value), (d, value, duration, easing) => d.ScaleTo(value, duration, easing));
-            generateCommands(generated, getCommands(g => g.Rotation, triggeredGroups), (d, value) => d.Rotation = value, (d, value, duration, easing) => d.RotateTo(value, duration, easing));
-            generateCommands(generated, getCommands(g => g.Colour, triggeredGroups), (d, value) => d.Colour = value, (d, value, duration, easing) => d.FadeColour(value, duration, easing));
-            generateCommands(generated, getCommands(g => g.Alpha, triggeredGroups), (d, value) => d.Alpha = value, (d, value, duration, easing) => d.FadeTo(value, duration, easing));
-            generateCommands(generated, getCommands(g => g.BlendingParameters, triggeredGroups), (d, value) => d.Blending = value, (d, value, duration, _) => d.TransformBlendingMode(value, duration),
-                false);
-
-            if (drawable is IVectorScalable vectorScalable)
-            {
-                generateCommands(generated, getCommands(g => g.VectorScale, triggeredGroups), (_, value) => vectorScalable.VectorScale = value,
-                    (_, value, duration, easing) => vectorScalable.VectorScaleTo(value, duration, easing));
-            }
+            // For performance reasons, we need to apply the commands in chronological order.
+            // Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity.
+            IEnumerable<IStoryboardCommand> commands = Commands.AllCommands;
+            commands = commands.Concat(loopingGroups.SelectMany(l => l.AllCommands));
 
-            if (drawable is IFlippable flippable)
+            foreach (var command in commands.OrderBy(c => c.StartTime))
             {
-                generateCommands(generated, getCommands(g => g.FlipH, triggeredGroups), (_, value) => flippable.FlipH = value, (_, value, duration, _) => flippable.TransformFlipH(value, duration),
-                    false);
-                generateCommands(generated, getCommands(g => g.FlipV, triggeredGroups), (_, value) => flippable.FlipV = value, (_, value, duration, _) => flippable.TransformFlipV(value, duration),
-                    false);
-            }
-
-            foreach (var command in generated.OrderBy(g => g.StartTime))
-                command.ApplyTo(drawable);
-        }
-
-        private void generateCommands<T>(List<IGeneratedCommand> resultList, IEnumerable<CommandTimeline<T>.TypedCommand> commands,
-                                         DrawablePropertyInitializer<T> initializeProperty, DrawableTransformer<T> transform, bool alwaysInitialize = true)
-        {
-            bool initialized = false;
-
-            foreach (var command in commands)
-            {
-                DrawablePropertyInitializer<T>? initFunc = null;
-
-                if (!initialized)
-                {
-                    if (alwaysInitialize || command.StartTime == command.EndTime)
-                        initFunc = initializeProperty;
-                    initialized = true;
-                }
-
-                resultList.Add(new GeneratedCommand<T>(command, initFunc, transform));
-            }
-        }
-
-        private IEnumerable<CommandTimeline<T>.TypedCommand> getCommands<T>(CommandTimelineSelector<T> timelineSelector, IEnumerable<Tuple<CommandTimelineGroup, double>>? triggeredGroups)
-        {
-            var commands = TimelineGroup.GetCommands(timelineSelector);
-            foreach (var loop in loops)
-                commands = commands.Concat(loop.GetCommands(timelineSelector));
-
-            if (triggeredGroups != null)
-            {
-                foreach (var pair in triggeredGroups)
-                    commands = commands.Concat(pair.Item1.GetCommands(timelineSelector, pair.Item2));
-            }
-
-            return commands;
-        }
-
-        private static double calculateOptimisedEndTime(CommandTimelineGroup timelineGroup)
-        {
-            // Here we are starting from maximum value and trying to minimise the end time on each step.
-            // There are few solid guesses we can make using which sprite's end time can be minimised: alpha = 0, scale = 0, colour.a = 0.
-            double[] deathTimes =
-            {
-                double.MaxValue, // alpha
-                double.MaxValue, // colour alpha
-                double.MaxValue, // scale
-                double.MaxValue, // scale x
-                double.MaxValue, // scale y
-            };
-
-            // The loops below are following the same pattern.
-            // We could be using TimelineGroup.EndValue here, however it's possible to have multiple commands with 0 value in a row
-            // so we are saving the earliest of them.
-            foreach (var alphaCommand in timelineGroup.Alpha.Commands)
-            {
-                if (alphaCommand.EndValue == 0)
-                    // commands are ordered by the start time, however end time may vary. Save the earliest.
-                    deathTimes[0] = Math.Min(alphaCommand.EndTime, deathTimes[0]);
-                else
-                    // If value isn't 0 (sprite becomes visible again), revert the saved state.
-                    deathTimes[0] = double.MaxValue;
-            }
-
-            foreach (var colourCommand in timelineGroup.Colour.Commands)
-                deathTimes[1] = colourCommand.EndValue.A == 0 ? Math.Min(colourCommand.EndTime, deathTimes[1]) : double.MaxValue;
-
-            foreach (var scaleCommand in timelineGroup.Scale.Commands)
-                deathTimes[2] = scaleCommand.EndValue == 0 ? Math.Min(scaleCommand.EndTime, deathTimes[2]) : double.MaxValue;
-
-            foreach (var scaleCommand in timelineGroup.VectorScale.Commands)
-            {
-                deathTimes[3] = scaleCommand.EndValue.X == 0 ? Math.Min(scaleCommand.EndTime, deathTimes[3]) : double.MaxValue;
-                deathTimes[4] = scaleCommand.EndValue.Y == 0 ? Math.Min(scaleCommand.EndTime, deathTimes[4]) : double.MaxValue;
-            }
-
-            return deathTimes.Min();
-        }
-
-        public override string ToString()
-            => $"{Path}, {Origin}, {InitialPosition}";
-
-        private interface IGeneratedCommand
-        {
-            double StartTime { get; }
-
-            void ApplyTo(Drawable drawable);
-        }
-
-        private readonly struct GeneratedCommand<T> : IGeneratedCommand
-        {
-            public double StartTime => command.StartTime;
-
-            private readonly DrawablePropertyInitializer<T>? initializeProperty;
-            private readonly DrawableTransformer<T> transform;
-            private readonly CommandTimeline<T>.TypedCommand command;
-
-            public GeneratedCommand(CommandTimeline<T>.TypedCommand command, DrawablePropertyInitializer<T>? initializeProperty, DrawableTransformer<T> transform)
-            {
-                this.command = command;
-                this.initializeProperty = initializeProperty;
-                this.transform = transform;
-            }
-
-            public void ApplyTo(Drawable drawable)
-            {
-                initializeProperty?.Invoke(drawable, command.StartValue);
+                if (appliedProperties.Add(command.PropertyName))
+                    command.ApplyInitialValue(drawable);
 
                 using (drawable.BeginAbsoluteSequence(command.StartTime))
-                {
-                    transform(drawable, command.StartValue, 0, Easing.None);
-                    transform(drawable, command.EndValue, command.Duration, command.Easing);
-                }
+                    command.ApplyTransforms(drawable);
             }
         }
     }
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 8c11e19a0690..14189a1a6c5a 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -3,23 +3,20 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Storyboards.Drawables;
+using osuTK;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardVideo : IStoryboardElement
+    public class StoryboardVideo : StoryboardSprite
     {
-        public string Path { get; }
-
-        public bool IsDrawable => true;
-
-        public double StartTime { get; }
-
         public StoryboardVideo(string path, double offset)
+            : base(path, Anchor.Centre, Vector2.Zero)
         {
-            Path = path;
-            StartTime = offset;
+            // This is just required to get a valid StartTime based on the incoming offset.
+            // Actual fades are handled inside DrawableStoryboardVideo for now.
+            Commands.AddAlpha(Easing.None, offset, offset, 0, 0);
         }
 
-        public Drawable CreateDrawable() => new DrawableStoryboardVideo(this);
+        public override Drawable CreateDrawable() => new DrawableStoryboardVideo(this);
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index ff670e12322e..de7bcfcfaa42 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -27,6 +27,7 @@ public TestBeatmap(RulesetInfo ruleset, bool withHitObjects = true)
             BeatmapInfo = baseBeatmap.BeatmapInfo;
             ControlPointInfo = baseBeatmap.ControlPointInfo;
             Breaks = baseBeatmap.Breaks;
+            UnhandledEventLines = baseBeatmap.UnhandledEventLines;
 
             if (withHitObjects)
                 HitObjects = baseBeatmap.HitObjects;
diff --git a/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs b/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
index 16cbf879dfac..b589e66d8ba2 100644
--- a/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
+++ b/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
@@ -21,6 +21,9 @@ public partial class TestMetadataClient : MetadataClient
         public override IBindableDictionary<int, UserPresence> UserStates => userStates;
         private readonly BindableDictionary<int, UserPresence> userStates = new BindableDictionary<int, UserPresence>();
 
+        public override IBindable<DailyChallengeInfo?> DailyChallengeInfo => dailyChallengeInfo;
+        private readonly Bindable<DailyChallengeInfo?> dailyChallengeInfo = new Bindable<DailyChallengeInfo?>();
+
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -77,5 +80,11 @@ public override Task<BeatmapUpdates> GetChangesSince(int queueId)
             => Task.FromResult(new BeatmapUpdates(Array.Empty<int>(), queueId));
 
         public override Task BeatmapSetsUpdated(BeatmapUpdates updates) => Task.CompletedTask;
+
+        public override Task DailyChallengeUpdated(DailyChallengeInfo? info)
+        {
+            dailyChallengeInfo.Value = info;
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index edaa1562c731..59fcd5d625e7 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -12,6 +13,7 @@ namespace osu.Game.Users
     /// Matches `osu_countries` database table.
     /// </summary>
     [JsonConverter(typeof(StringEnumConverter))]
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public enum CountryCode
     {
diff --git a/osu.Game/Users/Drawables/UpdateableFlag.cs b/osu.Game/Users/Drawables/UpdateableFlag.cs
index 8f8d7052e51b..6a587212a342 100644
--- a/osu.Game/Users/Drawables/UpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/UpdateableFlag.cs
@@ -3,9 +3,11 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 
@@ -13,33 +15,43 @@ namespace osu.Game.Users.Drawables
 {
     public partial class UpdateableFlag : ModelBackedDrawable<CountryCode>
     {
+        private CountryCode countryCode;
+
         public CountryCode CountryCode
         {
-            get => Model;
-            set => Model = value;
+            get => countryCode;
+            set
+            {
+                countryCode = value;
+                updateModel();
+            }
         }
 
-        /// <summary>
-        /// Whether to show a place holder on unknown country.
-        /// </summary>
-        public bool ShowPlaceholderOnUnknown = true;
-
         /// <summary>
         /// Perform an action in addition to showing the country ranking.
         /// This should be used to perform auxiliary tasks and not as a primary action for clicking a flag (to maintain a consistent UX).
         /// </summary>
         public Action? Action;
 
+        private readonly Bindable<bool> hideFlags = new BindableBool();
+
+        [Resolved]
+        private RankingsOverlay? rankingsOverlay { get; set; }
+
         public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
         {
             CountryCode = countryCode;
+            hideFlags.BindValueChanged(_ => updateModel());
         }
 
-        protected override Drawable? CreateDrawable(CountryCode countryCode)
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
         {
-            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
-                return null;
+            config.BindWith(OsuSetting.HideCountryFlags, hideFlags);
+        }
 
+        protected override Drawable CreateDrawable(CountryCode countryCode)
+        {
             return new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -54,14 +66,13 @@ public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
             };
         }
 
-        [Resolved]
-        private RankingsOverlay? rankingsOverlay { get; set; }
-
         protected override bool OnClick(ClickEvent e)
         {
             Action?.Invoke();
             rankingsOverlay?.ShowCountry(CountryCode);
             return true;
         }
+
+        private void updateModel() => Model = hideFlags.Value ? CountryCode.Unknown : countryCode;
     }
 }
diff --git a/osu.Game/Utils/GeometryUtils.cs b/osu.Game/Utils/GeometryUtils.cs
index dbeba4dfc1e6..5ddffbef12c8 100644
--- a/osu.Game/Utils/GeometryUtils.cs
+++ b/osu.Game/Utils/GeometryUtils.cs
@@ -78,6 +78,15 @@ public static Vector2 GetScaledPosition(Anchor reference, Vector2 scale, Quad se
             return position;
         }
 
+        /// <summary>
+        /// Given a scale multiplier, an origin, and a position,
+        /// will return the scaled position in screen space coordinates.
+        /// </summary>
+        public static Vector2 GetScaledPosition(Vector2 scale, Vector2 origin, Vector2 position)
+        {
+            return origin + (position - origin) * scale;
+        }
+
         /// <summary>
         /// Returns a quad surrounding the provided points.
         /// </summary>
diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index 61622a71225f..8d3e5fb83419 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -39,12 +39,13 @@ public class SentryLogger : IDisposable
         public SentryLogger(OsuGame game)
         {
             this.game = game;
+
+            if (!game.IsDeployedBuild || !game.CreateEndpoints().WebsiteRootUrl.EndsWith(@".ppy.sh", StringComparison.Ordinal))
+                return;
+
             sentrySession = SentrySdk.Init(options =>
             {
-                // Not setting the dsn will completely disable sentry.
-                if (game.IsDeployedBuild && game.CreateEndpoints().WebsiteRootUrl.EndsWith(@".ppy.sh", StringComparison.Ordinal))
-                    options.Dsn = "https://ad9f78529cef40ac874afb95a9aca04e@sentry.ppy.sh/2";
-
+                options.Dsn = "https://ad9f78529cef40ac874afb95a9aca04e@sentry.ppy.sh/2";
                 options.AutoSessionTracking = true;
                 options.IsEnvironmentUser = false;
                 options.IsGlobalModeEnabled = true;
@@ -59,12 +60,15 @@ public SentryLogger(OsuGame game)
 
         public void AttachUser(IBindable<APIUser> user)
         {
+            if (sentrySession == null)
+                return;
+
             Debug.Assert(localUser == null);
 
             localUser = user.GetBoundCopy();
             localUser.BindValueChanged(u =>
             {
-                SentrySdk.ConfigureScope(scope => scope.User = new User
+                SentrySdk.ConfigureScope(scope => scope.User = new SentryUser
                 {
                     Username = u.NewValue.Username,
                     Id = u.NewValue.Id.ToString(),
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0e091dbd376e..158e4bc9520c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,14 +30,14 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.1117.0">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2024.517.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2024.306.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.321.0" />
-    <PackageReference Include="Sentry" Version="3.41.3" />
+    <PackageReference Include="ppy.osu.Framework" Version="2024.523.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.517.0" />
+    <PackageReference Include="Sentry" Version="4.3.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.36.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6b63bfa1e25b..eba9abd3b84d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.306.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.523.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png b/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png
index 9287a7104009..7b62835cdcfa 100644
Binary files a/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png and b/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png differ
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 452f90eceac5..08eb264aab08 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -340,12 +340,14 @@
 	<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/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DDKK/@EntryIndexedValue">DDKK</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EF/@EntryIndexedValue">EF</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FPS/@EntryIndexedValue">FPS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HP/@EntryIndexedValue">HP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSL/@EntryIndexedValue">HSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSPA/@EntryIndexedValue">HSPA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSV/@EntryIndexedValue">HSV</s:String>
@@ -357,6 +359,8 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KDDK/@EntryIndexedValue">KDDK</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KKDD/@EntryIndexedValue">KKDD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
@@ -375,6 +379,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WIP/@EntryIndexedValue">WIP</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
@@ -774,9 +779,19 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=2c62818f_002D621b_002D4425_002Dadc9_002D78611099bfcb/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Type parameters"&gt;&lt;ElementKinds&gt;&lt;Kind Name="TYPE_PARAMETER" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=669e5282_002Dfb4b_002D4e90_002D91e7_002D07d269d04b60/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=76f79b1e_002Dece7_002D4df2_002Da322_002D1bd7fea25eb7/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Local functions"&gt;&lt;ElementKinds&gt;&lt;Kind Name="LOCAL_FUNCTION" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=8b8504e3_002Df0be_002D4c14_002D9103_002Dc732f2bddc15/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Enum members"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ENUM_MEMBER" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4f433b8_002Dabcd_002D4e55_002Da08f_002D82e78cef0f0c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Local constants"&gt;&lt;ElementKinds&gt;&lt;Kind Name="LOCAL_CONSTANT" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=c873eafb_002Dd57f_002D481d_002D8c93_002D77f6863c2f88/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -841,6 +856,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>