diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
index d500c595c0..a7a6649a4f 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Benchmarks" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net6.0/osu.Game.Benchmarks.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net8.0/osu.Game.Benchmarks.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
index 6da760dead..39e6cb10c5 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Catch.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
index 741679707a..88367387ae 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Mania.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
index 104b1266ca..cdc980e019 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Osu.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
index f58f9d4ae2..d91cf01479 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Taiko.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
index 0f2c390328..daafff7dfb 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net8.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tournament" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
index 898aec880c..62f587410f 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net8.0/osu.Game.Tournament.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
index dae6e032b1..f6e2c26d19 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net8.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
index 519107b5e3..c437dcf0f0 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net6.0/osu.Game.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net8.0/osu.Game.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.run/osu! (Second Client).run.xml b/.run/osu! (Second Client).run.xml
index 9a471df902..d72e7abee2 100644
--- a/.run/osu! (Second Client).run.xml	
+++ b/.run/osu! (Second Client).run.xml	
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (Second Client)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net8.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--debug-client-id=1" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net6.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net6.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.vscode/launch.json b/.vscode/launch.json
index d93fddf42d..7c5225cff7 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/net6.0/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net8.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
@@ -19,7 +19,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/net6.0/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Release/net8.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
@@ -31,7 +31,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/net6.0/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/net8.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
@@ -43,7 +43,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/net6.0/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/net8.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
@@ -55,7 +55,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/net6.0/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net8.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -68,7 +68,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/net6.0/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Release/net8.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -81,7 +81,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net8.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -94,7 +94,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net8.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -105,7 +105,7 @@
             "name": "Benchmark",
             "type": "coreclr",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/net6.0/osu.Game.Benchmarks.dll",
+            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/net8.0/osu.Game.Benchmarks.dll",
             "args": [
                 "--filter",
                 "*"
diff --git a/README.md b/README.md
index dc5809d46b..cb722e5df3 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ If you are just looking to give the game a whirl, you can grab the latest releas
 
 You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download).
 
-If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
+If your platform is unsupported or not listed above, there is still a chance you can run the release or manually build it by following the instructions below.
 
 **For iOS/iPadOS users**: The iOS testflight link fills up very fast (Apple has a hard limit of 10,000 users). We reset it occasionally. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements. Our goal is to get the game on mobile app stores in early 2024.
 
@@ -51,7 +51,7 @@ You can see some examples of custom rulesets by visiting the [custom ruleset dir
 
 Please make sure you have the following prerequisites:
 
-- A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
+- A desktop platform with the [.NET 8.0 SDK](https://dotnet.microsoft.com/download) installed.
 
 When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/), or [Visual Studio Code](https://code.visualstudio.com/) with the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) plugin installed.
 
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
index b433819346..0d72037393 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
index d60bc2571d..ec832d9a72 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.Pippidon.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.Pippidon.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
index f1f37f6363..a60979073b 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
index d60bc2571d..ec832d9a72 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.Pippidon.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.Pippidon.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Android.props b/osu.Android.props
index d7f29beeb3..30037c868c 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.205.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.221.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index a7453dc0e0..2201502e39 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -47,8 +47,8 @@ namespace osu.Desktop
             {
                 var windowsVersion = Environment.OSVersion.Version;
 
-                // While .NET 6 still supports Windows 7 and above, we are limited by realm currently, as they choose to only support 8.1 and higher.
-                // See https://www.mongodb.com/docs/realm/sdk/dotnet/#supported-platforms
+                // While .NET 8 only supports Windows 10 and above, running on Windows 7/8.1 may still work. We are limited by realm currently, as they choose to only support 8.1 and higher.
+                // 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
diff --git a/osu.Desktop/lazer.ico b/osu.Desktop/lazer.ico
index f84866b8e9..a3280f0de0 100644
Binary files a/osu.Desktop/lazer.ico and b/osu.Desktop/lazer.ico differ
diff --git a/osu.Game.Benchmarks/BenchmarkStringComparison.cs b/osu.Game.Benchmarks/BenchmarkStringComparison.cs
new file mode 100644
index 0000000000..d40b92db5f
--- /dev/null
+++ b/osu.Game.Benchmarks/BenchmarkStringComparison.cs
@@ -0,0 +1,48 @@
+// Copyright (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 BenchmarkDotNet.Attributes;
+using osu.Game.Utils;
+
+namespace osu.Game.Benchmarks
+{
+    public class BenchmarkStringComparison
+    {
+        private string[] strings = null!;
+
+        [GlobalSetup]
+        public void GlobalSetUp()
+        {
+            strings = new string[10000];
+
+            for (int i = 0; i < strings.Length; ++i)
+                strings[i] = Guid.NewGuid().ToString();
+
+            for (int i = 0; i < strings.Length; ++i)
+            {
+                if (i % 2 == 0)
+                    strings[i] = strings[i].ToUpperInvariant();
+            }
+        }
+
+        [Benchmark]
+        public void OrdinalIgnoreCase() => compare(StringComparer.OrdinalIgnoreCase);
+
+        [Benchmark]
+        public void OrdinalSortByCase() => compare(OrdinalSortByCaseStringComparer.DEFAULT);
+
+        [Benchmark]
+        public void InvariantCulture() => compare(StringComparer.InvariantCulture);
+
+        private void compare(IComparer<string> comparer)
+        {
+            for (int i = 0; i < strings.Length; ++i)
+            {
+                for (int j = i + 1; j < strings.Length; ++j)
+                    _ = comparer.Compare(strings[i], strings[j]);
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
index 201343a036..7b9291c870 100644
--- a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
deleted file mode 100644
index e2fc31d869..0000000000
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
+++ /dev/null
@@ -1,111 +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 System.Linq;
-using NUnit.Framework;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
-using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Catch.Judgements;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawables;
-using osu.Game.Rulesets.Catch.Skinning;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
-using Direction = osu.Game.Rulesets.Catch.UI.Direction;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    public partial class TestSceneCatchSkinConfiguration : OsuTestScene
-    {
-        private Catcher catcher;
-
-        private readonly Container container;
-
-        public TestSceneCatchSkinConfiguration()
-        {
-            Add(container = new Container { RelativeSizeAxes = Axes.Both });
-        }
-
-        [TestCase(false)]
-        [TestCase(true)]
-        public void TestCatcherPlateFlipping(bool flip)
-        {
-            AddStep("setup catcher", () =>
-            {
-                var skin = new TestSkin { FlipCatcherPlate = flip };
-                container.Child = new SkinProvidingContainer(skin)
-                {
-                    Child = catcher = new Catcher(new DroppedObjectContainer())
-                    {
-                        Anchor = Anchor.Centre
-                    }
-                };
-            });
-
-            Fruit fruit = new Fruit();
-
-            AddStep("catch fruit", () => catchFruit(fruit, 20));
-
-            float position = 0;
-
-            AddStep("record fruit position", () => position = getCaughtObjectPosition(fruit));
-
-            AddStep("face left", () => catcher.VisualDirection = Direction.Left);
-
-            if (flip)
-                AddAssert("fruit position changed", () => !Precision.AlmostEquals(getCaughtObjectPosition(fruit), position));
-            else
-                AddAssert("fruit position unchanged", () => Precision.AlmostEquals(getCaughtObjectPosition(fruit), position));
-
-            AddStep("face right", () => catcher.VisualDirection = Direction.Right);
-
-            AddAssert("fruit position restored", () => Precision.AlmostEquals(getCaughtObjectPosition(fruit), position));
-        }
-
-        private float getCaughtObjectPosition(Fruit fruit)
-        {
-            var caughtObject = catcher.ChildrenOfType<CaughtObject>().Single(c => c.HitObject == fruit);
-            return caughtObject.Parent!.ToSpaceOfOtherDrawable(caughtObject.Position, catcher).X;
-        }
-
-        private void catchFruit(Fruit fruit, float x)
-        {
-            fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-            var drawableFruit = new DrawableFruit(fruit) { X = x };
-            var judgement = fruit.CreateJudgement();
-            catcher.OnNewResult(drawableFruit, new CatchJudgementResult(fruit, judgement)
-            {
-                Type = judgement.MaxResult
-            });
-        }
-
-        private class TestSkin : TrianglesSkin
-        {
-            public bool FlipCatcherPlate { get; set; }
-
-            public TestSkin()
-                : base(null!)
-            {
-            }
-
-            public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
-            {
-                if (lookup is CatchSkinConfiguration config)
-                {
-                    if (config == CatchSkinConfiguration.FlipCatcherPlate)
-                        return SkinUtils.As<TValue>(new Bindable<bool>(FlipCatcherPlate));
-                }
-
-                return base.GetConfig<TLookup, TValue>(lookup);
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index f60ae29f77..b03fa00f76 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private JudgementResult createResult(CatchHitObject hitObject)
         {
-            return new CatchJudgementResult(hitObject, hitObject.CreateJudgement())
+            return new CatchJudgementResult(hitObject, hitObject.Judgement)
             {
                 Type = catcher.CanCatch(hitObject) ? HitResult.Great : HitResult.Miss
             };
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 9d88c90576..f933b9a28f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Rulesets.Catch.Mods
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
             drawableRuleset.PlayfieldAdjustmentContainer.Scale = new Vector2(1, -1);
-            drawableRuleset.PlayfieldAdjustmentContainer.Y = 1 - drawableRuleset.PlayfieldAdjustmentContainer.Y;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs
deleted file mode 100644
index ea8d742b1a..0000000000
--- a/osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs
+++ /dev/null
@@ -1,13 +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.
-
-namespace osu.Game.Rulesets.Catch.Skinning
-{
-    public enum CatchSkinConfiguration
-    {
-        /// <summary>
-        /// Whether the contents of the catcher plate should be visually flipped when the catcher direction is changed.
-        /// </summary>
-        FlipCatcherPlate
-    }
-}
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
index fb8af9bdb6..d1ef47cf17 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -122,19 +122,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
                     result.Value = LegacyColourCompatibility.DisallowZeroAlpha(result.Value);
                     return (IBindable<TValue>)result;
-
-                case CatchSkinConfiguration config:
-                    switch (config)
-                    {
-                        case CatchSkinConfiguration.FlipCatcherPlate:
-                            // Don't flip catcher plate contents if the catcher is provided by this legacy skin.
-                            if (GetDrawableComponent(new CatchSkinComponentLookup(CatchSkinComponents.Catcher)) != null)
-                                return (IBindable<TValue>)new Bindable<bool>();
-
-                            break;
-                    }
-
-                    break;
             }
 
             return base.GetConfig<TLookup, TValue>(lookup);
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 11531011ee..74dfa6c1fd 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -17,24 +17,36 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfieldAdjustmentContainer()
         {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.TopCentre;
+            const float base_game_width = 1024f;
+            const float base_game_height = 768f;
 
-            // playfields in stable are positioned vertically at three fourths the difference between the playfield height and the window height in stable.
-            // we can match that in lazer by using relative coordinates for Y and considering window height to be 1, and playfield height to be 0.8.
-            RelativePositionAxes = Axes.Y;
-            Y = (1 - playfield_size_adjust) / 4 * 3;
+            // extra bottom space for the catcher to not get cut off at tall resolutions lower than 4:3 (e.g. 5:4). number chosen based on testing with maximum catcher scale (i.e. CS 0).
+            const float extra_bottom_space = 200f;
 
-            Size = new Vector2(playfield_size_adjust);
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
 
             InternalChild = new Container
             {
+                // This container limits vertical visibility of the playfield to ensure fairness between wide and tall resolutions (i.e. tall resolutions should not see more fruits).
+                // Note that the container still extends across the screen horizontally, so that hit explosions at the sides of the playfield do not get cut off.
+                Name = "Visible area",
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                FillMode = FillMode.Fit,
-                FillAspectRatio = 4f / 3,
-                Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both, }
+                RelativeSizeAxes = Axes.X,
+                Height = base_game_height + extra_bottom_space,
+                Y = extra_bottom_space / 2,
+                Masking = true,
+                Child = new Container
+                {
+                    Name = "Playable area",
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    // playfields in stable are positioned vertically at three fourths the difference between the playfield height and the window height in stable.
+                    Y = base_game_height * ((1 - playfield_size_adjust) / 4 * 3),
+                    Size = new Vector2(base_game_width, base_game_height) * playfield_size_adjust,
+                    Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
+                },
             };
         }
 
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 147850a9b7..dca01fc61a 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -112,11 +112,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public Vector2 BodyScale => Scale * body.Scale;
 
-        /// <summary>
-        /// Whether the contents of the catcher plate should be visually flipped when the catcher direction is changed.
-        /// </summary>
-        private bool flipCatcherPlate;
-
         /// <summary>
         /// Width of the area that can be used to attempt catches during gameplay.
         /// </summary>
@@ -339,8 +334,6 @@ namespace osu.Game.Rulesets.Catch.UI
                 skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
                 DEFAULT_HYPER_DASH_COLOUR;
 
-            flipCatcherPlate = skin.GetConfig<CatchSkinConfiguration, bool>(CatchSkinConfiguration.FlipCatcherPlate)?.Value ?? true;
-
             runHyperDashStateTransition(HyperDashing);
         }
 
@@ -352,8 +345,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             body.Scale = scaleFromDirection;
             // Inverse of catcher scale is applied here, as catcher gets scaled by circle size and so do the incoming fruit.
-            caughtObjectContainer.Scale = (1 / Scale.X) * (flipCatcherPlate ? scaleFromDirection : Vector2.One);
-            hitExplosionContainer.Scale = flipCatcherPlate ? scaleFromDirection : Vector2.One;
+            caughtObjectContainer.Scale = new Vector2(1 / Scale.X);
 
             // Correct overshooting.
             if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||
diff --git a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
index f6a067a831..b8dafda8b5 100644
--- a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
index 2c8c151e7f..9620897983 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
@@ -1,8 +1,18 @@
 // Copyright (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.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests.Mods
@@ -11,9 +21,80 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
     {
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
-        [TestCase(0.5f)]
-        [TestCase(0.1f)]
-        [TestCase(0.7f)]
-        public void TestCoverage(float coverage) => CreateModTest(new ModTestData { Mod = new ManiaModFadeIn { Coverage = { Value = coverage } }, PassCondition = () => true });
+        [Test]
+        public void TestMinCoverageFullWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MIN_COVERAGE)
+            });
+        }
+
+        [Test]
+        public void TestMinCoverageHalfWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MIN_COVERAGE)
+            });
+
+            AddStep("set playfield width to 0.5", () => Player.Width = 0.5f);
+        }
+
+        [Test]
+        public void TestMaxCoverageFullWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MAX_COVERAGE)
+            });
+
+            AddStep("set combo to 480", () => Player.ScoreProcessor.Combo.Value = 480);
+        }
+
+        [Test]
+        public void TestMaxCoverageHalfWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MAX_COVERAGE)
+            });
+
+            AddStep("set combo to 480", () => Player.ScoreProcessor.Combo.Value = 480);
+            AddStep("set playfield width to 0.5", () => Player.Width = 0.5f);
+        }
+
+        [Test]
+        public void TestNoCoverageDuringBreak()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                Beatmap = new Beatmap
+                {
+                    HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
+                    Breaks = { new BreakPeriod(2000, 28000) }
+                },
+                PassCondition = () => Player.IsBreakTime.Value && checkCoverage(0)
+            });
+        }
+
+        private bool checkCoverage(float expected)
+        {
+            Drawable? cover = this.ChildrenOfType<PlayfieldCoveringWrapper>().FirstOrDefault();
+            Drawable? filledArea = cover?.ChildrenOfType<Box>().LastOrDefault();
+
+            if (filledArea == null)
+                return false;
+
+            float scale = cover!.DrawHeight / (768 - Stage.HIT_TARGET_POSITION);
+
+            // A bit of lenience because the test may end up hitting hitobjects before any assertions.
+            return Precision.AlmostEquals(filledArea.DrawHeight / scale, expected, 0.1);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
index 204f26f151..ae23c4573c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
@@ -1,8 +1,18 @@
 // Copyright (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.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests.Mods
@@ -11,9 +21,80 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
     {
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
-        [TestCase(0.5f)]
-        [TestCase(0.2f)]
-        [TestCase(0.8f)]
-        public void TestCoverage(float coverage) => CreateModTest(new ModTestData { Mod = new ManiaModHidden { Coverage = { Value = coverage } }, PassCondition = () => true });
+        [Test]
+        public void TestMinCoverageFullWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MIN_COVERAGE)
+            });
+        }
+
+        [Test]
+        public void TestMinCoverageHalfWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MIN_COVERAGE)
+            });
+
+            AddStep("set playfield width to 0.5", () => Player.Width = 0.5f);
+        }
+
+        [Test]
+        public void TestMaxCoverageFullWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MAX_COVERAGE)
+            });
+
+            AddStep("set combo to 480", () => Player.ScoreProcessor.Combo.Value = 480);
+        }
+
+        [Test]
+        public void TestMaxCoverageHalfWidth()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                PassCondition = () => checkCoverage(ManiaModHidden.MAX_COVERAGE)
+            });
+
+            AddStep("set combo to 480", () => Player.ScoreProcessor.Combo.Value = 480);
+            AddStep("set playfield width to 0.5", () => Player.Width = 0.5f);
+        }
+
+        [Test]
+        public void TestNoCoverageDuringBreak()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new ManiaModHidden(),
+                Beatmap = new Beatmap
+                {
+                    HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
+                    Breaks = { new BreakPeriod(2000, 28000) }
+                },
+                PassCondition = () => Player.IsBreakTime.Value && checkCoverage(0)
+            });
+        }
+
+        private bool checkCoverage(float expected)
+        {
+            Drawable? cover = this.ChildrenOfType<PlayfieldCoveringWrapper>().FirstOrDefault();
+            Drawable? filledArea = cover?.ChildrenOfType<Box>().LastOrDefault();
+
+            if (filledArea == null)
+                return false;
+
+            float scale = cover!.DrawHeight / (768 - Stage.HIT_TARGET_POSITION);
+
+            // A bit of lenience because the test may end up hitting hitobjects before any assertions.
+            return Precision.AlmostEquals(filledArea.DrawHeight / scale, expected, 0.1);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
index 2a8dc715f9..341d52afcf 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestScenePlayfieldCoveringContainer.cs
@@ -39,18 +39,18 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void TestScrollingDownwards()
         {
             AddStep("set down scroll", () => scrollingContainer.Direction = ScrollingDirection.Down);
-            AddStep("set coverage = 0.5", () => cover.Coverage = 0.5f);
-            AddStep("set coverage = 0.8f", () => cover.Coverage = 0.8f);
-            AddStep("set coverage = 0.2f", () => cover.Coverage = 0.2f);
+            AddStep("set coverage = 0.5", () => cover.Coverage.Value = 0.5f);
+            AddStep("set coverage = 0.8f", () => cover.Coverage.Value = 0.8f);
+            AddStep("set coverage = 0.2f", () => cover.Coverage.Value = 0.2f);
         }
 
         [Test]
         public void TestScrollingUpwards()
         {
             AddStep("set up scroll", () => scrollingContainer.Direction = ScrollingDirection.Up);
-            AddStep("set coverage = 0.5", () => cover.Coverage = 0.5f);
-            AddStep("set coverage = 0.8f", () => cover.Coverage = 0.8f);
-            AddStep("set coverage = 0.2f", () => cover.Coverage = 0.2f);
+            AddStep("set coverage = 0.5", () => cover.Coverage.Value = 0.5f);
+            AddStep("set coverage = 0.8f", () => cover.Coverage.Value = 0.8f);
+            AddStep("set coverage = 0.2f", () => cover.Coverage.Value = 0.2f);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 1ae65dd8c0..c645ddd98d 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects;
@@ -17,9 +18,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private Playfield playfield { get; set; } = null!;
 
-        [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; } = null!;
-
         protected ScrollingHitObjectContainer HitObjectContainer => ((ManiaPlayfield)playfield).GetColumn(HitObject.Column).HitObjectContainer;
 
         protected ManiaSelectionBlueprint(T hitObject)
@@ -28,14 +26,31 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             RelativeSizeAxes = Axes.None;
         }
 
-        protected override void Update()
-        {
-            base.Update();
+        private readonly IBindable<ScrollingDirection> directionBindable = new Bindable<ScrollingDirection>();
 
-            var anchor = scrollingInfo.Direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            directionBindable.BindTo(scrollingInfo.Direction);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            directionBindable.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            var anchor = direction.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
             Anchor = Origin = anchor;
             foreach (var child in InternalChildren)
                 child.Anchor = child.Origin = anchor;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
 
             Position = Parent!.ToLocalSpace(HitObjectContainer.ScreenSpacePositionAtTime(HitObject.StartTime)) - AnchorPosition;
             Width = HitObjectContainer.DrawWidth;
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 75a642924c..0b54fb3da0 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModHardRock(),
                         new MultiMod(new ManiaModSuddenDeath(), new ManiaModPerfect()),
                         new MultiMod(new ManiaModDoubleTime(), new ManiaModNightcore()),
-                        new MultiMod(new ManiaModFadeIn(), new ManiaModHidden()),
+                        new MultiMod(new ManiaModFadeIn(), new ManiaModHidden(), new ManiaModCover()),
                         new ManiaModFlashlight(),
                         new ModAccuracyChallenge(),
                     };
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModCover.cs
new file mode 100644
index 0000000000..eb243bfab7
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModCover.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 System;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mania.UI;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModCover : ManiaModWithPlayfieldCover
+    {
+        public override string Name => "Cover";
+        public override string Acronym => "CO";
+
+        public override LocalisableString Description => @"Decrease the playfield's viewing area.";
+
+        public override double ScoreMultiplier => 1;
+
+        protected override CoverExpandDirection ExpandDirection => Direction.Value;
+
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[]
+        {
+            typeof(ManiaModHidden),
+            typeof(ManiaModFadeIn)
+        }).ToArray();
+
+        public override bool Ranked => false;
+
+        [SettingSource("Coverage", "The proportion of playfield height that notes will be hidden for.")]
+        public override BindableNumber<float> Coverage { get; } = new BindableFloat(0.5f)
+        {
+            Precision = 0.1f,
+            MinValue = 0.2f,
+            MaxValue = 0.8f,
+            Default = 0.5f,
+        };
+
+        [SettingSource("Direction", "The direction on which the cover is applied")]
+        public Bindable<CoverExpandDirection> Direction { get; } = new Bindable<CoverExpandDirection>();
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index 196514c7b1..54a0b8f36d 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -3,29 +3,24 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModFadeIn : ManiaModPlayfieldCover
+    public class ManiaModFadeIn : ManiaModHidden
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
         public override LocalisableString Description => @"Keys appear out of nowhere!";
         public override double ScoreMultiplier => 1;
 
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModHidden)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[]
+        {
+            typeof(ManiaModHidden),
+            typeof(ManiaModCover)
+        }).ToArray();
 
         protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AlongScroll;
-
-        public override BindableNumber<float> Coverage { get; } = new BindableFloat(0.5f)
-        {
-            Precision = 0.1f,
-            MinValue = 0.1f,
-            MaxValue = 0.7f,
-            Default = 0.5f,
-        };
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index f23cb335a5..5ddc627642 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -3,27 +3,104 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModHidden : ManiaModPlayfieldCover
+    public partial class ManiaModHidden : ManiaModWithPlayfieldCover, IApplicableToPlayer, IUpdatableByPlayfield
     {
+        /// <summary>
+        /// osu!stable is referenced to 768px.
+        /// </summary>
+        private const float reference_playfield_height = 768;
+
+        public const float MIN_COVERAGE = 160f;
+        public const float MAX_COVERAGE = 400f;
+        private const float coverage_increase_per_combo = 0.5f;
+
         public override LocalisableString Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
 
-        public override BindableNumber<float> Coverage { get; } = new BindableFloat(0.5f)
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[]
         {
-            Precision = 0.1f,
-            MinValue = 0.2f,
-            MaxValue = 0.8f,
-            Default = 0.5f,
-        };
-
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModFadeIn)).ToArray();
+            typeof(ManiaModFadeIn),
+            typeof(ManiaModCover)
+        }).ToArray();
 
+        public override BindableNumber<float> Coverage { get; } = new BindableFloat(MIN_COVERAGE);
         protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
+
+        private readonly IBindable<bool> isBreakTime = new Bindable<bool>();
+        private readonly BindableInt combo = new BindableInt();
+
+        public override void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
+        {
+            base.ApplyToScoreProcessor(scoreProcessor);
+
+            combo.UnbindAll();
+            combo.BindTo(scoreProcessor.Combo);
+        }
+
+        public void ApplyToPlayer(Player player)
+        {
+            isBreakTime.UnbindAll();
+            isBreakTime.BindTo(player.IsBreakTime);
+        }
+
+        public void Update(Playfield playfield)
+        {
+            Coverage.Value = isBreakTime.Value
+                ? 0
+                : Math.Min(MAX_COVERAGE, MIN_COVERAGE + combo.Value * coverage_increase_per_combo) / reference_playfield_height;
+        }
+
+        protected override PlayfieldCoveringWrapper CreateCover(Drawable content) => new LegacyPlayfieldCover(content);
+
+        private partial class LegacyPlayfieldCover : PlayfieldCoveringWrapper
+        {
+            [Resolved]
+            private ISkinSource skin { get; set; } = null!;
+
+            private IBindable<float>? hitPosition;
+
+            public LegacyPlayfieldCover(Drawable content)
+                : base(content)
+            {
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                skin.SourceChanged += onSkinChanged;
+                onSkinChanged();
+            }
+
+            private void onSkinChanged()
+            {
+                hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition);
+            }
+
+            protected override float GetHeight(float coverage)
+            {
+                // In osu!stable, the cover is applied in absolute (x768) coordinates from the hit position.
+                float availablePlayfieldHeight = Math.Abs(reference_playfield_height - (hitPosition?.Value ?? Stage.HIT_TARGET_POSITION));
+
+                if (availablePlayfieldHeight == 0)
+                    return base.GetHeight(coverage);
+
+                return base.GetHeight(coverage) * reference_playfield_height / availablePlayfieldHeight;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModWithPlayfieldCover.cs
similarity index 78%
rename from osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
rename to osu.Game.Rulesets.Mania/Mods/ManiaModWithPlayfieldCover.cs
index bc76c5cfe9..864ef6c3d6 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModWithPlayfieldCover.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -15,7 +14,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public abstract class ManiaModPlayfieldCover : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
+    public abstract class ManiaModWithPlayfieldCover : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
     {
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
 
@@ -24,7 +23,9 @@ namespace osu.Game.Rulesets.Mania.Mods
         /// </summary>
         protected abstract CoverExpandDirection ExpandDirection { get; }
 
-        [SettingSource("Coverage", "The proportion of playfield height that notes will be hidden for.")]
+        /// <summary>
+        /// The relative area that should be completely covered. This does not include the fade.
+        /// </summary>
         public abstract BindableNumber<float> Coverage { get; }
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
@@ -37,15 +38,17 @@ namespace osu.Game.Rulesets.Mania.Mods
                 Container hocParent = (Container)hoc.Parent!;
 
                 hocParent.Remove(hoc, false);
-                hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
+                hocParent.Add(CreateCover(hoc).With(c =>
                 {
                     c.RelativeSizeAxes = Axes.Both;
                     c.Direction = ExpandDirection;
-                    c.Coverage = Coverage.Value;
+                    c.Coverage.BindTo(Coverage);
                 }));
             }
         }
 
+        protected virtual PlayfieldCoveringWrapper CreateCover(Drawable content) => new PlayfieldCoveringWrapper(content);
+
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
         }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 07045b76ca..a8200e0144 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -243,7 +243,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
                         bodySprite.FillMode = FillMode.Stretch;
                         // i dunno this looks about right??
-                        bodySprite.Scale = new Vector2(1, scaleDirection * 32800 / sprite.DrawHeight);
+                        // the guard against zero draw height is intended for zero-length hold notes. yes, such cases have been spotted in the wild.
+                        if (sprite.DrawHeight > 0)
+                            bodySprite.Scale = new Vector2(1, scaleDirection * 32800 / sprite.DrawHeight);
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 0d36f51943..b3420c49f3 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -149,7 +148,18 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <summary>
         /// Retrieves the total amount of columns across all stages in this playfield.
         /// </summary>
-        public int TotalColumns => stages.Sum(s => s.Columns.Length);
+        public int TotalColumns
+        {
+            get
+            {
+                int sum = 0;
+
+                foreach (var stage in stages)
+                    sum += stage.Columns.Length;
+
+                return sum;
+            }
+        }
 
         private Stage getStageByColumn(int column)
         {
diff --git a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
index 92f471e36b..d8d9705530 100644
--- a/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.cs
+++ b/osu.Game.Rulesets.Mania/UI/PlayfieldCoveringWrapper.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.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -8,17 +10,24 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
+using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     /// <summary>
-    /// A <see cref="Container"/> that has its contents partially hidden by an adjustable "cover". This is intended to be used in a playfield.
+    /// A <see cref="Framework.Graphics.Containers.Container"/> that has its contents partially hidden by an adjustable "cover". This is intended to be used in a playfield.
     /// </summary>
     public partial class PlayfieldCoveringWrapper : CompositeDrawable
     {
+        /// <summary>
+        /// The relative area that should be completely covered. This does not include the fade.
+        /// </summary>
+        public readonly BindableFloat Coverage = new BindableFloat();
+
         /// <summary>
         /// The complete cover, including gradient and fill.
         /// </summary>
@@ -36,6 +45,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly IBindable<ScrollingDirection> scrollDirection = new Bindable<ScrollingDirection>();
 
+        private float currentCoverageHeight;
+
         public PlayfieldCoveringWrapper(Drawable content)
         {
             InternalChild = new BufferedContainer
@@ -94,21 +105,46 @@ namespace osu.Game.Rulesets.Mania.UI
             scrollDirection.BindValueChanged(onScrollDirectionChanged, true);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateCoverSize(true);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            updateCoverSize(false);
+        }
+
+        private void updateCoverSize(bool instant)
+        {
+            float targetCoverage;
+            float targetAlpha;
+
+            if (instant)
+            {
+                targetCoverage = Coverage.Value;
+                targetAlpha = Coverage.Value > 0 ? 1 : 0;
+            }
+            else
+            {
+                targetCoverage = (float)Interpolation.DampContinuously(currentCoverageHeight, Coverage.Value, 25, Math.Abs(Time.Elapsed));
+                targetAlpha = (float)Interpolation.DampContinuously(gradient.Alpha, Coverage.Value > 0 ? 1 : 0, 25, Math.Abs(Time.Elapsed));
+            }
+
+            filled.Height = GetHeight(targetCoverage);
+            gradient.Y = -GetHeight(targetCoverage);
+            gradient.Alpha = targetAlpha;
+
+            currentCoverageHeight = targetCoverage;
+        }
+
+        protected virtual float GetHeight(float coverage) => coverage;
+
         private void onScrollDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
             => cover.Rotation = direction.NewValue == ScrollingDirection.Up ? 0 : 180f;
 
-        /// <summary>
-        /// The relative area that should be completely covered. This does not include the fade.
-        /// </summary>
-        public float Coverage
-        {
-            set
-            {
-                filled.Height = value;
-                gradient.Y = -value;
-            }
-        }
-
         /// <summary>
         /// The direction in which the cover expands.
         /// </summary>
@@ -123,11 +159,13 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <summary>
         /// The cover expands along the scrolling direction.
         /// </summary>
+        [Description("Along scroll")]
         AlongScroll,
 
         /// <summary>
         /// The cover expands against the scrolling direction.
         /// </summary>
+        [Description("Against scroll")]
         AgainstScroll
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
index 61be25b845..a68d6e12c0 100644
--- a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index 25fe8170b1..5bf7c0326a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 6706d20080..8d81fe3017 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 long totalScore = scoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * scoreProcessor.GetBaseScoreForResult(new SpinnerTick().CreateJudgement().MaxResult);
+                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * scoreProcessor.GetBaseScoreForResult(new SpinnerTick().Judgement.MaxResult);
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 3b580a5b59..007cd977e5 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -40,7 +40,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             double aimRatingNoSliders = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
             double speedRating = Math.Sqrt(skills[2].DifficultyValue()) * difficulty_multiplier;
             double speedNotes = ((Speed)skills[2]).RelevantNoteCount();
-            double flashlightRating = Math.Sqrt(skills[3].DifficultyValue()) * difficulty_multiplier;
+
+            double flashlightRating = 0.0;
+
+            if (mods.Any(h => h is OsuModFlashlight))
+                flashlightRating = Math.Sqrt(skills[3].DifficultyValue()) * difficulty_multiplier;
 
             double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
 
@@ -126,13 +130,17 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            return new Skill[]
+            var skills = new List<Skill>
             {
                 new Aim(mods, true),
                 new Aim(mods, false),
-                new Speed(mods),
-                new Flashlight(mods)
+                new Speed(mods)
             };
+
+            if (mods.Any(h => h is OsuModFlashlight))
+                skills.Add(new Flashlight(mods));
+
+            return skills.ToArray();
         }
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 488d1e2e9f..0e537632b1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -232,7 +232,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
 
             IList<HitObject> nestedObjects = slider.NestedHitObjects;
 
-            SliderTick? lastRealTick = slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault();
+            SliderTick? lastRealTick = null;
+
+            foreach (var hitobject in slider.NestedHitObjects)
+            {
+                if (hitobject is SliderTick tick)
+                    lastRealTick = tick;
+            }
 
             if (lastRealTick?.StartTime > trackingEndTime)
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
index 3cba0610a1..fe335a048d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
@@ -78,9 +78,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
 
             Scale = new Vector2(hitObject.Scale);
 
-            if (hitObject is IHasComboInformation combo)
-                ring.BorderColour = combo.GetComboColour(skin);
-
             double editorTime = editorClock.CurrentTime;
             double hitObjectTime = hitObject.StartTime;
             bool hasReachedObject = editorTime >= hitObjectTime;
@@ -92,6 +89,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
 
                 ring.Scale = new Vector2(1 + 0.1f * ringScale);
                 content.Alpha = 0.9f * (1 - alpha);
+
+                // TODO: should only update colour on skin/combo/object change.
+                if (hitObject is IHasComboInformation combo && content.Alpha > 0)
+                    ring.BorderColour = combo.GetComboColour(skin);
             }
             else
                 content.Alpha = 0;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index e421d497e7..4d2b980c23 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -416,8 +416,22 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             DrawableObject.SliderBody?.ToScreenSpace(DrawableObject.SliderBody.PathEndOffset) ?? BodyPiece.ToScreenSpace(BodyPiece.PathEndLocation)
         };
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+        {
+            if (BodyPiece.ReceivePositionalInputAt(screenSpacePos))
+                return true;
+
+            if (ControlPointVisualiser == null)
+                return false;
+
+            foreach (var p in ControlPointVisualiser.Pieces)
+            {
+                if (p.ReceivePositionalInputAt(screenSpacePos))
+                    return true;
+            }
+
+            return false;
+        }
 
         protected virtual SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new SliderCircleOverlay(slider, position);
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 3679425389..31511c01b8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -38,12 +38,18 @@ namespace osu.Game.Rulesets.Osu.Mods
         private ReplayState<OsuAction> state = null!;
         private double lastStateChangeTime;
 
+        private DrawableOsuRuleset ruleset = null!;
+        private IPressHandler pressHandler = null!;
+
         private bool hasReplay;
+        private bool legacyReplay;
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
+            ruleset = (DrawableOsuRuleset)drawableRuleset;
+
             // grab the input manager for future use.
-            osuInputManager = ((DrawableOsuRuleset)drawableRuleset).KeyBindingInputManager;
+            osuInputManager = ruleset.KeyBindingInputManager;
         }
 
         public void ApplyToPlayer(Player player)
@@ -51,15 +57,22 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (osuInputManager.ReplayInputHandler != null)
             {
                 hasReplay = true;
+
+                Debug.Assert(ruleset.ReplayScore != null);
+                legacyReplay = ruleset.ReplayScore.ScoreInfo.IsLegacyScore;
+
+                pressHandler = legacyReplay ? new LegacyReplayPressHandler(this) : new PressHandler(this);
+
                 return;
             }
 
+            pressHandler = new PressHandler(this);
             osuInputManager.AllowGameplayInputs = false;
         }
 
         public void Update(Playfield playfield)
         {
-            if (hasReplay)
+            if (hasReplay && !legacyReplay)
                 return;
 
             bool requiresHold = false;
@@ -132,11 +145,62 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 if (down)
                 {
-                    state.PressedActions.Add(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
+                    pressHandler.HandlePress(wasLeft);
                     wasLeft = !wasLeft;
                 }
+                else
+                {
+                    pressHandler.HandleRelease(wasLeft);
+                }
+            }
+        }
 
-                state.Apply(osuInputManager.CurrentState, osuInputManager);
+        private interface IPressHandler
+        {
+            void HandlePress(bool wasLeft);
+            void HandleRelease(bool wasLeft);
+        }
+
+        private class PressHandler : IPressHandler
+        {
+            private readonly OsuModRelax mod;
+
+            public PressHandler(OsuModRelax mod)
+            {
+                this.mod = mod;
+            }
+
+            public void HandlePress(bool wasLeft)
+            {
+                mod.state.PressedActions.Add(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
+                mod.state.Apply(mod.osuInputManager.CurrentState, mod.osuInputManager);
+            }
+
+            public void HandleRelease(bool wasLeft)
+            {
+                mod.state.Apply(mod.osuInputManager.CurrentState, mod.osuInputManager);
+            }
+        }
+
+        // legacy replays do not contain key-presses with Relax mod, so they need to be triggered by themselves.
+        private class LegacyReplayPressHandler : IPressHandler
+        {
+            private readonly OsuModRelax mod;
+
+            public LegacyReplayPressHandler(OsuModRelax mod)
+            {
+                this.mod = mod;
+            }
+
+            public void HandlePress(bool wasLeft)
+            {
+                mod.osuInputManager.KeyBindingContainer.TriggerPressed(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
+            }
+
+            public void HandleRelease(bool wasLeft)
+            {
+                // this intentionally releases right when `wasLeft` is true because `wasLeft` is set at point of press and not at point of release
+                mod.osuInputManager.KeyBindingContainer.TriggerReleased(wasLeft ? OsuAction.RightButton : OsuAction.LeftButton);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 74631400ca..6c77d9189c 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -149,8 +148,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             StackHeightBindable.BindValueChanged(height =>
             {
-                foreach (var nested in NestedHitObjects.OfType<OsuHitObject>())
-                    nested.StackHeight = height.NewValue;
+                foreach (var nested in NestedHitObjects)
+                {
+                    if (nested is OsuHitObject osuHitObject)
+                        osuHitObject.StackHeight = height.NewValue;
+                }
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 506145568e..203e829180 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -252,18 +252,25 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         protected void UpdateNestedSamples()
         {
-            var firstSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)
-                              ?? Samples.FirstOrDefault(); // TODO: remove this when guaranteed sort is present for samples (https://github.com/ppy/osu/issues/1933)
-            var sampleList = new List<HitSampleInfo>();
+            // TODO: remove this when guaranteed sort is present for samples (https://github.com/ppy/osu/issues/1933)
+            HitSampleInfo tickSample = (Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL) ?? Samples.FirstOrDefault())?.With("slidertick");
 
-            if (firstSample != null)
-                sampleList.Add(firstSample.With("slidertick"));
+            foreach (var nested in NestedHitObjects)
+            {
+                switch (nested)
+                {
+                    case SliderTick tick:
+                        tick.SamplesBindable.Clear();
 
-            foreach (var tick in NestedHitObjects.OfType<SliderTick>())
-                tick.Samples = sampleList;
+                        if (tickSample != null)
+                            tick.SamplesBindable.Add(tickSample);
+                        break;
 
-            foreach (var repeat in NestedHitObjects.OfType<SliderRepeat>())
-                repeat.Samples = this.GetNodeSamples(repeat.RepeatIndex + 1);
+                    case SliderRepeat repeat:
+                        repeat.Samples = this.GetNodeSamples(repeat.RepeatIndex + 1);
+                        break;
+                }
+            }
 
             if (HeadCircle != null)
                 HeadCircle.Samples = this.GetNodeSamples(0);
diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index e472de1dfe..ceac1989a6 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -1,13 +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 System.ComponentModel;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Lists;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu
 {
     public partial class OsuInputManager : RulesetInputManager<OsuAction>
     {
-        public IEnumerable<OsuAction> PressedActions => KeyBindingContainer.PressedActions;
+        public SlimReadOnlyListWrapper<OsuAction> PressedActions => KeyBindingContainer.PressedActions;
 
         /// <summary>
         /// Whether gameplay input buttons should be allowed.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultApproachCircle.cs
index 272f4b5658..3a4c454bf1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultApproachCircle.cs
@@ -25,8 +25,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             Texture = textures.Get(@"Gameplay/osu/approachcircle").WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2);
 
-            // account for the sprite being used for the default approach circle being taken from stable,
-            // when hitcircles have 5px padding on each size. this should be removed if we update the sprite.
+            // In triangles and argon skins, we expanded hitcircles to take up the full 128 px which are clickable,
+            // but still use the old approach circle sprite. To make it feel correct (ie. disappear as it collides
+            // with the hitcircle, *not when it overlaps the border*) we need to expand it slightly.
             Scale = new Vector2(128 / 118f);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index 0bdea0cab1..8ff85090ca 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -26,10 +25,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             var texture = skin.GetTexture(@"approachcircle");
             Debug.Assert(texture != null);
             Texture = texture.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2);
-
-            // account for the sprite being used for the default approach circle being taken from stable,
-            // when hitcircles have 5px padding on each size. this should be removed if we update the sprite.
-            Scale = new Vector2(128 / 118f);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
index fa2bb9b2ad..4a8b737206 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             // Note that the scale adjust here is 2 instead of DrawableSliderBall.FOLLOW_AREA to match legacy behaviour.
             // This means the actual tracking area for gameplay purposes is larger than the sprite (but skins may be accounting for this).
-            this.ScaleTo(0.5f).ScaleTo(2f, Math.Min(180f, remainingTime), Easing.Out)
+            this.ScaleTo(1f).ScaleTo(2f, Math.Min(180f, remainingTime), Easing.Out)
                 .FadeTo(0).FadeTo(1f, Math.Min(60f, remainingTime));
         }
 
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 4cb91aa103..d898f1a1a8 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -11,6 +11,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -39,6 +40,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
         {
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
+                return false;
+
             if (showRipples.Value)
             {
                 AddInternal(ripplePool.Get(r =>
diff --git a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
index 56ec7d8d9c..5b192c795b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoHealthProcessorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoHealthProcessorTest.cs
index f4a1e888c9..b28e870481 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoHealthProcessorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoHealthProcessorTest.cs
@@ -126,11 +126,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             foreach (var nested in beatmap.HitObjects[0].NestedHitObjects)
             {
-                var nestedJudgement = nested.CreateJudgement();
+                var nestedJudgement = nested.Judgement;
                 healthProcessor.ApplyResult(new JudgementResult(nested, nestedJudgement) { Type = nestedJudgement.MaxResult });
             }
 
-            var judgement = beatmap.HitObjects[0].CreateJudgement();
+            var judgement = beatmap.HitObjects[0].Judgement;
             healthProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], judgement) { Type = judgement.MaxResult });
 
             Assert.Multiple(() =>
@@ -159,11 +159,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             foreach (var nested in beatmap.HitObjects[0].NestedHitObjects)
             {
-                var nestedJudgement = nested.CreateJudgement();
+                var nestedJudgement = nested.Judgement;
                 healthProcessor.ApplyResult(new JudgementResult(nested, nestedJudgement) { Type = nestedJudgement.MaxResult });
             }
 
-            var judgement = beatmap.HitObjects[0].CreateJudgement();
+            var judgement = beatmap.HitObjects[0].Judgement;
             healthProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], judgement) { Type = judgement.MaxResult });
 
             Assert.Multiple(() =>
diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index 889f0a3583..b02425eadd 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -31,4 +31,22 @@
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Moq" Version="4.17.2" />
   </ItemGroup>
+  <!-- osu.Framework.Android depends on https://www.nuget.org/packages/Xamarin.AndroidX.Window,
+       which - via a chain of transitive dependencies - also includes https://www.nuget.org/packages/Xamarin.Jetbrains.Annotations,
+       which causes compile failures such as:
+
+         The type 'NotNullAttribute' exists in both 'JetBrains.Annotations, Version=4242.42.42.42, Culture=neutral, PublicKeyToken=1010a0d8d6380325'
+         and 'Xamarin.Jetbrains.Annotations, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' [D:\a\osu\osu\osu.Game.Tests.Android\osu.Game.Tests.Android.csproj]
+
+       We cannot easily change the source files, because of how this project works
+       (all source files are basically symlinked from the desktop test project,
+       so changing anything there just for the sake of mobile would be strange).
+       Thus, apply the following "interesting" workaround as borrowed from https://stackoverflow.com/a/65127159 instead. -->
+  <Target Name="AddPackageAliases" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
+    <ItemGroup>
+      <ReferencePath Condition="%(Filename) == 'Xamarin.Jetbrains.Annotations'">
+        <Aliases>XamarinJetbrainsAnnotations</Aliases>
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/osu.Game.Tests/Beatmaps/BeatmapUpdaterMetadataLookupTest.cs b/osu.Game.Tests/Beatmaps/BeatmapUpdaterMetadataLookupTest.cs
index 84195f1e7c..11c4c54ea6 100644
--- a/osu.Game.Tests/Beatmaps/BeatmapUpdaterMetadataLookupTest.cs
+++ b/osu.Game.Tests/Beatmaps/BeatmapUpdaterMetadataLookupTest.cs
@@ -28,7 +28,12 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestLocalCacheQueriedFirst()
         {
-            var localLookupResult = new OnlineBeatmapMetadata { BeatmapID = 123456, BeatmapStatus = BeatmapOnlineStatus.Ranked };
+            var localLookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 123456,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+            };
             localCachedMetadataSourceMock.Setup(src => src.Available).Returns(true);
             localCachedMetadataSourceMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out localLookupResult))
                                          .Returns(true);
@@ -42,6 +47,7 @@ namespace osu.Game.Tests.Beatmaps
             metadataLookup.Update(beatmapSet, preferOnlineFetch: false);
 
             Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
             localCachedMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata>.IsAny!), Times.Once);
             apiMetadataSourceMock.Verify(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out It.Ref<OnlineBeatmapMetadata>.IsAny!), Times.Never);
         }
@@ -54,7 +60,12 @@ namespace osu.Game.Tests.Beatmaps
             localCachedMetadataSourceMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out localLookupResult))
                                          .Returns(false);
 
-            var onlineLookupResult = new OnlineBeatmapMetadata { BeatmapID = 123456, BeatmapStatus = BeatmapOnlineStatus.Ranked };
+            var onlineLookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 123456,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+            };
             apiMetadataSourceMock.Setup(src => src.Available).Returns(true);
             apiMetadataSourceMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out onlineLookupResult))
                                  .Returns(true);
@@ -66,6 +77,7 @@ namespace osu.Game.Tests.Beatmaps
             metadataLookup.Update(beatmapSet, preferOnlineFetch: false);
 
             Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
             localCachedMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Once);
             apiMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Once);
         }
@@ -73,12 +85,22 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestPreferOnlineFetch()
         {
-            var localLookupResult = new OnlineBeatmapMetadata { BeatmapID = 123456, BeatmapStatus = BeatmapOnlineStatus.Ranked };
+            var localLookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 123456,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+            };
             localCachedMetadataSourceMock.Setup(src => src.Available).Returns(true);
             localCachedMetadataSourceMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out localLookupResult))
                                          .Returns(true);
 
-            var onlineLookupResult = new OnlineBeatmapMetadata { BeatmapID = 123456, BeatmapStatus = BeatmapOnlineStatus.Graveyard };
+            var onlineLookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 123456,
+                BeatmapStatus = BeatmapOnlineStatus.Graveyard,
+                BeatmapSetStatus = BeatmapOnlineStatus.Graveyard,
+            };
             apiMetadataSourceMock.Setup(src => src.Available).Returns(true);
             apiMetadataSourceMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out onlineLookupResult))
                                  .Returns(true);
@@ -90,6 +112,7 @@ namespace osu.Game.Tests.Beatmaps
             metadataLookup.Update(beatmapSet, preferOnlineFetch: true);
 
             Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Graveyard));
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.Graveyard));
             localCachedMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Never);
             apiMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Once);
         }
@@ -97,7 +120,12 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestPreferOnlineFetchFallsBackToLocalCacheIfOnlineSourceUnavailable()
         {
-            var localLookupResult = new OnlineBeatmapMetadata { BeatmapID = 123456, BeatmapStatus = BeatmapOnlineStatus.Ranked };
+            var localLookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 123456,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+            };
             localCachedMetadataSourceMock.Setup(src => src.Available).Returns(true);
             localCachedMetadataSourceMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out localLookupResult))
                                          .Returns(true);
@@ -111,6 +139,7 @@ namespace osu.Game.Tests.Beatmaps
             metadataLookup.Update(beatmapSet, preferOnlineFetch: true);
 
             Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
             localCachedMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Once);
             apiMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Never);
         }
@@ -135,6 +164,7 @@ namespace osu.Game.Tests.Beatmaps
             metadataLookup.Update(beatmapSet, preferOnlineFetch: false);
 
             Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.None));
             Assert.That(beatmap.OnlineID, Is.EqualTo(-1));
             localCachedMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Once);
             apiMetadataSourceMock.Verify(src => src.TryLookup(beatmap, out It.Ref<OnlineBeatmapMetadata?>.IsAny!), Times.Once);
@@ -163,6 +193,7 @@ namespace osu.Game.Tests.Beatmaps
             metadataLookup.Update(beatmapSet, preferOnlineFetch);
 
             Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.None));
             Assert.That(beatmap.OnlineID, Is.EqualTo(123456));
         }
 
@@ -193,5 +224,217 @@ namespace osu.Game.Tests.Beatmaps
 
             Assert.That(beatmap.OnlineID, Is.EqualTo(123456));
         }
+
+        [Test]
+        public void TestReturnedMetadataHasDifferentOnlineID([Values] bool preferOnlineFetch)
+        {
+            var lookupResult = new OnlineBeatmapMetadata { BeatmapID = 654321, BeatmapStatus = BeatmapOnlineStatus.Ranked };
+
+            var targetMock = preferOnlineFetch ? apiMetadataSourceMock : localCachedMetadataSourceMock;
+            targetMock.Setup(src => src.Available).Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out lookupResult))
+                      .Returns(true);
+
+            var beatmap = new BeatmapInfo { OnlineID = 123456 };
+            var beatmapSet = new BeatmapSetInfo(beatmap.Yield());
+            beatmap.BeatmapSet = beatmapSet;
+
+            metadataLookup.Update(beatmapSet, preferOnlineFetch);
+
+            Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(beatmap.OnlineID, Is.EqualTo(-1));
+        }
+
+        [Test]
+        public void TestMetadataLookupForBeatmapWithoutPopulatedIDAndCorrectHash([Values] bool preferOnlineFetch)
+        {
+            var lookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 654321,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"deadbeef",
+            };
+
+            var targetMock = preferOnlineFetch ? apiMetadataSourceMock : localCachedMetadataSourceMock;
+            targetMock.Setup(src => src.Available).Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out lookupResult))
+                      .Returns(true);
+
+            var beatmap = new BeatmapInfo
+            {
+                MD5Hash = @"deadbeef"
+            };
+            var beatmapSet = new BeatmapSetInfo(beatmap.Yield());
+            beatmap.BeatmapSet = beatmapSet;
+
+            metadataLookup.Update(beatmapSet, preferOnlineFetch);
+
+            Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
+            Assert.That(beatmap.OnlineID, Is.EqualTo(654321));
+        }
+
+        [Test]
+        public void TestMetadataLookupForBeatmapWithoutPopulatedIDAndIncorrectHash([Values] bool preferOnlineFetch)
+        {
+            var lookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 654321,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"cafebabe",
+            };
+
+            var targetMock = preferOnlineFetch ? apiMetadataSourceMock : localCachedMetadataSourceMock;
+            targetMock.Setup(src => src.Available).Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out lookupResult))
+                      .Returns(true);
+
+            var beatmap = new BeatmapInfo
+            {
+                MD5Hash = @"deadbeef"
+            };
+            var beatmapSet = new BeatmapSetInfo(beatmap.Yield());
+            beatmap.BeatmapSet = beatmapSet;
+
+            metadataLookup.Update(beatmapSet, preferOnlineFetch);
+
+            Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(beatmap.OnlineID, Is.EqualTo(-1));
+        }
+
+        [Test]
+        public void TestReturnedMetadataHasDifferentHash([Values] bool preferOnlineFetch)
+        {
+            var lookupResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 654321,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"deadbeef"
+            };
+
+            var targetMock = preferOnlineFetch ? apiMetadataSourceMock : localCachedMetadataSourceMock;
+            targetMock.Setup(src => src.Available).Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.IsAny<BeatmapInfo>(), out lookupResult))
+                      .Returns(true);
+
+            var beatmap = new BeatmapInfo
+            {
+                OnlineID = 654321,
+                MD5Hash = @"cafebabe",
+            };
+            var beatmapSet = new BeatmapSetInfo(beatmap.Yield());
+            beatmap.BeatmapSet = beatmapSet;
+
+            metadataLookup.Update(beatmapSet, preferOnlineFetch);
+
+            Assert.That(beatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(beatmap.OnlineID, Is.EqualTo(654321));
+        }
+
+        [Test]
+        public void TestPartiallyModifiedSet([Values] bool preferOnlineFetch)
+        {
+            var firstResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 654321,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"cafebabe"
+            };
+            var secondResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 666666,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"dededede"
+            };
+
+            var targetMock = preferOnlineFetch ? apiMetadataSourceMock : localCachedMetadataSourceMock;
+            targetMock.Setup(src => src.Available).Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.Is<BeatmapInfo>(bi => bi.OnlineID == 654321), out firstResult))
+                      .Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.Is<BeatmapInfo>(bi => bi.OnlineID == 666666), out secondResult))
+                      .Returns(true);
+
+            var firstBeatmap = new BeatmapInfo
+            {
+                OnlineID = 654321,
+                MD5Hash = @"cafebabe",
+            };
+            var secondBeatmap = new BeatmapInfo
+            {
+                OnlineID = 666666,
+                MD5Hash = @"deadbeef"
+            };
+            var beatmapSet = new BeatmapSetInfo(new[]
+            {
+                firstBeatmap,
+                secondBeatmap
+            });
+            firstBeatmap.BeatmapSet = beatmapSet;
+            secondBeatmap.BeatmapSet = beatmapSet;
+
+            metadataLookup.Update(beatmapSet, preferOnlineFetch);
+
+            Assert.That(firstBeatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
+            Assert.That(firstBeatmap.OnlineID, Is.EqualTo(654321));
+
+            Assert.That(secondBeatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(secondBeatmap.OnlineID, Is.EqualTo(666666));
+
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+        }
+
+        [Test]
+        public void TestPartiallyMaliciousSet([Values] bool preferOnlineFetch)
+        {
+            var firstResult = new OnlineBeatmapMetadata
+            {
+                BeatmapID = 654321,
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"cafebabe"
+            };
+            var secondResult = new OnlineBeatmapMetadata
+            {
+                BeatmapStatus = BeatmapOnlineStatus.Ranked,
+                BeatmapSetStatus = BeatmapOnlineStatus.Ranked,
+                MD5Hash = @"dededede"
+            };
+
+            var targetMock = preferOnlineFetch ? apiMetadataSourceMock : localCachedMetadataSourceMock;
+            targetMock.Setup(src => src.Available).Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.Is<BeatmapInfo>(bi => bi.OnlineID == 654321), out firstResult))
+                      .Returns(true);
+            targetMock.Setup(src => src.TryLookup(It.Is<BeatmapInfo>(bi => bi.OnlineID == 666666), out secondResult))
+                      .Returns(true);
+
+            var firstBeatmap = new BeatmapInfo
+            {
+                OnlineID = 654321,
+                MD5Hash = @"cafebabe",
+            };
+            var secondBeatmap = new BeatmapInfo
+            {
+                OnlineID = 666666,
+                MD5Hash = @"deadbeef"
+            };
+            var beatmapSet = new BeatmapSetInfo(new[]
+            {
+                firstBeatmap,
+                secondBeatmap
+            });
+            firstBeatmap.BeatmapSet = beatmapSet;
+            secondBeatmap.BeatmapSet = beatmapSet;
+
+            metadataLookup.Update(beatmapSet, preferOnlineFetch);
+
+            Assert.That(firstBeatmap.Status, Is.EqualTo(BeatmapOnlineStatus.Ranked));
+            Assert.That(firstBeatmap.OnlineID, Is.EqualTo(654321));
+
+            Assert.That(secondBeatmap.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+            Assert.That(secondBeatmap.OnlineID, Is.EqualTo(-1));
+
+            Assert.That(beatmapSet.Status, Is.EqualTo(BeatmapOnlineStatus.None));
+        }
     }
 }
diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 73177e36e1..22643feebb 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Tests.Gameplay
                 var hitObject = new HitObject { StartTime = Time.Current };
                 lifetimeEntry = new HitObjectLifetimeEntry(hitObject)
                 {
-                    Result = new JudgementResult(hitObject, hitObject.CreateJudgement())
+                    Result = new JudgementResult(hitObject, hitObject.Judgement)
                     {
                         Type = HitResult.Great
                     }
diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index 1a644ad600..8ec18377f4 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -129,10 +129,10 @@ namespace osu.Game.Tests.Gameplay
             var scoreProcessor = new ScoreProcessor(new OsuRuleset());
             scoreProcessor.ApplyBeatmap(beatmap);
 
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].CreateJudgement()) { Type = HitResult.Ok });
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].CreateJudgement()) { Type = HitResult.LargeTickHit });
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[2], beatmap.HitObjects[2].CreateJudgement()) { Type = HitResult.SmallTickMiss });
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[3], beatmap.HitObjects[3].CreateJudgement()) { Type = HitResult.SmallBonus });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].Judgement) { Type = HitResult.Ok });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].Judgement) { Type = HitResult.LargeTickHit });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[2], beatmap.HitObjects[2].Judgement) { Type = HitResult.SmallTickMiss });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[3], beatmap.HitObjects[3].Judgement) { Type = HitResult.SmallBonus });
 
             var score = new ScoreInfo { Ruleset = new OsuRuleset().RulesetInfo };
             scoreProcessor.FailScore(score);
@@ -169,8 +169,8 @@ namespace osu.Game.Tests.Gameplay
             Assert.That(scoreProcessor.MinimumAccuracy.Value, Is.EqualTo(0));
             Assert.That(scoreProcessor.MaximumAccuracy.Value, Is.EqualTo(1));
 
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].CreateJudgement()) { Type = HitResult.Ok });
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].CreateJudgement()) { Type = HitResult.Great });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].Judgement) { Type = HitResult.Ok });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].Judgement) { Type = HitResult.Great });
 
             Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo((double)(100 + 300) / (2 * 300)).Within(Precision.DOUBLE_EPSILON));
             Assert.That(scoreProcessor.MinimumAccuracy.Value, Is.EqualTo((double)(100 + 300) / (4 * 300)).Within(Precision.DOUBLE_EPSILON));
diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 739a72df08..12d6060351 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -274,10 +274,12 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsTrue(filterCriteria.OnlineStatus.IsUpperInclusive);
         }
 
-        [Test]
-        public void TestApplyCreatorQueries()
+        [TestCase("creator")]
+        [TestCase("author")]
+        [TestCase("mapper")]
+        public void TestApplyCreatorQueries(string keyword)
         {
-            const string query = "beatmap specifically by creator=my_fav";
+            string query = $"beatmap specifically by {keyword}=my_fav";
             var filterCriteria = new FilterCriteria();
             FilterQueryParser.ApplyQueries(filterCriteria, query);
             Assert.AreEqual("beatmap specifically by", filterCriteria.SearchText.Trim());
@@ -452,5 +454,111 @@ namespace osu.Game.Tests.NonVisual.Filtering
                 return false;
             }
         }
+
+        private static readonly object[] correct_date_query_examples =
+        {
+            new object[] { "600" },
+            new object[] { "0.5s" },
+            new object[] { "120m" },
+            new object[] { "48h120s" },
+            new object[] { "10y24M" },
+            new object[] { "10y60d120s" },
+            new object[] { "0y0M2d" },
+            new object[] { "1y1M2d" }
+        };
+
+        [Test]
+        [TestCaseSource(nameof(correct_date_query_examples))]
+        public void TestValidDateQueries(string dateQuery)
+        {
+            string query = $"played<{dateQuery} time";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(true, filterCriteria.LastPlayed.HasFilter);
+        }
+
+        private static readonly object[] incorrect_date_query_examples =
+        {
+            new object[] { ".5s" },
+            new object[] { "7m27" },
+            new object[] { "7m7m7m" },
+            new object[] { "5s6m" },
+            new object[] { "7d7y" },
+            new object[] { "0:3:6" },
+            new object[] { "0:3:" },
+            new object[] { "\"three days\"" },
+            new object[] { "0.1y0.1M2d" },
+            new object[] { "0.99y0.99M2d" },
+            new object[] { string.Empty }
+        };
+
+        [Test]
+        [TestCaseSource(nameof(incorrect_date_query_examples))]
+        public void TestInvalidDateQueries(string dateQuery)
+        {
+            string query = $"played<{dateQuery} time";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(false, filterCriteria.LastPlayed.HasFilter);
+        }
+
+        [Test]
+        public void TestGreaterDateQuery()
+        {
+            const string query = "played>50";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.That(filterCriteria.LastPlayed.Max, Is.Not.Null);
+            Assert.That(filterCriteria.LastPlayed.Min, Is.Null);
+            // the parser internally references `DateTimeOffset.Now`, so to not make things too annoying for tests, just assume some tolerance
+            // (irrelevant in proportion to the actual filter proscribed).
+            Assert.That(filterCriteria.LastPlayed.Max, Is.EqualTo(DateTimeOffset.Now.AddDays(-50)).Within(TimeSpan.FromSeconds(5)));
+        }
+
+        [Test]
+        public void TestLowerDateQuery()
+        {
+            const string query = "played<50";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.That(filterCriteria.LastPlayed.Max, Is.Null);
+            Assert.That(filterCriteria.LastPlayed.Min, Is.Not.Null);
+            // the parser internally references `DateTimeOffset.Now`, so to not make things too annoying for tests, just assume some tolerance
+            // (irrelevant in proportion to the actual filter proscribed).
+            Assert.That(filterCriteria.LastPlayed.Min, Is.EqualTo(DateTimeOffset.Now.AddDays(-50)).Within(TimeSpan.FromSeconds(5)));
+        }
+
+        [Test]
+        public void TestBothSidesDateQuery()
+        {
+            const string query = "played>3M played<1y6M";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.That(filterCriteria.LastPlayed.Min, Is.Not.Null);
+            Assert.That(filterCriteria.LastPlayed.Max, Is.Not.Null);
+            // the parser internally references `DateTimeOffset.Now`, so to not make things too annoying for tests, just assume some tolerance
+            // (irrelevant in proportion to the actual filter proscribed).
+            Assert.That(filterCriteria.LastPlayed.Min, Is.EqualTo(DateTimeOffset.Now.AddYears(-1).AddMonths(-6)).Within(TimeSpan.FromSeconds(5)));
+            Assert.That(filterCriteria.LastPlayed.Max, Is.EqualTo(DateTimeOffset.Now.AddMonths(-3)).Within(TimeSpan.FromSeconds(5)));
+        }
+
+        [Test]
+        public void TestEqualDateQuery()
+        {
+            const string query = "played=50";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(false, filterCriteria.LastPlayed.HasFilter);
+        }
+
+        [Test]
+        public void TestOutOfRangeDateQuery()
+        {
+            const string query = "played<10000y";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(true, filterCriteria.LastPlayed.HasFilter);
+            Assert.AreEqual(DateTimeOffset.MinValue.AddMilliseconds(1), filterCriteria.LastPlayed.Min);
+        }
     }
 }
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index a3f91fffba..1647fbee42 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < 4; i++)
             {
-                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], fourObjectBeatmap.HitObjects[i].CreateJudgement())
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], fourObjectBeatmap.HitObjects[i].Judgement)
                 {
                     Type = i == 2 ? minResult : hitResult
                 };
@@ -141,7 +141,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < object_count; ++i)
             {
-                var judgementResult = new JudgementResult(largeBeatmap.HitObjects[i], largeBeatmap.HitObjects[i].CreateJudgement())
+                var judgementResult = new JudgementResult(largeBeatmap.HitObjects[i], largeBeatmap.HitObjects[i].Judgement)
                 {
                     Type = HitResult.Great
                 };
@@ -325,11 +325,11 @@ namespace osu.Game.Tests.Rulesets.Scoring
             scoreProcessor = new TestScoreProcessor();
             scoreProcessor.ApplyBeatmap(beatmap);
 
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].CreateJudgement()) { Type = HitResult.Great });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].Judgement) { Type = HitResult.Great });
             Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(1));
             Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
 
-            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].CreateJudgement()) { Type = HitResult.ComboBreak });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].Judgement) { Type = HitResult.ComboBreak });
             Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(0));
             Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
         }
@@ -350,7 +350,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < beatmap.HitObjects.Count; i++)
             {
-                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
+                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], beatmap.HitObjects[i].Judgement)
                 {
                     Type = i == 0 ? HitResult.Miss : HitResult.Great
                 });
@@ -441,10 +441,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             private readonly HitResult maxResult;
             private readonly HitResult? minResult;
 
-            public override Judgement CreateJudgement()
-            {
-                return new TestJudgement(maxResult, minResult);
-            }
+            public override Judgement CreateJudgement() => new TestJudgement(maxResult, minResult);
 
             public TestHitObject(HitResult maxResult, HitResult? minResult = null)
             {
diff --git a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
index 11f3fe660d..b089144233 100644
--- a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
@@ -43,13 +43,13 @@ namespace osu.Game.Tests.Rulesets
 
             AddStep("setup provider", () =>
             {
-                var rulesetSkinProvider = new RulesetSkinProvidingContainer(Ruleset.Value.CreateInstance(), Beatmap.Value.Beatmap, Beatmap.Value.Skin);
-
-                rulesetSkinProvider.Add(requester = new SkinRequester());
-
+                requester = new SkinRequester();
                 requester.OnLoadAsync += () => textureOnLoad = requester.GetTexture("test-image");
 
-                Child = rulesetSkinProvider;
+                Child = new RulesetSkinProvidingContainer(Ruleset.Value.CreateInstance(), Beatmap.Value.Beatmap, Beatmap.Value.Skin)
+                {
+                    Child = requester
+                };
             });
 
             AddAssert("requester got correct initial texture", () => textureOnLoad != null);
diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneDifficultyIcon.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneDifficultyIcon.cs
new file mode 100644
index 0000000000..fb6bebe50d
--- /dev/null
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneDifficultyIcon.cs
@@ -0,0 +1,60 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Beatmaps
+{
+    public partial class TestSceneDifficultyIcon : OsuTestScene
+    {
+        private FillFlowContainer<DifficultyIcon> fill = null!;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Child = fill = new FillFlowContainer<DifficultyIcon>
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 300,
+                Direction = FillDirection.Full,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        }
+
+        [Test]
+        public void CreateDifficultyIcon()
+        {
+            AddRepeatStep("create difficulty icon", () =>
+            {
+                var rulesetInfo = new OsuRuleset().RulesetInfo;
+                var beatmapInfo = new TestBeatmap(rulesetInfo).BeatmapInfo;
+
+                beatmapInfo.Difficulty.ApproachRate = RNG.Next(0, 10);
+                beatmapInfo.Difficulty.CircleSize = RNG.Next(0, 10);
+                beatmapInfo.Difficulty.OverallDifficulty = RNG.Next(0, 10);
+                beatmapInfo.Difficulty.DrainRate = RNG.Next(0, 10);
+                beatmapInfo.StarRating = RNG.NextSingle(0, 10);
+                beatmapInfo.BPM = RNG.Next(60, 300);
+
+                fill.Add(new DifficultyIcon(beatmapInfo, rulesetInfo)
+                {
+                    Scale = new Vector2(2),
+                });
+            }, 10);
+
+            AddStep("no tooltip", () => fill.ForEach(icon => icon.TooltipType = DifficultyIconTooltipType.None));
+            AddStep("basic tooltip", () => fill.ForEach(icon => icon.TooltipType = DifficultyIconTooltipType.StarRating));
+            AddStep("extended tooltip", () => fill.ForEach(icon => icon.TooltipType = DifficultyIconTooltipType.Extended));
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index f97372e9b6..c6827d4197 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -264,15 +264,23 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestMutedNotificationMasterVolume()
+        public void TestMutedNotificationLowMusicVolume()
         {
-            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.Value == 0.5);
+            addVolumeSteps("master and music volumes", () =>
+            {
+                audioManager.Volume.Value = 0.6;
+                audioManager.VolumeTrack.Value = 0.01;
+            }, () => Precision.AlmostEquals(audioManager.Volume.Value, 0.6) && Precision.AlmostEquals(audioManager.VolumeTrack.Value, 0.5));
         }
 
         [Test]
-        public void TestMutedNotificationTrackVolume()
+        public void TestMutedNotificationLowMasterVolume()
         {
-            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.Value == 0.5);
+            addVolumeSteps("master and music volumes", () =>
+            {
+                audioManager.Volume.Value = 0.01;
+                audioManager.VolumeTrack.Value = 0.6;
+            }, () => Precision.AlmostEquals(audioManager.Volume.Value, 0.5) && Precision.AlmostEquals(audioManager.VolumeTrack.Value, 0.6));
         }
 
         [Test]
@@ -281,9 +289,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             addVolumeSteps("mute button", () =>
             {
                 // Importantly, in the case the volume is muted but the user has a volume level set, it should be retained.
-                audioManager.VolumeTrack.Value = 0.5f;
+                audioManager.Volume.Value = 0.5;
+                audioManager.VolumeTrack.Value = 0.5;
                 volumeOverlay.IsMuted.Value = true;
-            }, () => !volumeOverlay.IsMuted.Value && audioManager.VolumeTrack.Value == 0.5f);
+            }, () => !volumeOverlay.IsMuted.Value && audioManager.Volume.Value == 0.5 && audioManager.VolumeTrack.Value == 0.5);
         }
 
         /// <remarks>
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
index b002e90bb0..fa17b77b55 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -14,39 +15,47 @@ namespace osu.Game.Tests.Visual.Gameplay
     public partial class TestSceneStarCounter : OsuTestScene
     {
         private readonly StarCounter starCounter;
+        private readonly StarCounter twentyStarCounter;
         private readonly OsuSpriteText starsLabel;
 
         public TestSceneStarCounter()
         {
-            starCounter = new StarCounter
+            Add(new FillFlowContainer
             {
-                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
-            };
-
-            Add(starCounter);
-
-            starsLabel = new OsuSpriteText
-            {
                 Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Scale = new Vector2(2),
-                Y = 50,
-            };
-
-            Add(starsLabel);
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(20),
+                Children = new Drawable[]
+                {
+                    starCounter = new StarCounter(),
+                    twentyStarCounter = new StarCounter(20),
+                    starsLabel = new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Scale = new Vector2(2),
+                    },
+                }
+            });
 
             setStars(5);
 
-            AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (starCounter.StarCount + 1)), 10);
-            AddSliderStep("exact value", 0f, 10f, 5f, setStars);
-            AddStep("stop animation", () => starCounter.StopAnimation());
+            AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (twentyStarCounter.StarCount + 1)), 10);
+            AddSliderStep("exact value", 0f, 20f, 5f, setStars);
+            AddStep("stop animation", () =>
+            {
+                starCounter.StopAnimation();
+                twentyStarCounter.StopAnimation();
+            });
             AddStep("reset", () => setStars(0));
         }
 
         private void setStars(float stars)
         {
             starCounter.Current = stars;
+            twentyStarCounter.Current = stars;
             starsLabel.Text = starCounter.Current.ToString("0.00");
         }
     }
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
index 5fc075ed99..e603f72bb8 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -8,11 +8,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Login;
+using osu.Game.Overlays.Settings;
 using osu.Game.Users.Drawables;
 using osuTK.Input;
 
@@ -25,6 +27,9 @@ namespace osu.Game.Tests.Visual.Menus
 
         private LoginOverlay loginOverlay = null!;
 
+        [Resolved]
+        private OsuConfigManager configManager { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -156,5 +161,36 @@ namespace osu.Game.Tests.Visual.Menus
             });
             AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden);
         }
+
+        [Test]
+        public void TestUncheckingRememberUsernameClearsIt()
+        {
+            AddStep("logout", () => API.Logout());
+            AddStep("set username", () => configManager.SetValue(OsuSetting.Username, "test_user"));
+            AddStep("set remember password", () => configManager.SetValue(OsuSetting.SavePassword, true));
+            AddStep("uncheck remember username", () =>
+            {
+                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<SettingsCheckbox>().First());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("remember username off", () => configManager.Get<bool>(OsuSetting.SaveUsername), () => Is.False);
+            AddAssert("remember password off", () => configManager.Get<bool>(OsuSetting.SavePassword), () => Is.False);
+            AddAssert("username cleared", () => configManager.Get<string>(OsuSetting.Username), () => Is.Empty);
+        }
+
+        [Test]
+        public void TestUncheckingRememberPasswordClearsToken()
+        {
+            AddStep("logout", () => API.Logout());
+            AddStep("set token", () => configManager.SetValue(OsuSetting.Token, "test_token"));
+            AddStep("set remember password", () => configManager.SetValue(OsuSetting.SavePassword, true));
+            AddStep("uncheck remember token", () =>
+            {
+                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<SettingsCheckbox>().Last());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("remember password off", () => configManager.Get<bool>(OsuSetting.SavePassword), () => Is.False);
+            AddAssert("token cleared", () => configManager.Get<string>(OsuSetting.Token), () => Is.Empty);
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs
index f0506ed35c..69fedf4a3a 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs
@@ -2,12 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Game.Online.API;
+using osu.Game.Online.Solo;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Scoring;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
 
@@ -87,5 +92,91 @@ namespace osu.Game.Tests.Visual.Menus
                 AddStep($"Change state to {state}", () => dummyAPI.SetState(state));
             }
         }
+
+        [Test]
+        public void TestTransientUserStatisticsDisplay()
+        {
+            AddStep("Log in", () => dummyAPI.Login("wang", "jang"));
+            AddStep("Gain", () =>
+            {
+                var transientUpdateDisplay = this.ChildrenOfType<TransientUserStatisticsUpdateDisplay>().Single();
+                transientUpdateDisplay.LatestUpdate.Value = new SoloStatisticsUpdate(
+                    new ScoreInfo(),
+                    new UserStatistics
+                    {
+                        GlobalRank = 123_456,
+                        PP = 1234
+                    },
+                    new UserStatistics
+                    {
+                        GlobalRank = 111_111,
+                        PP = 1357
+                    });
+            });
+            AddStep("Loss", () =>
+            {
+                var transientUpdateDisplay = this.ChildrenOfType<TransientUserStatisticsUpdateDisplay>().Single();
+                transientUpdateDisplay.LatestUpdate.Value = new SoloStatisticsUpdate(
+                    new ScoreInfo(),
+                    new UserStatistics
+                    {
+                        GlobalRank = 111_111,
+                        PP = 1357
+                    },
+                    new UserStatistics
+                    {
+                        GlobalRank = 123_456,
+                        PP = 1234
+                    });
+            });
+            AddStep("No change", () =>
+            {
+                var transientUpdateDisplay = this.ChildrenOfType<TransientUserStatisticsUpdateDisplay>().Single();
+                transientUpdateDisplay.LatestUpdate.Value = new SoloStatisticsUpdate(
+                    new ScoreInfo(),
+                    new UserStatistics
+                    {
+                        GlobalRank = 111_111,
+                        PP = 1357
+                    },
+                    new UserStatistics
+                    {
+                        GlobalRank = 111_111,
+                        PP = 1357
+                    });
+            });
+            AddStep("Was null", () =>
+            {
+                var transientUpdateDisplay = this.ChildrenOfType<TransientUserStatisticsUpdateDisplay>().Single();
+                transientUpdateDisplay.LatestUpdate.Value = new SoloStatisticsUpdate(
+                    new ScoreInfo(),
+                    new UserStatistics
+                    {
+                        GlobalRank = null,
+                        PP = null
+                    },
+                    new UserStatistics
+                    {
+                        GlobalRank = 111_111,
+                        PP = 1357
+                    });
+            });
+            AddStep("Became null", () =>
+            {
+                var transientUpdateDisplay = this.ChildrenOfType<TransientUserStatisticsUpdateDisplay>().Single();
+                transientUpdateDisplay.LatestUpdate.Value = new SoloStatisticsUpdate(
+                    new ScoreInfo(),
+                    new UserStatistics
+                    {
+                        GlobalRank = 111_111,
+                        PP = 1357
+                    },
+                    new UserStatistics
+                    {
+                        GlobalRank = null,
+                        PP = null
+                    });
+            });
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index f59fbc75ac..7e42d4781d 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -18,6 +19,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -221,6 +223,67 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
         }
 
+        [Test]
+        public void TestAttemptPlayBeatmapWrongHashFails()
+        {
+            Screens.Select.SongSelect songSelect = null;
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
+            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("change beatmap files", () =>
+            {
+                foreach (var file in Game.Beatmap.Value.BeatmapSetInfo.Files.Where(f => Path.GetExtension(f.Filename) == ".osu"))
+                {
+                    using (var stream = Game.Storage.GetStream(Path.Combine("files", file.File.GetStoragePath()), FileAccess.ReadWrite))
+                        stream.WriteByte(0);
+                }
+            });
+
+            AddStep("invalidate cache", () =>
+            {
+                ((IWorkingBeatmapCache)Game.BeatmapManager).Invalidate(Game.Beatmap.Value.BeatmapSetInfo);
+            });
+
+            AddStep("select next difficulty", () => InputManager.Key(Key.Down));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("wait for player loader", () => Game.ScreenStack.CurrentScreen is PlayerLoader);
+            AddUntilStep("wait for song select", () => songSelect.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestAttemptPlayBeatmapMissingFails()
+        {
+            Screens.Select.SongSelect songSelect = null;
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
+            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("delete beatmap files", () =>
+            {
+                foreach (var file in Game.Beatmap.Value.BeatmapSetInfo.Files.Where(f => Path.GetExtension(f.Filename) == ".osu"))
+                    Game.Storage.Delete(Path.Combine("files", file.File.GetStoragePath()));
+            });
+
+            AddStep("invalidate cache", () =>
+            {
+                ((IWorkingBeatmapCache)Game.BeatmapManager).Invalidate(Game.Beatmap.Value.BeatmapSetInfo);
+            });
+
+            AddStep("select next difficulty", () => InputManager.Key(Key.Down));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("wait for player loader", () => Game.ScreenStack.CurrentScreen is PlayerLoader);
+            AddUntilStep("wait for song select", () => songSelect.IsCurrentScreen());
+        }
+
         [Test]
         public void TestRetryCountIncrements()
         {
@@ -986,6 +1049,29 @@ namespace osu.Game.Tests.Visual.Navigation
             }
         }
 
+        [Test]
+        public void TestPresentBeatmapAfterDeletion()
+        {
+            BeatmapSetInfo beatmap = null;
+
+            Screens.Select.SongSelect songSelect = null;
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
+            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("delete selected beatmap", () =>
+            {
+                beatmap = Game.Beatmap.Value.BeatmapSetInfo;
+                Game.BeatmapManager.Delete(Game.Beatmap.Value.BeatmapSetInfo);
+            });
+
+            AddUntilStep("nothing selected", () => Game.Beatmap.IsDefault);
+            AddStep("present deleted beatmap", () => Game.PresentBeatmap(beatmap));
+            AddAssert("still nothing selected", () => Game.Beatmap.IsDefault);
+        }
+
         private Func<Player> playToResults()
         {
             var player = playToCompletion();
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 57f1b2fbe9..9c180d43da 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
@@ -301,6 +302,25 @@ namespace osu.Game.Tests.Visual.Navigation
             switchToGameplayScene();
         }
 
+        [Test]
+        public void TestRulesetInputDisabledWhenSkinEditorOpen()
+        {
+            advanceToSongSelect();
+            openSkinEditor();
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            switchToGameplayScene();
+            AddUntilStep("nested input disabled", () => ((Player)Game.ScreenStack.CurrentScreen).ChildrenOfType<PassThroughInputManager>().All(manager => !manager.UseParentInput));
+
+            toggleSkinEditor();
+            AddUntilStep("nested input enabled", () => ((Player)Game.ScreenStack.CurrentScreen).ChildrenOfType<PassThroughInputManager>().Any(manager => manager.UseParentInput));
+
+            toggleSkinEditor();
+            AddUntilStep("nested input disabled", () => ((Player)Game.ScreenStack.CurrentScreen).ChildrenOfType<PassThroughInputManager>().All(manager => !manager.UseParentInput));
+        }
+
         private void advanceToSongSelect()
         {
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 3d8781d902..fd3552f675 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -170,6 +170,24 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        [Test]
+        public void TestPostAsOwner()
+        {
+            setUpCommentsResponse(getExampleComments());
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+
+            setUpPostResponse(true);
+            AddStep("enter text", () => editorTextBox.Current.Value = "comm");
+            AddStep("submit", () => commentsContainer.ChildrenOfType<CommentEditor>().Single().ChildrenOfType<RoundedButton>().First().TriggerClick());
+
+            AddUntilStep("comment sent", () =>
+            {
+                string writtenText = editorTextBox.Current.Value;
+                var comment = commentsContainer.ChildrenOfType<DrawableComment>().LastOrDefault();
+                return comment != null && comment.ChildrenOfType<SpriteText>().Any(y => y.Text == writtenText) && comment.ChildrenOfType<SpriteText>().Any(y => y.Text == "MAPPER");
+            });
+        }
+
         private void setUpCommentsResponse(CommentBundle commentBundle)
             => AddStep("set up response", () =>
             {
@@ -183,7 +201,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-        private void setUpPostResponse()
+        private void setUpPostResponse(bool asOwner = false)
             => AddStep("set up response", () =>
             {
                 dummyAPI.HandleRequest = request =>
@@ -191,7 +209,7 @@ namespace osu.Game.Tests.Visual.Online
                     if (!(request is CommentPostRequest req))
                         return false;
 
-                    req.TriggerSuccess(new CommentBundle
+                    var bundle = new CommentBundle
                     {
                         Comments = new List<Comment>
                         {
@@ -202,9 +220,26 @@ namespace osu.Game.Tests.Visual.Online
                                 LegacyName = "FirstUser",
                                 CreatedAt = DateTimeOffset.Now,
                                 VotesCount = 98,
+                                CommentableId = 2001,
+                                CommentableType = "test",
                             }
                         }
-                    });
+                    };
+
+                    if (asOwner)
+                    {
+                        bundle.Comments[0].UserId = 1001;
+                        bundle.Comments[0].User = new APIUser { Id = 1001, Username = "FirstUser" };
+                        bundle.CommentableMeta.Add(new CommentableMeta
+                        {
+                            Id = 2001,
+                            OwnerId = 1001,
+                            OwnerTitle = "MAPPER",
+                            Type = "test",
+                        });
+                    }
+
+                    req.TriggerSuccess(bundle);
                     return true;
                 };
             });
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index 5e83dd4fb3..5cdf79160c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -4,62 +4,66 @@
 #nullable disable
 
 using System;
-using NUnit.Framework;
-using osu.Framework.Allocation;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
+using osu.Game.Tests.Visual.UserInterface;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public partial class TestSceneDrawableComment : OsuTestScene
+    public partial class TestSceneDrawableComment : ThemeComparisonTestScene
     {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        private Container container;
-
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        public TestSceneDrawableComment()
+            : base(false)
         {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4,
-                },
-                container = new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                },
-            };
-        });
-
-        [TestCaseSource(nameof(comments))]
-        public void TestComment(string description, string text)
-        {
-            AddStep(description, () =>
-            {
-                comment.Pinned = description == "Pinned";
-                comment.Message = text;
-                container.Add(new DrawableComment(comment));
-            });
         }
 
-        private static readonly Comment comment = new Comment
+        protected override Drawable CreateContent() => new OsuScrollContainer(Direction.Vertical)
         {
-            Id = 1,
-            LegacyName = "Test User",
-            CreatedAt = DateTimeOffset.Now,
-            VotesCount = 0,
+            RelativeSizeAxes = Axes.Both,
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                ChildrenEnumerable = comments.Select(info =>
+                {
+                    var comment = new Comment
+                    {
+                        Id = 1,
+                        UserId = 1000,
+                        User = new APIUser { Id = 1000, Username = "Someone" },
+                        CreatedAt = DateTimeOffset.Now,
+                        VotesCount = 0,
+                        Pinned = info[0] == "Pinned",
+                        Message = info[1],
+                        CommentableId = 2001,
+                        CommentableType = "test"
+                    };
+
+                    return new[]
+                    {
+                        new DrawableComment(comment, Array.Empty<CommentableMeta>()),
+                        new DrawableComment(comment, new[]
+                        {
+                            new CommentableMeta
+                            {
+                                Id = 2001,
+                                OwnerId = comment.UserId,
+                                OwnerTitle = "MAPPER",
+                                Type = "test",
+                            },
+                            new CommentableMeta { Title = "Other Meta" },
+                        }),
+                    };
+                }).SelectMany(c => c)
+            }
         };
 
-        private static object[] comments =
+        private static readonly string[][] comments =
         {
             new[] { "Plain", "This is plain comment" },
             new[] { "Pinned", "This is pinned comment" },
@@ -77,16 +81,17 @@ namespace osu.Game.Tests.Visual.Online
             },
 
             // Taken from https://github.com/ppy/osu/issues/13993#issuecomment-885994077
+            new[] { "Problematic", @"My tablet doesn't work :( It's a Huion 420 and it's apparently incompatible with OpenTablet Driver. The warning I get is: ""DeviceInUseException: Device is currently in use by another kernel module. To fix this issue, please follow the instructions from https://github.com/OpenTabletDriver/OpenTabletDriver/wiki/Linux-FAQ#arg    umentoutofrangeexception-value-0-15"" and it repeats 4 times on the notification before logging subsequent warnings. Checking the logs, it looks for other Huion tablets before sending the notification (e.g. ""2021-07-23 03:52:33 [verbose]: Detect: Searching for tablet 'Huion WH1409 V2' 20 2021-07-23 03:52:33 [error]: DeviceInUseException: Device is currently in use by another kernel module. To fix this     issue, please follow the instructions from https://github.com/OpenTabletDriver/OpenTabletDriver/wiki/Linux-FAQ#arg    umentoutofrangeexception-value-0-15"") I use an Arch based installation of Linux and the tablet runs perfectly with Digimend kernel driver, with area configuration, pen pressure, etc. On osu!lazer the cursor disappears until I set it to ""Borderless"" instead of ""Fullscreen"" and even after it shows up, it goes to the bottom left corner as soon as a map starts. I have honestly 0 idea of whats going on at this point.", },
             new[]
             {
-                "Problematic", @"My tablet doesn't work :(
-It's a Huion 420 and it's apparently incompatible with OpenTablet Driver. The warning I get is: ""DeviceInUseException: Device is currently in use by another kernel module. To fix this issue, please follow the instructions from https://github.com/OpenTabletDriver/OpenTabletDriver/wiki/Linux-FAQ#arg    umentoutofrangeexception-value-0-15"" and it repeats 4 times on the notification before logging subsequent warnings.
-Checking the logs, it looks for other Huion tablets before sending the notification (e.g.
- ""2021-07-23 03:52:33 [verbose]: Detect: Searching for tablet 'Huion WH1409 V2'
- 20 2021-07-23 03:52:33 [error]: DeviceInUseException: Device is currently in use by another kernel module. To fix this     issue, please follow the instructions from https://github.com/OpenTabletDriver/OpenTabletDriver/wiki/Linux-FAQ#arg    umentoutofrangeexception-value-0-15"")
-I use an Arch based installation of Linux and the tablet runs perfectly with Digimend kernel driver, with area configuration, pen pressure, etc. On osu!lazer the cursor disappears until I set it to ""Borderless"" instead of ""Fullscreen"" and even after it shows up, it goes to the bottom left corner as soon as a map starts.
-I have honestly 0 idea of whats going on at this point."
-            }
+                "Code Block", @"User not found! ;_;
+
+There are a few possible reasons for this:
+
+    They may have changed their username.
+    The account may be temporarily unavailable due to security or abuse issues.
+    You may have made a typo!"
+            },
         };
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index 2bfbf76c10..33f4d577bd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -154,6 +154,19 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        [Test]
+        public void TestUnrankedPP()
+        {
+            AddStep("Load scores with unranked PP", () =>
+            {
+                var allScores = createScores();
+                allScores.Scores[0].Ranked = false;
+                allScores.UserScore = createUserBest();
+                allScores.UserScore.Score.Ranked = false;
+                scoresContainer.Scores = allScores;
+            });
+        }
+
         private ulong onlineID = 1;
 
         private APIScoresCollection createScores()
@@ -184,6 +197,7 @@ namespace osu.Game.Tests.Visual.Online
                         MaxCombo = 1234,
                         TotalScore = 1234567890,
                         Accuracy = 1,
+                        Ranked = true,
                     },
                     new SoloScoreInfo
                     {
@@ -206,6 +220,7 @@ namespace osu.Game.Tests.Visual.Online
                         MaxCombo = 1234,
                         TotalScore = 1234789,
                         Accuracy = 0.9997,
+                        Ranked = true,
                     },
                     new SoloScoreInfo
                     {
@@ -227,6 +242,7 @@ namespace osu.Game.Tests.Visual.Online
                         MaxCombo = 1234,
                         TotalScore = 12345678,
                         Accuracy = 0.9854,
+                        Ranked = true,
                     },
                     new SoloScoreInfo
                     {
@@ -247,6 +263,7 @@ namespace osu.Game.Tests.Visual.Online
                         MaxCombo = 1234,
                         TotalScore = 1234567,
                         Accuracy = 0.8765,
+                        Ranked = true,
                     },
                     new SoloScoreInfo
                     {
@@ -263,6 +280,7 @@ namespace osu.Game.Tests.Visual.Online
                         MaxCombo = 1234,
                         TotalScore = 123456,
                         Accuracy = 0.6543,
+                        Ranked = true,
                     },
                 }
             };
@@ -309,6 +327,7 @@ namespace osu.Game.Tests.Visual.Online
                 MaxCombo = 1234,
                 TotalScore = 123456,
                 Accuracy = 0.6543,
+                Ranked = true,
             },
             Position = 1337,
         };
diff --git a/osu.Game.Tests/Visual/Online/TestSceneSoloStatisticsWatcher.cs b/osu.Game.Tests/Visual/Online/TestSceneSoloStatisticsWatcher.cs
index 3607b37c7e..19121b7f58 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneSoloStatisticsWatcher.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneSoloStatisticsWatcher.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Tests.Visual.Online
         private Action<GetUsersRequest>? handleGetUsersRequest;
         private Action<GetUserRequest>? handleGetUserRequest;
 
-        private IDisposable? subscription;
-
         private readonly Dictionary<(int userId, string rulesetName), UserStatistics> serverSideStatistics = new Dictionary<(int userId, string rulesetName), UserStatistics>();
 
         [SetUpSteps]
@@ -252,26 +250,6 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("values after are correct", () => update!.After.TotalScore, () => Is.EqualTo(6_000_000));
         }
 
-        [Test]
-        public void TestStatisticsUpdateNotFiredAfterSubscriptionDisposal()
-        {
-            int userId = getUserId();
-            setUpUser(userId);
-
-            long scoreId = getScoreId();
-            var ruleset = new OsuRuleset().RulesetInfo;
-
-            SoloStatisticsUpdate? update = null;
-            registerForUpdates(scoreId, ruleset, receivedUpdate => update = receivedUpdate);
-            AddStep("unsubscribe", () => subscription!.Dispose());
-
-            feignScoreProcessing(userId, ruleset, 5_000_000);
-
-            AddStep("signal score processed", () => ((ISpectatorClient)spectatorClient).UserScoreProcessed(userId, scoreId));
-            AddWaitStep("wait a bit", 5);
-            AddAssert("update not received", () => update == null);
-        }
-
         [Test]
         public void TestGlobalStatisticsUpdatedAfterRegistrationAddedAndScoreProcessed()
         {
@@ -312,13 +290,20 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         private void registerForUpdates(long scoreId, RulesetInfo rulesetInfo, Action<SoloStatisticsUpdate> onUpdateReady) =>
-            AddStep("register for updates", () => subscription = watcher.RegisterForStatisticsUpdateAfter(
-                new ScoreInfo(Beatmap.Value.BeatmapInfo, new OsuRuleset().RulesetInfo, new RealmUser())
+            AddStep("register for updates", () =>
+            {
+                watcher.RegisterForStatisticsUpdateAfter(
+                    new ScoreInfo(Beatmap.Value.BeatmapInfo, new OsuRuleset().RulesetInfo, new RealmUser())
+                    {
+                        Ruleset = rulesetInfo,
+                        OnlineID = scoreId
+                    });
+                watcher.LatestUpdate.BindValueChanged(update =>
                 {
-                    Ruleset = rulesetInfo,
-                    OnlineID = scoreId
-                },
-                onUpdateReady));
+                    if (update.NewValue?.Score.OnlineID == scoreId)
+                        onUpdateReady.Invoke(update.NewValue);
+                });
+            });
 
         private void feignScoreProcessing(int userId, RulesetInfo rulesetInfo, long newTotalScore)
             => AddStep("feign score processing", () => serverSideStatistics[(userId, rulesetInfo.ShortName)] = new UserStatistics { TotalScore = newTotalScore });
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 42c0375dc2..b62a375fcd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -137,6 +137,11 @@ namespace osu.Game.Tests.Visual.Online
                 @"top_ranks",
                 @"medals"
             },
+            RankHighest = new APIUser.UserRankHighest
+            {
+                Rank = 1,
+                UpdatedAt = DateTimeOffset.Now,
+            },
             Statistics = new UserStatistics
             {
                 IsRanked = true,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index 5249e8694d..56e4348b65 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -40,7 +40,8 @@ namespace osu.Game.Tests.Visual.Online
                     new APIMod { Acronym = new OsuModHardRock().Acronym },
                     new APIMod { Acronym = new OsuModDoubleTime().Acronym },
                 },
-                Accuracy = 0.9813
+                Accuracy = 0.9813,
+                Ranked = true,
             };
 
             var secondScore = new SoloScoreInfo
@@ -62,7 +63,8 @@ namespace osu.Game.Tests.Visual.Online
                     new APIMod { Acronym = new OsuModHardRock().Acronym },
                     new APIMod { Acronym = new OsuModDoubleTime().Acronym },
                 },
-                Accuracy = 0.998546
+                Accuracy = 0.998546,
+                Ranked = true,
             };
 
             var thirdScore = new SoloScoreInfo
@@ -79,7 +81,8 @@ namespace osu.Game.Tests.Visual.Online
                     DifficultyName = "Insane"
                 },
                 EndedAt = DateTimeOffset.Now,
-                Accuracy = 0.9726
+                Accuracy = 0.9726,
+                Ranked = true,
             };
 
             var noPPScore = new SoloScoreInfo
@@ -95,7 +98,26 @@ namespace osu.Game.Tests.Visual.Online
                     DifficultyName = "[4K] Cataclysmic Hypernova"
                 },
                 EndedAt = DateTimeOffset.Now,
-                Accuracy = 0.55879
+                Accuracy = 0.55879,
+                Ranked = true,
+            };
+
+            var lovedScore = new SoloScoreInfo
+            {
+                Rank = ScoreRank.B,
+                Beatmap = new APIBeatmap
+                {
+                    BeatmapSet = new APIBeatmapSet
+                    {
+                        Title = "C18H27NO3(extend)",
+                        Artist = "Team Grimoire",
+                    },
+                    DifficultyName = "[4K] Cataclysmic Hypernova",
+                    Status = BeatmapOnlineStatus.Loved,
+                },
+                EndedAt = DateTimeOffset.Now,
+                Accuracy = 0.55879,
+                Ranked = true,
             };
 
             var unprocessedPPScore = new SoloScoreInfo
@@ -112,7 +134,26 @@ namespace osu.Game.Tests.Visual.Online
                     Status = BeatmapOnlineStatus.Ranked,
                 },
                 EndedAt = DateTimeOffset.Now,
-                Accuracy = 0.55879
+                Accuracy = 0.55879,
+                Ranked = true,
+            };
+
+            var unrankedPPScore = new SoloScoreInfo
+            {
+                Rank = ScoreRank.B,
+                Beatmap = new APIBeatmap
+                {
+                    BeatmapSet = new APIBeatmapSet
+                    {
+                        Title = "C18H27NO3(extend)",
+                        Artist = "Team Grimoire",
+                    },
+                    DifficultyName = "[4K] Cataclysmic Hypernova",
+                    Status = BeatmapOnlineStatus.Ranked,
+                },
+                EndedAt = DateTimeOffset.Now,
+                Accuracy = 0.55879,
+                Ranked = false,
             };
 
             Add(new FillFlowContainer
@@ -128,7 +169,9 @@ namespace osu.Game.Tests.Visual.Online
                     new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(firstScore)),
                     new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(secondScore)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(lovedScore)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(unprocessedPPScore)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(unrankedPPScore)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(firstScore, 0.97)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(secondScore, 0.85)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(thirdScore, 0.66)),
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneGradedCircles.cs b/osu.Game.Tests/Visual/Ranking/TestSceneGradedCircles.cs
new file mode 100644
index 0000000000..116386b4b5
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneGradedCircles.cs
@@ -0,0 +1,42 @@
+// Copyright (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.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public partial class TestSceneGradedCircles : OsuTestScene
+    {
+        private readonly GradedCircles ring;
+
+        public TestSceneGradedCircles()
+        {
+            ScoreProcessor scoreProcessor = new OsuRuleset().CreateScoreProcessor();
+            double accuracyX = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.X);
+            double accuracyS = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.S);
+
+            double accuracyA = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.A);
+            double accuracyB = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.B);
+            double accuracyC = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.C);
+
+            Add(ring = new GradedCircles(accuracyC, accuracyB, accuracyA, accuracyS, accuracyX)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(400)
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddSliderStep("Progress", 0.0, 1.0, 1.0, p => ring.Progress = p);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index aa4c879468..de2ae3708f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -629,7 +629,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             var sets = new List<BeatmapSetInfo>();
 
-            const string zzz_string = "zzzzz";
+            const string zzz_lowercase = "zzzzz";
+            const string zzz_uppercase = "ZZZZZ";
 
             AddStep("Populuate beatmap sets", () =>
             {
@@ -640,10 +641,16 @@ namespace osu.Game.Tests.Visual.SongSelect
                     var set = TestResources.CreateTestBeatmapSetInfo();
 
                     if (i == 4)
-                        set.Beatmaps.ForEach(b => b.Metadata.Artist = zzz_string);
+                        set.Beatmaps.ForEach(b => b.Metadata.Artist = zzz_uppercase);
+
+                    if (i == 8)
+                        set.Beatmaps.ForEach(b => b.Metadata.Artist = zzz_lowercase);
+
+                    if (i == 12)
+                        set.Beatmaps.ForEach(b => b.Metadata.Author.Username = zzz_uppercase);
 
                     if (i == 16)
-                        set.Beatmaps.ForEach(b => b.Metadata.Author.Username = zzz_string);
+                        set.Beatmaps.ForEach(b => b.Metadata.Author.Username = zzz_lowercase);
 
                     sets.Add(set);
                 }
@@ -652,9 +659,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             loadBeatmaps(sets);
 
             AddStep("Sort by author", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Author }, false));
-            AddAssert($"Check {zzz_string} is at bottom", () => carousel.BeatmapSets.Last().Metadata.Author.Username == zzz_string);
+            AddAssert($"Check {zzz_uppercase} is last", () => carousel.BeatmapSets.Last().Metadata.Author.Username == zzz_uppercase);
+            AddAssert($"Check {zzz_lowercase} is second last", () => carousel.BeatmapSets.SkipLast(1).Last().Metadata.Author.Username == zzz_lowercase);
             AddStep("Sort by artist", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Artist }, false));
-            AddAssert($"Check {zzz_string} is at bottom", () => carousel.BeatmapSets.Last().Metadata.Artist == zzz_string);
+            AddAssert($"Check {zzz_uppercase} is last", () => carousel.BeatmapSets.Last().Metadata.Artist == zzz_uppercase);
+            AddAssert($"Check {zzz_lowercase} is second last", () => carousel.BeatmapSets.SkipLast(1).Last().Metadata.Artist == zzz_lowercase);
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 57ea4ee58e..8d5c961265 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -282,7 +282,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             /// <summary>
             /// Check that the logo is tracking the position of the facade, with an acceptable precision lenience.
             /// </summary>
-            public bool IsLogoTracking => Precision.AlmostEquals(Logo.Position, ComputeLogoTrackingPosition());
+            public bool IsLogoTracking => Precision.AlmostEquals(Logo!.Position, ComputeLogoTrackingPosition());
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 99a5897dff..b26e126249 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -788,7 +788,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("all columns visible", () => this.ChildrenOfType<ModColumn>().All(col => col.IsPresent));
 
             AddStep("set search", () => modSelectOverlay.SearchTerm = "HD");
-            AddAssert("one column visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 1);
+            AddAssert("two columns visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 2);
 
             AddStep("filter out everything", () => modSelectOverlay.SearchTerm = "Some long search term with no matches");
             AddAssert("no columns visible", () => this.ChildrenOfType<ModColumn>().All(col => !col.IsPresent));
@@ -812,7 +812,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("all columns visible", () => this.ChildrenOfType<ModColumn>().All(col => col.IsPresent));
 
             AddStep("set search", () => modSelectOverlay.SearchTerm = "fail");
-            AddAssert("one column visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 2);
+            AddAssert("one column visible", () => this.ChildrenOfType<ModColumn>().Count(col => col.IsPresent) == 1);
 
             AddStep("hide", () => modSelectOverlay.Hide());
             AddStep("show", () => modSelectOverlay.Show());
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
index 1678890b73..63f7a2f2cc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 
@@ -18,13 +17,22 @@ namespace osu.Game.Tests.Visual.UserInterface
     public partial class TestSceneOsuDropdown : ThemeComparisonTestScene
     {
         protected override Drawable CreateContent() =>
-            new OsuEnumDropdown<BeatmapOnlineStatus>
+            new OsuEnumDropdown<TestEnum>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.TopCentre,
                 Width = 150
             };
 
+        private enum TestEnum
+        {
+            [System.ComponentModel.Description("Option")]
+            Option,
+
+            [System.ComponentModel.Description("Really lonnnnnnng option")]
+            ReallyLongOption,
+        }
+
         [Test]
         // todo: this can be written much better if ThemeComparisonTestScene has a manual input manager
         public void TestBackAction()
@@ -43,7 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("press back", () => dropdown().OnPressed(new KeyBindingPressEvent<GlobalAction>(new InputState(), GlobalAction.Back)));
             AddAssert("closed", () => dropdown().ChildrenOfType<Menu>().Single().State == MenuState.Closed);
 
-            OsuEnumDropdown<BeatmapOnlineStatus> dropdown() => this.ChildrenOfType<OsuEnumDropdown<BeatmapOnlineStatus>>().First();
+            OsuEnumDropdown<TestEnum> dropdown() => this.ChildrenOfType<OsuEnumDropdown<TestEnum>>().First();
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs b/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs
index 2c894eacab..3177695f44 100644
--- a/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs
+++ b/osu.Game.Tests/Visual/UserInterface/ThemeComparisonTestScene.cs
@@ -14,31 +14,39 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public abstract partial class ThemeComparisonTestScene : OsuGridTestScene
     {
-        protected ThemeComparisonTestScene()
-            : base(1, 2)
+        private readonly bool showWithoutColourProvider;
+
+        protected ThemeComparisonTestScene(bool showWithoutColourProvider = true)
+            : base(1, showWithoutColourProvider ? 2 : 1)
         {
+            this.showWithoutColourProvider = showWithoutColourProvider;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Cell(0, 0).AddRange(new[]
+            if (showWithoutColourProvider)
             {
-                new Box
+                Cell(0, 0).AddRange(new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colours.GreySeaFoam
-                },
-                CreateContent()
-            });
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colours.GreySeaFoam
+                    },
+                    CreateContent()
+                });
+            }
         }
 
         protected void CreateThemedContent(OverlayColourScheme colourScheme)
         {
             var colourProvider = new OverlayColourProvider(colourScheme);
 
-            Cell(0, 1).Clear();
-            Cell(0, 1).Add(new DependencyProvidingContainer
+            int col = showWithoutColourProvider ? 1 : 0;
+
+            Cell(0, col).Clear();
+            Cell(0, col).Add(new DependencyProvidingContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 CachedDependencies = new (Type, object)[]
diff --git a/osu.Game.Tournament.Tests/.vscode/launch.json b/osu.Game.Tournament.Tests/.vscode/launch.json
index 51aa541811..07a0db448d 100644
--- a/osu.Game.Tournament.Tests/.vscode/launch.json
+++ b/osu.Game.Tournament.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/net6.0/osu.Game.Tournament.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net8.0/osu.Game.Tournament.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/net6.0/osu.Game.Tournament.Tests.dll"
+                "${workspaceRoot}/bin/Release/net8.0/osu.Game.Tournament.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game/Audio/Effects/AudioFilter.cs b/osu.Game/Audio/Effects/AudioFilter.cs
index 682ca4ca7b..c8673372d7 100644
--- a/osu.Game/Audio/Effects/AudioFilter.cs
+++ b/osu.Game/Audio/Effects/AudioFilter.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using ManagedBass.Fx;
 using osu.Framework.Audio.Mixing;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 
 namespace osu.Game.Audio.Effects
@@ -22,6 +23,8 @@ namespace osu.Game.Audio.Effects
 
         private bool isAttached;
 
+        private readonly Cached filterApplication = new Cached();
+
         private int cutoff;
 
         /// <summary>
@@ -36,7 +39,7 @@ namespace osu.Game.Audio.Effects
                     return;
 
                 cutoff = value;
-                updateFilter(cutoff);
+                filterApplication.Invalidate();
             }
         }
 
@@ -61,6 +64,17 @@ namespace osu.Game.Audio.Effects
             Cutoff = getInitialCutoff(type);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!filterApplication.IsValid)
+            {
+                updateFilter(cutoff);
+                filterApplication.Validate();
+            }
+        }
+
         private int getInitialCutoff(BQFType type)
         {
             switch (type)
diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index b32310990c..f395718a93 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -2,6 +2,7 @@
 // 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.Platform;
@@ -38,17 +39,22 @@ namespace osu.Game.Beatmaps
         /// <param name="preferOnlineFetch">Whether metadata from an online source should be preferred. If <c>true</c>, the local cache will be skipped to ensure the freshest data state possible.</param>
         public void Update(BeatmapSetInfo beatmapSet, bool preferOnlineFetch)
         {
+            var lookupResults = new List<OnlineBeatmapMetadata?>();
+
             foreach (var beatmapInfo in beatmapSet.Beatmaps)
             {
                 if (!tryLookup(beatmapInfo, preferOnlineFetch, out var res))
                     continue;
 
-                if (res == null)
+                if (res == null || shouldDiscardLookupResult(res, beatmapInfo))
                 {
                     beatmapInfo.ResetOnlineInfo();
+                    lookupResults.Add(null); // mark lookup failure
                     continue;
                 }
 
+                lookupResults.Add(res);
+
                 beatmapInfo.OnlineID = res.BeatmapID;
                 beatmapInfo.OnlineMD5Hash = res.MD5Hash;
                 beatmapInfo.LastOnlineUpdate = res.LastUpdated;
@@ -57,19 +63,34 @@ namespace osu.Game.Beatmaps
                 beatmapInfo.BeatmapSet.OnlineID = res.BeatmapSetID;
 
                 // Some metadata should only be applied if there's no local changes.
-                if (shouldSaveOnlineMetadata(beatmapInfo))
+                if (beatmapInfo.MatchesOnlineVersion)
                 {
                     beatmapInfo.Status = res.BeatmapStatus;
                     beatmapInfo.Metadata.Author.OnlineID = res.AuthorID;
                 }
-
-                if (beatmapInfo.BeatmapSet.Beatmaps.All(shouldSaveOnlineMetadata))
-                {
-                    beatmapInfo.BeatmapSet.Status = res.BeatmapSetStatus ?? BeatmapOnlineStatus.None;
-                    beatmapInfo.BeatmapSet.DateRanked = res.DateRanked;
-                    beatmapInfo.BeatmapSet.DateSubmitted = res.DateSubmitted;
-                }
             }
+
+            if (beatmapSet.Beatmaps.All(b => b.MatchesOnlineVersion)
+                && lookupResults.All(r => r != null)
+                && lookupResults.Select(r => r!.BeatmapSetID).Distinct().Count() == 1)
+            {
+                var representative = lookupResults.First()!;
+
+                beatmapSet.Status = representative.BeatmapSetStatus ?? BeatmapOnlineStatus.None;
+                beatmapSet.DateRanked = representative.DateRanked;
+                beatmapSet.DateSubmitted = representative.DateSubmitted;
+            }
+        }
+
+        private bool shouldDiscardLookupResult(OnlineBeatmapMetadata result, BeatmapInfo beatmapInfo)
+        {
+            if (beatmapInfo.OnlineID > 0 && result.BeatmapID != beatmapInfo.OnlineID)
+                return true;
+
+            if (beatmapInfo.OnlineID == -1 && result.MD5Hash != beatmapInfo.MD5Hash)
+                return true;
+
+            return false;
         }
 
         /// <summary>
@@ -104,12 +125,6 @@ namespace osu.Game.Beatmaps
             return false;
         }
 
-        /// <summary>
-        /// Check whether the provided beatmap is in a state where online "ranked" status metadata should be saved against it.
-        /// Handles the case where a user may have locally modified a beatmap in the editor and expects the local status to stick.
-        /// </summary>
-        private static bool shouldSaveOnlineMetadata(BeatmapInfo beatmapInfo) => beatmapInfo.MatchesOnlineVersion || beatmapInfo.Status != BeatmapOnlineStatus.LocallyModified;
-
         public void Dispose()
         {
             apiMetadataSource.Dispose();
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index eecf79aa34..2e7f894d12 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 
@@ -31,14 +32,16 @@ namespace osu.Game.Beatmaps.Drawables
         }
 
         /// <summary>
-        /// Whether to display a tooltip on hover. Only works if a beatmap was provided at construction time.
+        /// Which type of tooltip to show. Only works if a beatmap was provided at construction time.
         /// </summary>
-        public bool ShowTooltip { get; set; } = true;
+        public DifficultyIconTooltipType TooltipType { get; set; } = DifficultyIconTooltipType.StarRating;
 
         private readonly IBeatmapInfo? beatmap;
 
         private readonly IRulesetInfo ruleset;
 
+        private readonly Mod[]? mods;
+
         private Drawable background = null!;
 
         private readonly Container iconContainer;
@@ -58,11 +61,14 @@ namespace osu.Game.Beatmaps.Drawables
         /// Creates a new <see cref="DifficultyIcon"/>. Will use provided beatmap's <see cref="BeatmapInfo.StarRating"/> for initial value.
         /// </summary>
         /// <param name="beatmap">The beatmap to be displayed in the tooltip, and to be used for the initial star rating value.</param>
+        /// <param name="mods">An array of mods to account for in the calculations</param>
         /// <param name="ruleset">An optional ruleset to be used for the icon display, in place of the beatmap's ruleset.</param>
-        public DifficultyIcon(IBeatmapInfo beatmap, IRulesetInfo? ruleset = null)
+        public DifficultyIcon(IBeatmapInfo beatmap, IRulesetInfo? ruleset = null, Mod[]? mods = null)
             : this(ruleset ?? beatmap.Ruleset)
         {
             this.beatmap = beatmap;
+            this.mods = mods;
+
             Current.Value = new StarDifficulty(beatmap.StarRating, 0);
         }
 
@@ -127,6 +133,24 @@ namespace osu.Game.Beatmaps.Drawables
             GetCustomTooltip() => new DifficultyIconTooltip();
 
         DifficultyIconTooltipContent IHasCustomTooltip<DifficultyIconTooltipContent>.
-            TooltipContent => (ShowTooltip && beatmap != null ? new DifficultyIconTooltipContent(beatmap, Current) : null)!;
+            TooltipContent => (TooltipType != DifficultyIconTooltipType.None && beatmap != null ? new DifficultyIconTooltipContent(beatmap, Current, ruleset, mods, TooltipType) : null)!;
+    }
+
+    public enum DifficultyIconTooltipType
+    {
+        /// <summary>
+        /// No tooltip.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Star rating only.
+        /// </summary>
+        StarRating,
+
+        /// <summary>
+        /// Star rating, OD, HP, CS, AR, length, BPM, and max combo.
+        /// </summary>
+        Extended,
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs b/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs
index 3fa24bcc3e..1f3dcfee8c 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs
@@ -1,8 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -11,14 +11,25 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 
 namespace osu.Game.Beatmaps.Drawables
 {
     internal partial class DifficultyIconTooltip : VisibilityContainer, ITooltip<DifficultyIconTooltipContent>
     {
-        private OsuSpriteText difficultyName;
-        private StarRatingDisplay starRating;
+        private OsuSpriteText difficultyName = null!;
+        private StarRatingDisplay starRating = null!;
+        private OsuSpriteText overallDifficulty = null!;
+        private OsuSpriteText drainRate = null!;
+        private OsuSpriteText circleSize = null!;
+        private OsuSpriteText approachRate = null!;
+        private OsuSpriteText bpm = null!;
+        private OsuSpriteText length = null!;
+
+        private FillFlowContainer difficultyFillFlowContainer = null!;
+        private FillFlowContainer miscFillFlowContainer = null!;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -31,7 +42,6 @@ namespace osu.Game.Beatmaps.Drawables
             {
                 new Box
                 {
-                    Alpha = 0.9f,
                     Colour = colours.Gray3,
                     RelativeSizeAxes = Axes.Both
                 },
@@ -49,19 +59,49 @@ namespace osu.Game.Beatmaps.Drawables
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold),
+                            Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold)
                         },
                         starRating = new StarRatingDisplay(default, StarRatingDisplaySize.Small)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre
+                        },
+                        difficultyFillFlowContainer = new FillFlowContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
+                            Alpha = 0,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5),
+                            Children = new Drawable[]
+                            {
+                                circleSize = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                                drainRate = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                                overallDifficulty = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                                approachRate = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                            }
+                        },
+                        miscFillFlowContainer = new FillFlowContainer
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Alpha = 0,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5),
+                            Children = new Drawable[]
+                            {
+                                length = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                                bpm = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                            }
                         }
                     }
                 }
             };
         }
 
-        private DifficultyIconTooltipContent displayedContent;
+        private DifficultyIconTooltipContent? displayedContent;
 
         public void SetContent(DifficultyIconTooltipContent content)
         {
@@ -72,6 +112,45 @@ namespace osu.Game.Beatmaps.Drawables
 
             starRating.Current.BindTarget = displayedContent.Difficulty;
             difficultyName.Text = displayedContent.BeatmapInfo.DifficultyName;
+
+            if (displayedContent.TooltipType == DifficultyIconTooltipType.StarRating)
+            {
+                difficultyFillFlowContainer.Hide();
+                miscFillFlowContainer.Hide();
+                return;
+            }
+
+            difficultyFillFlowContainer.Show();
+            miscFillFlowContainer.Show();
+
+            double rate = 1;
+
+            if (displayedContent.Mods != null)
+            {
+                foreach (var mod in displayedContent.Mods.OfType<IApplicableToRate>())
+                    rate = mod.ApplyToRate(0, rate);
+            }
+
+            double bpmAdjusted = displayedContent.BeatmapInfo.BPM * rate;
+
+            BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(displayedContent.BeatmapInfo.Difficulty);
+
+            if (displayedContent.Mods != null)
+            {
+                foreach (var mod in displayedContent.Mods.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(originalDifficulty);
+            }
+
+            Ruleset ruleset = displayedContent.Ruleset.CreateInstance();
+            BeatmapDifficulty adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
+
+            circleSize.Text = @"CS: " + adjustedDifficulty.CircleSize.ToString(@"0.##");
+            drainRate.Text = @" HP: " + adjustedDifficulty.DrainRate.ToString(@"0.##");
+            approachRate.Text = @" AR: " + adjustedDifficulty.ApproachRate.ToString(@"0.##");
+            overallDifficulty.Text = @" OD: " + adjustedDifficulty.OverallDifficulty.ToString(@"0.##");
+
+            length.Text = "Length: " + TimeSpan.FromMilliseconds(displayedContent.BeatmapInfo.Length / rate).ToString(@"mm\:ss");
+            bpm.Text = " BPM: " + Math.Round(bpmAdjusted, 0);
         }
 
         public void Move(Vector2 pos) => Position = pos;
@@ -85,11 +164,20 @@ namespace osu.Game.Beatmaps.Drawables
     {
         public readonly IBeatmapInfo BeatmapInfo;
         public readonly IBindable<StarDifficulty> Difficulty;
+        public readonly IRulesetInfo Ruleset;
+        public readonly Mod[]? Mods;
+        public readonly DifficultyIconTooltipType TooltipType;
 
-        public DifficultyIconTooltipContent(IBeatmapInfo beatmapInfo, IBindable<StarDifficulty> difficulty)
+        public DifficultyIconTooltipContent(IBeatmapInfo beatmapInfo, IBindable<StarDifficulty> difficulty, IRulesetInfo rulesetInfo, Mod[]? mods, DifficultyIconTooltipType tooltipType)
         {
+            if (tooltipType == DifficultyIconTooltipType.None)
+                throw new ArgumentOutOfRangeException(nameof(tooltipType), tooltipType, "Cannot instantiate a tooltip without a type");
+
             BeatmapInfo = beatmapInfo;
             Difficulty = difficulty;
+            Ruleset = rulesetInfo;
+            Mods = mods;
+            TooltipType = tooltipType;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index d0ffbdd459..49dff96ff1 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps
 
         private readonly OffsetCorrectionClock? userGlobalOffsetClock;
         private readonly OffsetCorrectionClock? platformOffsetClock;
-        private readonly OffsetCorrectionClock? userBeatmapOffsetClock;
+        private readonly FramedOffsetClock? userBeatmapOffsetClock;
 
         private readonly IFrameBasedClock finalClockSource;
 
@@ -70,7 +70,7 @@ namespace osu.Game.Beatmaps
                 userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock);
 
                 // User per-beatmap offset will be applied to this final clock.
-                finalClockSource = userBeatmapOffsetClock = new OffsetCorrectionClock(userGlobalOffsetClock);
+                finalClockSource = userBeatmapOffsetClock = new FramedOffsetClock(userGlobalOffsetClock);
             }
             else
             {
@@ -122,7 +122,7 @@ namespace osu.Game.Beatmaps
                 Debug.Assert(userBeatmapOffsetClock != null);
                 Debug.Assert(platformOffsetClock != null);
 
-                return userGlobalOffsetClock.RateAdjustedOffset + userBeatmapOffsetClock.RateAdjustedOffset + platformOffsetClock.RateAdjustedOffset;
+                return userGlobalOffsetClock.RateAdjustedOffset + userBeatmapOffsetClock.Offset + platformOffsetClock.RateAdjustedOffset;
             }
         }
 
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index d97eb00d7e..b5bb6ccafc 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Beatmaps
 
             static void addCombo(HitObject hitObject, ref int combo)
             {
-                if (hitObject.CreateJudgement().MaxResult.AffectsCombo())
+                if (hitObject.Judgement.MaxResult.AffectsCombo())
                     combo++;
 
                 foreach (var nested in hitObject.NestedHitObjects)
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 74a85cde7c..8af74d11d8 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Rendering.Dummy;
 using osu.Framework.Graphics.Textures;
@@ -143,8 +144,6 @@ namespace osu.Game.Beatmaps
                 {
                     string fileStorePath = BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path);
 
-                    // TODO: check validity of file
-
                     var stream = GetStream(fileStorePath);
 
                     if (stream == null)
@@ -153,6 +152,12 @@ namespace osu.Game.Beatmaps
                         return null;
                     }
 
+                    if (stream.ComputeMD5Hash() != BeatmapInfo.MD5Hash)
+                    {
+                        Logger.Log($"Beatmap failed to load (file {BeatmapInfo.Path} does not have the expected hash).", level: LogLevel.Error);
+                        return null;
+                    }
+
                     using (var reader = new LineBufferedReader(stream))
                         return Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
                 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 6b2cb4ee74..a71460ded7 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -77,12 +77,19 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
             {
-                if (enabled.NewValue) SetValue(OsuSetting.SaveUsername, true);
+                if (enabled.NewValue)
+                    SetValue(OsuSetting.SaveUsername, true);
+                else
+                    GetBindable<string>(OsuSetting.Token).SetDefault();
             };
 
             SetDefault(OsuSetting.SaveUsername, true).ValueChanged += enabled =>
             {
-                if (!enabled.NewValue) SetValue(OsuSetting.SavePassword, false);
+                if (!enabled.NewValue)
+                {
+                    GetBindable<string>(OsuSetting.Username).SetDefault();
+                    SetValue(OsuSetting.SavePassword, false);
+                }
             };
 
             SetDefault(OsuSetting.ExternalLinkWarning, true);
diff --git a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
index 08eae25951..13c672cbd6 100644
--- a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
+++ b/osu.Game/Graphics/Containers/LogoTrackingContainer.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.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,7 +17,7 @@ namespace osu.Game.Graphics.Containers
     {
         public Facade LogoFacade => facade;
 
-        protected OsuLogo Logo { get; private set; }
+        protected OsuLogo? Logo { get; private set; }
 
         private readonly InternalFacade facade = new InternalFacade();
 
@@ -76,15 +74,15 @@ namespace osu.Game.Graphics.Containers
         /// <remarks>Will only be correct if the logo's <see cref="Drawable.RelativePositionAxes"/> are set to Axes.Both</remarks>
         protected Vector2 ComputeLogoTrackingPosition()
         {
-            var absolutePos = Logo.Parent!.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre);
+            var absolutePos = Logo!.Parent!.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre);
 
             return new Vector2(absolutePos.X / Logo.Parent!.RelativeToAbsoluteFactor.X,
                 absolutePos.Y / Logo.Parent!.RelativeToAbsoluteFactor.Y);
         }
 
-        protected override void Update()
+        protected override void UpdateAfterChildren()
         {
-            base.Update();
+            base.UpdateAfterChildren();
 
             if (Logo == null)
                 return;
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownCodeBlock.cs
similarity index 87%
rename from osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
rename to osu.Game/Graphics/Containers/Markdown/OsuMarkdownCodeBlock.cs
index 7d84d368ad..27802f4c0e 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownCodeBlock.cs
@@ -10,11 +10,11 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
-    public partial class OsuMarkdownFencedCodeBlock : MarkdownFencedCodeBlock
+    public partial class OsuMarkdownCodeBlock : MarkdownCodeBlock
     {
         // TODO : change to monospace font for this component
-        public OsuMarkdownFencedCodeBlock(FencedCodeBlock fencedCodeBlock)
-            : base(fencedCodeBlock)
+        public OsuMarkdownCodeBlock(CodeBlock codeBlock)
+            : base(codeBlock)
         {
         }
 
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index b4031752db..d465e53432 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new OsuMarkdownHeading(headingBlock);
 
-        protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
+        protected override MarkdownCodeBlock CreateCodeBlock(CodeBlock codeBlock) => new OsuMarkdownCodeBlock(codeBlock);
 
         protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
 
diff --git a/osu.Game/Graphics/Sprites/SpriteIconWithTooltip.cs b/osu.Game/Graphics/Sprites/SpriteIconWithTooltip.cs
new file mode 100644
index 0000000000..17f4bf53f9
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/SpriteIconWithTooltip.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.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Graphics.Sprites
+{
+    /// <summary>
+    /// A <see cref="SpriteIcon"/> with a publicly settable tooltip text.
+    /// </summary>
+    public partial class SpriteIconWithTooltip : SpriteIcon, IHasTooltip
+    {
+        public LocalisableString TooltipText { get; set; }
+    }
+}
diff --git a/osu.Game/Graphics/Sprites/SpriteTextWithTooltip.cs b/osu.Game/Graphics/Sprites/SpriteTextWithTooltip.cs
new file mode 100644
index 0000000000..446b621b81
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/SpriteTextWithTooltip.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 osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Graphics.Sprites
+{
+    /// <summary>
+    /// An <see cref="OsuSpriteText"/> with a publicly settable tooltip text.
+    /// </summary>
+    internal partial class SpriteTextWithTooltip : OsuSpriteText, IHasTooltip
+    {
+        public LocalisableString TooltipText { get; set; }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 2dc701dc9d..38e90bf4ea 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -186,6 +186,8 @@ namespace osu.Game.Graphics.UserInterface
                     : base(item)
                 {
                     Foreground.Padding = new MarginPadding(2);
+                    Foreground.AutoSizeAxes = Axes.Y;
+                    Foreground.RelativeSizeAxes = Axes.X;
 
                     Masking = true;
                     CornerRadius = corner_radius;
@@ -247,11 +249,12 @@ namespace osu.Game.Graphics.UserInterface
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
                             },
-                            Label = new OsuSpriteText
+                            Label = new TruncatingSpriteText
                             {
-                                X = 15,
+                                Padding = new MarginPadding { Left = 15 },
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
+                                RelativeSizeAxes = Axes.X,
                             },
                         };
                     }
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index 720f479216..4e9e34d840 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 star.ClearTransforms(true);
 
-                double delay = (current <= newValue ? Math.Max(i - current, 0) : Math.Max(current - 1 - i, 0)) * AnimationDelay;
+                double delay = Math.Max(current <= newValue ? i - current : Math.Min(current, StarCount) - 1 - i, 0) * AnimationDelay;
 
                 using (star.BeginDelayedSequence(delay))
                     star.DisplayAt(getStarScale(i, newValue));
diff --git a/osu.Game/Localisation/StorageErrorDialogStrings.cs b/osu.Game/Localisation/StorageErrorDialogStrings.cs
new file mode 100644
index 0000000000..6ad388dd1f
--- /dev/null
+++ b/osu.Game/Localisation/StorageErrorDialogStrings.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 osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class StorageErrorDialogStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.StorageErrorDialog";
+
+        /// <summary>
+        /// "osu! storage error"
+        /// </summary>
+        public static LocalisableString StorageError => new TranslatableString(getKey(@"storage_error"), @"osu! storage error");
+
+        /// <summary>
+        /// "The specified osu! data location (&quot;{0}&quot;) is not accessible. If it is on external storage, please reconnect the device and try again."
+        /// </summary>
+        public static LocalisableString LocationIsNotAccessible(string? loc) => new TranslatableString(getKey(@"location_is_not_accessible"), @"The specified osu! data location (""{0}"") is not accessible. If it is on external storage, please reconnect the device and try again.", loc);
+
+        /// <summary>
+        /// "The specified osu! data location (&quot;{0}&quot;) is empty. If you have moved the files, please close osu! and move them back."
+        /// </summary>
+        public static LocalisableString LocationIsEmpty(string? loc2) => new TranslatableString(getKey(@"location_is_empty"), @"The specified osu! data location (""{0}"") is empty. If you have moved the files, please close osu! and move them back.", loc2);
+
+        /// <summary>
+        /// "Try again"
+        /// </summary>
+        public static LocalisableString TryAgain => new TranslatableString(getKey(@"try_again"), @"Try again");
+
+        /// <summary>
+        /// "Use default location until restart"
+        /// </summary>
+        public static LocalisableString UseDefaultLocation => new TranslatableString(getKey(@"use_default_location"), @"Use default location until restart");
+
+        /// <summary>
+        /// "Reset to default location"
+        /// </summary>
+        public static LocalisableString ResetToDefaultLocation => new TranslatableString(getKey(@"reset_to_default_location"), @"Reset to default location");
+
+        /// <summary>
+        /// "Start fresh at specified location"
+        /// </summary>
+        public static LocalisableString StartFresh => new TranslatableString(getKey(@"start_fresh"), @"Start fresh at specified location");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index 56eec19fa1..4a31718f28 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -34,6 +34,19 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"previous_usernames")]
         public string[] PreviousUsernames;
 
+        [JsonProperty(@"rank_highest")]
+        [CanBeNull]
+        public UserRankHighest RankHighest;
+
+        public class UserRankHighest
+        {
+            [JsonProperty(@"rank")]
+            public int Rank;
+
+            [JsonProperty(@"updated_at")]
+            public DateTimeOffset UpdatedAt;
+        }
+
         [JsonProperty(@"country_code")]
         private string countryCodeString;
 
diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 907632186c..e6a5559d1f 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"votes_count")]
         public int VotesCount { get; set; }
 
-        [JsonProperty(@"commenatble_type")]
+        [JsonProperty(@"commentable_type")]
         public string CommentableType { get; set; } = null!;
 
         [JsonProperty(@"commentable_id")]
diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index ae8b850723..cbff8bf76c 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -11,6 +11,9 @@ namespace osu.Game.Online.API.Requests.Responses
 {
     public class CommentBundle
     {
+        [JsonProperty(@"commentable_meta")]
+        public List<CommentableMeta> CommentableMeta { get; set; } = new List<CommentableMeta>();
+
         [JsonProperty(@"comments")]
         public List<Comment> Comments { get; set; }
 
diff --git a/osu.Game/Online/API/Requests/Responses/CommentableMeta.cs b/osu.Game/Online/API/Requests/Responses/CommentableMeta.cs
new file mode 100644
index 0000000000..1084f1c900
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/CommentableMeta.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class CommentableMeta
+    {
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("owner_id")]
+        public long? OwnerId { get; set; }
+
+        [JsonProperty("owner_title")]
+        public string? OwnerTitle { get; set; }
+
+        [JsonProperty("title")]
+        public string Title { get; set; } = string.Empty;
+
+        [JsonProperty("type")]
+        public string Type { get; set; } = string.Empty;
+
+        [JsonProperty("url")]
+        public string Url { get; set; } = string.Empty;
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index e4ae83ca74..6f321fd401 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -115,6 +115,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("has_replay")]
         public bool HasReplay { get; set; }
 
+        [JsonProperty("ranked")]
+        public bool Ranked { get; set; }
+
         // These properties are calculated or not relevant to any external usage.
         public bool ShouldSerializeID() => false;
         public bool ShouldSerializeUser() => false;
@@ -213,6 +216,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 HasOnlineReplay = HasReplay,
                 Mods = mods,
                 PP = PP,
+                Ranked = Ranked,
             };
 
             if (beatmap is BeatmapInfo realmBeatmap)
diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index 883a2496f7..fa107a0e43 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -4,9 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ListExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Lists;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -23,12 +25,21 @@ namespace osu.Game.Online.Chat
         /// <summary>
         /// Each word part of a chat link (split for word-wrap support).
         /// </summary>
-        public readonly List<Drawable> Parts;
+        public readonly SlimReadOnlyListWrapper<Drawable> Parts;
 
         [Resolved]
         private OverlayColourProvider? overlayColourProvider { get; set; }
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+        {
+            foreach (var part in Parts)
+            {
+                if (part.ReceivePositionalInputAt(screenSpacePos))
+                    return true;
+            }
+
+            return false;
+        }
 
         protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new LinkHoverSounds(sampleSet, Parts);
 
@@ -39,7 +50,7 @@ namespace osu.Game.Online.Chat
 
         public DrawableLinkCompiler(IEnumerable<Drawable> parts)
         {
-            Parts = parts.ToList();
+            Parts = parts.ToList().AsSlimReadOnly();
         }
 
         [BackgroundDependencyLoader]
@@ -52,15 +63,24 @@ namespace osu.Game.Online.Chat
 
         private partial class LinkHoverSounds : HoverClickSounds
         {
-            private readonly List<Drawable> parts;
+            private readonly SlimReadOnlyListWrapper<Drawable> parts;
 
-            public LinkHoverSounds(HoverSampleSet sampleSet, List<Drawable> parts)
+            public LinkHoverSounds(HoverSampleSet sampleSet, SlimReadOnlyListWrapper<Drawable> parts)
                 : base(sampleSet)
             {
                 this.parts = parts;
             }
 
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+            {
+                foreach (var part in parts)
+                {
+                    if (part.ReceivePositionalInputAt(screenSpacePos))
+                        return true;
+                }
+
+                return false;
+            }
         }
     }
 }
diff --git a/osu.Game/Online/IStatefulUserHubClient.cs b/osu.Game/Online/IStatefulUserHubClient.cs
index 86105dd629..e931e3c862 100644
--- a/osu.Game/Online/IStatefulUserHubClient.cs
+++ b/osu.Game/Online/IStatefulUserHubClient.cs
@@ -13,6 +13,18 @@ namespace osu.Game.Online
     /// </summary>
     public interface IStatefulUserHubClient
     {
+        /// <summary>
+        /// Invoked when the server requests a client to disconnect.
+        /// </summary>
+        /// <remarks>
+        /// When this request is received, the client must presume any and all further requests to the server
+        /// will either fail or be ignored.
+        /// This method is ONLY to be used for the purposes of:
+        /// <list type="bullet">
+        /// <item>actually physically disconnecting from the server,</item>
+        /// <item>cleaning up / setting up any and all required local client state.</item>
+        /// </list>
+        /// </remarks>
         Task DisconnectRequested();
     }
 }
diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index c42c3378b7..3805d12688 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -58,6 +58,7 @@ namespace osu.Game.Online.Metadata
                     // 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(nameof(IStatefulUserHubClient.DisconnectRequested), ((IMetadataClient)this).DisconnectRequested);
                 };
 
                 IsConnected.BindTo(connector.IsConnected);
@@ -231,7 +232,8 @@ namespace osu.Game.Online.Metadata
         public override async Task DisconnectRequested()
         {
             await base.DisconnectRequested().ConfigureAwait(false);
-            await EndWatchingUserPresence().ConfigureAwait(false);
+            if (connector != null)
+                await connector.Disconnect().ConfigureAwait(false);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Online/Solo/SoloStatisticsWatcher.cs b/osu.Game/Online/Solo/SoloStatisticsWatcher.cs
index 55b27fb364..2072e8633f 100644
--- a/osu.Game/Online/Solo/SoloStatisticsWatcher.cs
+++ b/osu.Game/Online/Solo/SoloStatisticsWatcher.cs
@@ -1,10 +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;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
@@ -22,14 +22,16 @@ namespace osu.Game.Online.Solo
     /// </summary>
     public partial class SoloStatisticsWatcher : Component
     {
+        public IBindable<SoloStatisticsUpdate?> LatestUpdate => latestUpdate;
+        private readonly Bindable<SoloStatisticsUpdate?> latestUpdate = new Bindable<SoloStatisticsUpdate?>();
+
         [Resolved]
         private SpectatorClient spectatorClient { get; set; } = null!;
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        private readonly Dictionary<long, StatisticsUpdateCallback> callbacks = new Dictionary<long, StatisticsUpdateCallback>();
-        private long? lastProcessedScoreId;
+        private readonly Dictionary<long, ScoreInfo> watchedScores = new Dictionary<long, ScoreInfo>();
 
         private Dictionary<string, UserStatistics>? latestStatistics;
 
@@ -45,9 +47,7 @@ namespace osu.Game.Online.Solo
         /// Registers for a user statistics update after the given <paramref name="score"/> has been processed server-side.
         /// </summary>
         /// <param name="score">The score to listen for the statistics update for.</param>
-        /// <param name="onUpdateReady">The callback to be invoked once the statistics update has been prepared.</param>
-        /// <returns>An <see cref="IDisposable"/> representing the subscription. Disposing it is equivalent to unsubscribing from future notifications.</returns>
-        public IDisposable RegisterForStatisticsUpdateAfter(ScoreInfo score, Action<SoloStatisticsUpdate> onUpdateReady)
+        public void RegisterForStatisticsUpdateAfter(ScoreInfo score)
         {
             Schedule(() =>
             {
@@ -57,24 +57,12 @@ namespace osu.Game.Online.Solo
                 if (!score.Ruleset.IsLegacyRuleset() || score.OnlineID <= 0)
                     return;
 
-                var callback = new StatisticsUpdateCallback(score, onUpdateReady);
-
-                if (lastProcessedScoreId == score.OnlineID)
-                {
-                    requestStatisticsUpdate(api.LocalUser.Value.Id, callback);
-                    return;
-                }
-
-                callbacks.Add(score.OnlineID, callback);
+                watchedScores.Add(score.OnlineID, score);
             });
-
-            return new InvokeOnDisposal(() => Schedule(() => callbacks.Remove(score.OnlineID)));
         }
 
         private void onUserChanged(APIUser? localUser) => Schedule(() =>
         {
-            callbacks.Clear();
-            lastProcessedScoreId = null;
             latestStatistics = null;
 
             if (localUser == null || localUser.OnlineID <= 1)
@@ -107,25 +95,22 @@ namespace osu.Game.Online.Solo
             if (userId != api.LocalUser.Value?.OnlineID)
                 return;
 
-            lastProcessedScoreId = scoreId;
-
-            if (!callbacks.TryGetValue(scoreId, out var callback))
+            if (!watchedScores.Remove(scoreId, out var scoreInfo))
                 return;
 
-            requestStatisticsUpdate(userId, callback);
-            callbacks.Remove(scoreId);
+            requestStatisticsUpdate(userId, scoreInfo);
         }
 
-        private void requestStatisticsUpdate(int userId, StatisticsUpdateCallback callback)
+        private void requestStatisticsUpdate(int userId, ScoreInfo scoreInfo)
         {
-            var request = new GetUserRequest(userId, callback.Score.Ruleset);
-            request.Success += user => Schedule(() => dispatchStatisticsUpdate(callback, user.Statistics));
+            var request = new GetUserRequest(userId, scoreInfo.Ruleset);
+            request.Success += user => Schedule(() => dispatchStatisticsUpdate(scoreInfo, user.Statistics));
             api.Queue(request);
         }
 
-        private void dispatchStatisticsUpdate(StatisticsUpdateCallback callback, UserStatistics updatedStatistics)
+        private void dispatchStatisticsUpdate(ScoreInfo scoreInfo, UserStatistics updatedStatistics)
         {
-            string rulesetName = callback.Score.Ruleset.ShortName;
+            string rulesetName = scoreInfo.Ruleset.ShortName;
 
             api.UpdateStatistics(updatedStatistics);
 
@@ -135,9 +120,7 @@ namespace osu.Game.Online.Solo
             latestStatistics.TryGetValue(rulesetName, out UserStatistics? latestRulesetStatistics);
             latestRulesetStatistics ??= new UserStatistics();
 
-            var update = new SoloStatisticsUpdate(callback.Score, latestRulesetStatistics, updatedStatistics);
-            callback.OnUpdateReady.Invoke(update);
-
+            latestUpdate.Value = new SoloStatisticsUpdate(scoreInfo, latestRulesetStatistics, updatedStatistics);
             latestStatistics[rulesetName] = updatedStatistics;
         }
 
@@ -148,17 +131,5 @@ namespace osu.Game.Online.Solo
 
             base.Dispose(isDisposing);
         }
-
-        private class StatisticsUpdateCallback
-        {
-            public ScoreInfo Score { get; }
-            public Action<SoloStatisticsUpdate> OnUpdateReady { get; }
-
-            public StatisticsUpdateCallback(ScoreInfo score, Action<SoloStatisticsUpdate> onUpdateReady)
-            {
-                Score = score;
-                OnUpdateReady = onUpdateReady;
-            }
-        }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index c244708385..9ffa88947b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -47,6 +47,7 @@ using osu.Game.Localisation;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
+using osu.Game.Online.Solo;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Music;
@@ -630,6 +631,12 @@ namespace osu.Game
 
             var detachedSet = databasedSet.PerformRead(s => s.Detach());
 
+            if (detachedSet.DeletePending)
+            {
+                Logger.Log("The requested beatmap has since been deleted.", LoggingTarget.Information);
+                return;
+            }
+
             PerformFromScreen(screen =>
             {
                 // Find beatmaps that match our predicate.
@@ -1015,6 +1022,7 @@ namespace osu.Game
                 ScreenStack.Push(CreateLoader().With(l => l.RelativeSizeAxes = Axes.Both));
             });
 
+            loadComponentSingleFile(new SoloStatisticsWatcher(), Add, true);
             loadComponentSingleFile(Toolbar = new Toolbar
             {
                 OnHome = delegate
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a2a6322665..81e3d8bed8 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -50,7 +50,6 @@ using osu.Game.Online.API;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Metadata;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Solo;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
@@ -207,7 +206,6 @@ namespace osu.Game
         protected MultiplayerClient MultiplayerClient { get; private set; }
 
         private MetadataClient metadataClient;
-        private SoloStatisticsWatcher soloStatisticsWatcher;
 
         private RealmAccess realm;
 
@@ -328,7 +326,6 @@ namespace osu.Game
             dependencies.CacheAs(SpectatorClient = new OnlineSpectatorClient(endpoints));
             dependencies.CacheAs(MultiplayerClient = new OnlineMultiplayerClient(endpoints));
             dependencies.CacheAs(metadataClient = new OnlineMetadataClient(endpoints));
-            dependencies.CacheAs(soloStatisticsWatcher = new SoloStatisticsWatcher());
 
             base.Content.Add(new BeatmapOnlineChangeIngest(beatmapUpdater, realm, metadataClient));
 
@@ -371,7 +368,6 @@ namespace osu.Game
             base.Content.Add(SpectatorClient);
             base.Content.Add(MultiplayerClient);
             base.Content.Add(metadataClient);
-            base.Content.Add(soloStatisticsWatcher);
 
             base.Content.Add(rulesetConfigCache);
 
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
index 1f38e2ed6c..5f021803b0 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
@@ -297,7 +297,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     },
                     icon = new DifficultyIcon(beatmapInfo, ruleset)
                     {
-                        ShowTooltip = false,
+                        TooltipType = DifficultyIconTooltipType.None,
                         Current = { Value = new StarDifficulty(beatmapInfo.StarRating, 0) },
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 1fc997fdad..7a817c43eb 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -23,9 +23,9 @@ using osuTK.Graphics;
 using osu.Framework.Localisation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Scoring.Drawables;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
 {
@@ -180,10 +180,26 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             if (showPerformancePoints)
             {
-                if (score.PP != null)
-                    content.Add(new StatisticText(score.PP, format: @"N0"));
+                if (!score.Ranked)
+                {
+                    content.Add(new SpriteTextWithTooltip
+                    {
+                        Text = "-",
+                        Font = OsuFont.GetFont(size: text_size),
+                        TooltipText = ScoresStrings.StatusNoPp
+                    });
+                }
+                else if (score.PP == null)
+                {
+                    content.Add(new SpriteIconWithTooltip
+                    {
+                        Icon = FontAwesome.Solid.Sync,
+                        Size = new Vector2(text_size),
+                        TooltipText = ScoresStrings.StatusProcessing,
+                    });
+                }
                 else
-                    content.Add(new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(text_size) });
+                    content.Add(new StatisticText(score.PP, format: @"N0"));
             }
 
             content.Add(new ScoreboardTime(score.Date, text_size)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 72e590b009..17704f63ee 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -22,7 +22,6 @@ using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osu.Game.Scoring.Drawables;
 using osuTK;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
@@ -125,10 +124,26 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 ppColumn.Alpha = value.BeatmapInfo!.Status.GrantsPerformancePoints() ? 1 : 0;
 
-                if (value.PP is double pp)
-                    ppColumn.Text = pp.ToLocalisableString(@"N0");
+                if (!value.Ranked)
+                {
+                    ppColumn.Drawable = new SpriteTextWithTooltip
+                    {
+                        Text = "-",
+                        Font = smallFont,
+                        TooltipText = ScoresStrings.StatusNoPp
+                    };
+                }
+                else if (value.PP is not double pp)
+                {
+                    ppColumn.Drawable = new SpriteIconWithTooltip
+                    {
+                        Icon = FontAwesome.Solid.Sync,
+                        Size = new Vector2(smallFont.Size),
+                        TooltipText = ScoresStrings.StatusProcessing,
+                    };
+                }
                 else
-                    ppColumn.Drawable = new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(smallFont.Size) };
+                    ppColumn.Text = pp.ToLocalisableString(@"N0");
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);
                 modsColumn.Mods = value.Mods;
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index 21b6147113..87b1f4ef01 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -66,41 +66,37 @@ namespace osu.Game.Overlays.Chat.ChannelList
                     Colour = colourProvider.Background4,
                     Alpha = 0f,
                 },
-                new Container
+                new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Left = 18, Right = 10 },
-                    Child = new GridContainer
+                    ColumnDimensions = new[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(),
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.AutoSize),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable?[]
-                            {
-                                createIcon(),
-                                text = new TruncatingSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Text = Channel.Name,
-                                    Font = OsuFont.Torus.With(size: 17, weight: FontWeight.SemiBold),
-                                    Colour = colourProvider.Light3,
-                                    Margin = new MarginPadding { Bottom = 2 },
-                                    RelativeSizeAxes = Axes.X,
-                                },
-                                createMentionPill(),
-                                close = createCloseButton(),
-                            }
-                        },
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(),
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.AutoSize),
                     },
-                },
+                    Content = new[]
+                    {
+                        new Drawable?[]
+                        {
+                            createIcon(),
+                            text = new TruncatingSpriteText
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Text = Channel.Name,
+                                Font = OsuFont.Torus.With(size: 17, weight: FontWeight.SemiBold),
+                                Colour = colourProvider.Light3,
+                                Margin = new MarginPadding { Bottom = 2 },
+                                RelativeSizeAxes = Axes.X,
+                            },
+                            createMentionPill(),
+                            close = createCloseButton(),
+                        }
+                    }
+                }
             };
 
             Action = () => OnRequestSelect?.Invoke(Channel);
diff --git a/osu.Game/Overlays/Comments/CommentAuthorLine.cs b/osu.Game/Overlays/Comments/CommentAuthorLine.cs
new file mode 100644
index 0000000000..1f6fef4df3
--- /dev/null
+++ b/osu.Game/Overlays/Comments/CommentAuthorLine.cs
@@ -0,0 +1,180 @@
+// Copyright (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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Overlays.Comments
+{
+    public partial class CommentAuthorLine : FillFlowContainer
+    {
+        private readonly Comment comment;
+        private readonly IReadOnlyList<CommentableMeta> meta;
+
+        private OsuSpriteText deletedLabel = null!;
+
+        public CommentAuthorLine(Comment comment, IReadOnlyList<CommentableMeta> meta)
+        {
+            this.comment = comment;
+            this.meta = meta;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+            Direction = FillDirection.Horizontal;
+            Spacing = new Vector2(4, 0);
+
+            Add(new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold))
+            {
+                AutoSizeAxes = Axes.Both
+            }.With(username =>
+            {
+                if (comment.UserId.HasValue)
+                    username.AddUserLink(comment.User);
+                else
+                    username.AddText(comment.LegacyName!);
+            }));
+
+            var ownerMeta = meta.FirstOrDefault(m => m.Id == comment.CommentableId && m.Type == comment.CommentableType);
+
+            if (ownerMeta?.OwnerId != null && ownerMeta.OwnerId == comment.UserId)
+            {
+                Add(new OwnerTitleBadge(ownerMeta.OwnerTitle ?? string.Empty)
+                {
+                    // add top space to align with username
+                    Margin = new MarginPadding { Top = 1f },
+                });
+            }
+
+            if (comment.Pinned)
+                Add(new PinnedCommentNotice());
+
+            Add(new ParentUsername(comment));
+
+            Add(deletedLabel = new OsuSpriteText
+            {
+                Alpha = 0f,
+                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                Text = CommentsStrings.Deleted
+            });
+        }
+
+        public void MarkDeleted()
+        {
+            deletedLabel.Show();
+        }
+
+        private partial class OwnerTitleBadge : CircularContainer
+        {
+            private readonly string title;
+
+            public OwnerTitleBadge(string title)
+            {
+                this.title = title;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                AutoSizeAxes = Axes.Both;
+                Masking = true;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Light1,
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = title,
+                        Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold),
+                        Margin = new MarginPadding { Vertical = 2, Horizontal = 5 },
+                        Colour = colourProvider.Background6,
+                    },
+                };
+            }
+        }
+
+        private partial class PinnedCommentNotice : FillFlowContainer
+        {
+            public PinnedCommentNotice()
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+                Spacing = new Vector2(2, 0);
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Icon = FontAwesome.Solid.Thumbtack,
+                        Size = new Vector2(14),
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    },
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                        Text = CommentsStrings.Pinned,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    }
+                };
+            }
+        }
+
+        private partial class ParentUsername : FillFlowContainer, IHasTooltip
+        {
+            public LocalisableString TooltipText => getParentMessage();
+
+            private readonly Comment? parentComment;
+
+            public ParentUsername(Comment comment)
+            {
+                parentComment = comment.ParentComment;
+
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+                Spacing = new Vector2(3, 0);
+                Alpha = comment.ParentId == null ? 0 : 1;
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Icon = FontAwesome.Solid.Reply,
+                        Size = new Vector2(14),
+                    },
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                        Text = parentComment?.User?.Username ?? parentComment?.LegacyName!
+                    }
+                };
+            }
+
+            private LocalisableString getParentMessage()
+            {
+                if (parentComment == null)
+                    return string.Empty;
+
+                return parentComment.HasMessage ? parentComment.Message : parentComment.IsDeleted ? CommentsStrings.Deleted : string.Empty;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index b4e9a80ff1..2e5f13aa99 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Overlays.Comments
 
             void addNewComment(Comment comment)
             {
-                var drawableComment = GetDrawableComment(comment);
+                var drawableComment = GetDrawableComment(comment, bundle.CommentableMeta);
 
                 if (comment.ParentId == null)
                 {
@@ -333,7 +333,7 @@ namespace osu.Game.Overlays.Comments
                 if (CommentDictionary.ContainsKey(comment.Id))
                     continue;
 
-                topLevelComments.Add(GetDrawableComment(comment));
+                topLevelComments.Add(GetDrawableComment(comment, bundle.CommentableMeta));
             }
 
             if (topLevelComments.Any())
@@ -351,12 +351,12 @@ namespace osu.Game.Overlays.Comments
             }
         }
 
-        public DrawableComment GetDrawableComment(Comment comment)
+        public DrawableComment GetDrawableComment(Comment comment, IReadOnlyList<CommentableMeta> meta)
         {
             if (CommentDictionary.TryGetValue(comment.Id, out var existing))
                 return existing;
 
-            return CommentDictionary[comment.Id] = new DrawableComment(comment)
+            return CommentDictionary[comment.Id] = new DrawableComment(comment, meta)
             {
                 ShowDeleted = { BindTarget = ShowDeleted },
                 Sort = { BindTarget = Sort },
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index ceae17aa5d..afd4b96c68 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -4,12 +4,10 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users.Drawables;
 using osu.Game.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Bindables;
 using System.Linq;
 using osu.Game.Graphics.Sprites;
@@ -21,7 +19,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
@@ -42,6 +39,7 @@ namespace osu.Game.Overlays.Comments
         public Action<DrawableComment, int> RepliesRequested = null!;
 
         public readonly Comment Comment;
+        public readonly IReadOnlyList<CommentableMeta> Meta;
 
         public readonly BindableBool ShowDeleted = new BindableBool();
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
@@ -72,7 +70,7 @@ namespace osu.Game.Overlays.Comments
         private LinkFlowContainer actionsContainer = null!;
         private LoadingSpinner actionsLoading = null!;
         private DeletedCommentsCounter deletedCommentsCounter = null!;
-        private OsuSpriteText deletedLabel = null!;
+        private CommentAuthorLine author = null!;
         private GridContainer content = null!;
         private VotePill votePill = null!;
         private Container<CommentEditor> replyEditorContainer = null!;
@@ -90,15 +88,15 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OnScreenDisplay? onScreenDisplay { get; set; }
 
-        public DrawableComment(Comment comment)
+        public DrawableComment(Comment comment, IReadOnlyList<CommentableMeta> meta)
         {
             Comment = comment;
+            Meta = meta;
         }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, DrawableComment? parentComment)
         {
-            LinkFlowContainer username;
             FillFlowContainer info;
             CommentMarkdownContainer message;
 
@@ -174,27 +172,7 @@ namespace osu.Game.Overlays.Comments
                                             },
                                             Children = new Drawable[]
                                             {
-                                                new FillFlowContainer
-                                                {
-                                                    AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Horizontal,
-                                                    Spacing = new Vector2(10, 0),
-                                                    Children = new[]
-                                                    {
-                                                        username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold))
-                                                        {
-                                                            AutoSizeAxes = Axes.Both
-                                                        },
-                                                        Comment.Pinned ? new PinnedCommentNotice() : Empty(),
-                                                        new ParentUsername(Comment),
-                                                        deletedLabel = new OsuSpriteText
-                                                        {
-                                                            Alpha = 0f,
-                                                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
-                                                            Text = CommentsStrings.Deleted
-                                                        }
-                                                    }
-                                                },
+                                                author = new CommentAuthorLine(Comment, Meta),
                                                 message = new CommentMarkdownContainer
                                                 {
                                                     RelativeSizeAxes = Axes.X,
@@ -218,7 +196,7 @@ namespace osu.Game.Overlays.Comments
                                                             {
                                                                 new DrawableDate(Comment.CreatedAt, 12, false)
                                                                 {
-                                                                    Colour = colourProvider.Foreground1
+                                                                    Colour = colourProvider.Foreground1,
                                                                 }
                                                             }
                                                         },
@@ -311,11 +289,6 @@ namespace osu.Game.Overlays.Comments
                 }
             };
 
-            if (Comment.UserId.HasValue)
-                username.AddUserLink(Comment.User);
-            else
-                username.AddText(Comment.LegacyName!);
-
             if (Comment.EditedAt.HasValue && Comment.EditedUser != null)
             {
                 var font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
@@ -400,7 +373,7 @@ namespace osu.Game.Overlays.Comments
         /// </summary>
         private void makeDeleted()
         {
-            deletedLabel.Show();
+            author.MarkDeleted();
             content.FadeColour(OsuColour.Gray(0.5f));
             votePill.Hide();
             actionsContainer.Expire();
@@ -547,70 +520,5 @@ namespace osu.Game.Overlays.Comments
                 Top = 10
             };
         }
-
-        private partial class PinnedCommentNotice : FillFlowContainer
-        {
-            public PinnedCommentNotice()
-            {
-                AutoSizeAxes = Axes.Both;
-                Direction = FillDirection.Horizontal;
-                Spacing = new Vector2(2, 0);
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Icon = FontAwesome.Solid.Thumbtack,
-                        Size = new Vector2(14),
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    },
-                    new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
-                        Text = CommentsStrings.Pinned,
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    }
-                };
-            }
-        }
-
-        private partial class ParentUsername : FillFlowContainer, IHasTooltip
-        {
-            public LocalisableString TooltipText => getParentMessage();
-
-            private readonly Comment? parentComment;
-
-            public ParentUsername(Comment comment)
-            {
-                parentComment = comment.ParentComment;
-
-                AutoSizeAxes = Axes.Both;
-                Direction = FillDirection.Horizontal;
-                Spacing = new Vector2(3, 0);
-                Alpha = comment.ParentId == null ? 0 : 1;
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Icon = FontAwesome.Solid.Reply,
-                        Size = new Vector2(14),
-                    },
-                    new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                        Text = parentComment?.User?.Username ?? parentComment?.LegacyName!
-                    }
-                };
-            }
-
-            private LocalisableString getParentMessage()
-            {
-                if (parentComment == null)
-                    return string.Empty;
-
-                return parentComment.HasMessage ? parentComment.Message : parentComment.IsDeleted ? CommentsStrings.Deleted : string.Empty;
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
index dd4c35ef20..8e9e82507d 100644
--- a/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/ReplyCommentEditor.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Comments
             foreach (var comment in cb.Comments)
                 comment.ParentComment = parentComment;
 
-            var drawables = cb.Comments.Select(commentsContainer.GetDrawableComment).ToArray();
+            var drawables = cb.Comments.Select(c => commentsContainer.GetDrawableComment(c, cb.CommentableMeta)).ToArray();
             OnPost?.Invoke(drawables);
 
             OnCancel!.Invoke();
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index b9e4896b21..2f0b39bfbd 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Overlays.Mods
@@ -168,7 +169,7 @@ namespace osu.Game.Overlays.Mods
             foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                 rate = mod.ApplyToRate(0, rate);
 
-            bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
+            bpmDisplay.Current.Value = FormatUtils.RoundBPM(BeatmapInfo.Value.BPM, rate);
 
             BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
 
@@ -194,11 +195,11 @@ namespace osu.Game.Overlays.Mods
             RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
 
-        private partial class BPMDisplay : RollingCounter<double>
+        private partial class BPMDisplay : RollingCounter<int>
         {
             protected override double RollingDuration => 250;
 
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0 BPM");
+            protected override LocalisableString FormatCount(int count) => count.ToLocalisableString("0 BPM");
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index f294b1892d..cf173b0d6a 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -77,11 +77,11 @@ namespace osu.Game.Overlays.Mods
         /// <seealso cref="ModState.Visible"/>
         public bool Visible => modState.Visible;
 
-        public override IEnumerable<LocalisableString> FilterTerms => new[]
+        public override IEnumerable<LocalisableString> FilterTerms => new LocalisableString[]
         {
             Mod.Name,
+            Mod.Name.Replace(" ", string.Empty),
             Mod.Acronym,
-            Mod.Description
         };
 
         public override bool MatchingFilter
diff --git a/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs b/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs
index 4cd3890190..1fa98ebe97 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs
@@ -141,6 +141,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
 
             detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
+
+            var rankHighest = user?.RankHighest;
+
+            detailGlobalRank.ContentTooltipText = rankHighest != null
+                ? UsersStrings.ShowRankHighest(rankHighest.Rank.ToLocalisableString("\\##,##0"), rankHighest.UpdatedAt.ToLocalisableString(@"d MMM yyyy"))
+                : string.Empty;
+
             detailCountryRank.Content = user?.Statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
 
             rankGraph.Statistics.Value = user?.Statistics;
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileValueDisplay.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileValueDisplay.cs
index 4b1a0409a3..b2c23458b1 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileValueDisplay.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileValueDisplay.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -13,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
     public partial class ProfileValueDisplay : CompositeDrawable
     {
         private readonly OsuSpriteText title;
-        private readonly OsuSpriteText content;
+        private readonly ContentText content;
 
         public LocalisableString Title
         {
@@ -25,6 +26,11 @@ namespace osu.Game.Overlays.Profile.Header.Components
             set => content.Text = value;
         }
 
+        public LocalisableString ContentTooltipText
+        {
+            set => content.TooltipText = value;
+        }
+
         public ProfileValueDisplay(bool big = false, int minimumWidth = 60)
         {
             AutoSizeAxes = Axes.Both;
@@ -38,9 +44,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Font = OsuFont.GetFont(size: 12)
                     },
-                    content = new OsuSpriteText
+                    content = new ContentText
                     {
-                        Font = OsuFont.GetFont(size: big ? 30 : 20, weight: FontWeight.Light)
+                        Font = OsuFont.GetFont(size: big ? 30 : 20, weight: FontWeight.Light),
                     },
                     new Container // Add a minimum size to the FillFlowContainer
                     {
@@ -56,5 +62,10 @@ namespace osu.Game.Overlays.Profile.Header.Components
             title.Colour = colourProvider.Content1;
             content.Colour = colourProvider.Content2;
         }
+
+        private partial class ContentText : OsuSpriteText, IHasTooltip
+        {
+            public LocalisableString TooltipText { get; set; }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/TotalPlayTime.cs b/osu.Game/Overlays/Profile/Header/Components/TotalPlayTime.cs
index 5add988339..402b1fe86c 100644
--- a/osu.Game/Overlays/Profile/Header/Components/TotalPlayTime.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/TotalPlayTime.cs
@@ -5,26 +5,20 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public partial class TotalPlayTime : CompositeDrawable, IHasTooltip
+    public partial class TotalPlayTime : CompositeDrawable
     {
         public readonly Bindable<UserStatistics?> UserStatistics = new Bindable<UserStatistics?>();
 
-        public LocalisableString TooltipText { get; set; }
-
         private ProfileValueDisplay info = null!;
 
         public TotalPlayTime()
         {
             AutoSizeAxes = Axes.Both;
-
-            TooltipText = "0 hours";
         }
 
         [BackgroundDependencyLoader]
@@ -33,6 +27,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             InternalChild = info = new ProfileValueDisplay(minimumWidth: 140)
             {
                 Title = UsersStrings.ShowStatsPlayTime,
+                ContentTooltipText = "0 hours",
             };
 
             UserStatistics.BindValueChanged(updateTime, true);
@@ -41,7 +36,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private void updateTime(ValueChangedEvent<UserStatistics?> statistics)
         {
             int? playTime = statistics.NewValue?.PlayTime;
-            TooltipText = (playTime ?? 0) / 3600 + " hours";
+            info.ContentTooltipText = (playTime ?? 0) / 3600 + " hours";
             info.Content = formatTime(playTime);
         }
 
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 1f35f39b49..118bf9171e 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -26,47 +26,42 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background5,
                 },
-                new Container
+                new GridContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Vertical = 10 },
-                    Child = new GridContainer
+                    RowDimensions = new[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        RowDimensions = new[]
+                        new Dimension(GridSizeMode.AutoSize),
+                    },
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.AutoSize),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
                         {
-                            new Dimension(GridSizeMode.AutoSize),
-                        },
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(),
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.AutoSize),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
+                            new MainDetails
                             {
-                                new MainDetails
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    User = { BindTarget = User }
-                                },
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Y,
-                                    Width = 2,
-                                    Colour = colourProvider.Background6,
-                                    Margin = new MarginPadding { Horizontal = 15 }
-                                },
-                                new ExtendedDetails
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    User = { BindTarget = User }
-                                }
+                                RelativeSizeAxes = Axes.X,
+                                User = { BindTarget = User }
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                Width = 2,
+                                Colour = colourProvider.Background6,
+                                Margin = new MarginPadding { Horizontal = 15 }
+                            },
+                            new ExtendedDetails
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                User = { BindTarget = User }
                             }
                         }
                     }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index c26f2f19ba..63afca8b74 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -8,16 +8,17 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
+using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
-using osu.Game.Scoring.Drawables;
 using osu.Game.Utils;
 using osuTK;
 
@@ -213,42 +214,75 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         private Drawable createDrawablePerformance()
         {
-            if (!Score.PP.HasValue)
-            {
-                if (Score.Beatmap?.Status.GrantsPerformancePoints() == true)
-                    return new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(16), Colour = colourProvider.Highlight1 };
+            var font = OsuFont.GetFont(weight: FontWeight.Bold);
 
-                return new OsuSpriteText
+            if (Score.PP.HasValue)
+            {
+                return new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = font,
+                            Text = $"{Score.PP:0}",
+                            Colour = colourProvider.Highlight1
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = font.With(size: 12),
+                            Text = "pp",
+                            Colour = colourProvider.Light3
+                        }
+                    }
+                };
+            }
+
+            if (Score.Beatmap?.Status.GrantsPerformancePoints() != true)
+            {
+                if (Score.Beatmap?.Status == BeatmapOnlineStatus.Loved)
+                {
+                    return new SpriteIconWithTooltip
+                    {
+                        Icon = FontAwesome.Solid.Heart,
+                        Size = new Vector2(font.Size),
+                        TooltipText = UsersStrings.ShowExtraTopRanksNotRanked,
+                        Colour = colourProvider.Highlight1
+                    };
+                }
+
+                return new SpriteTextWithTooltip
                 {
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
                     Text = "-",
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                    TooltipText = UsersStrings.ShowExtraTopRanksNotRanked,
                     Colour = colourProvider.Highlight1
                 };
             }
 
-            return new FillFlowContainer
+            if (!Score.Ranked)
             {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Children = new[]
+                return new SpriteTextWithTooltip
                 {
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                        Text = $"{Score.PP:0}",
-                        Colour = colourProvider.Highlight1
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                        Text = "pp",
-                        Colour = colourProvider.Light3
-                    }
-                }
+                    Text = "-",
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                    TooltipText = ScoresStrings.StatusNoPp,
+                    Colour = colourProvider.Highlight1
+                };
+            }
+
+            return new SpriteIconWithTooltip
+            {
+                Icon = FontAwesome.Solid.Sync,
+                Size = new Vector2(font.Size),
+                TooltipText = ScoresStrings.StatusProcessing,
+                Colour = colourProvider.Highlight1
             };
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index fc5dd34971..a8b127d522 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions;
@@ -28,15 +27,16 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             var renderer = config.GetBindable<RendererType>(FrameworkSetting.Renderer);
             automaticRendererInUse = renderer.Value == RendererType.Automatic;
 
-            SettingsEnumDropdown<RendererType> rendererDropdown;
-
             Children = new Drawable[]
             {
-                rendererDropdown = new RendererSettingsDropdown
+                new RendererSettingsDropdown
                 {
                     LabelText = GraphicsSettingsStrings.Renderer,
                     Current = renderer,
-                    Items = host.GetPreferredRenderersForCurrentPlatform().Order().Where(t => t != RendererType.Vulkan),
+                    Items = host.GetPreferredRenderersForCurrentPlatform().Order()
+#pragma warning disable CS0612 // Type or member is obsolete
+                                .Where(t => t != RendererType.Vulkan && t != RendererType.OpenGLLegacy),
+#pragma warning restore CS0612 // Type or member is obsolete
                     Keywords = new[] { @"compatibility", @"directx" },
                 },
                 // TODO: this needs to be a custom dropdown at some point
@@ -79,13 +79,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     }));
                 }
             });
-
-            // TODO: remove this once we support SDL+android.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.Android)
-            {
-                rendererDropdown.Items = new[] { RendererType.Automatic, RendererType.OpenGLLegacy };
-                rendererDropdown.SetNoticeText("New renderer support for android is coming soon!", true);
-            }
         }
 
         private partial class RendererSettingsDropdown : SettingsEnumDropdown<RendererType>
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 40cd31934f..93e2f92a1c 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -10,9 +10,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -66,6 +68,7 @@ namespace osu.Game.Overlays.SkinEditor
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
         private OsuScreen? lastTargetScreen;
+        private InvokeOnDisposal? nestedInputManagerDisable;
 
         private Vector2 lastDrawSize;
 
@@ -105,6 +108,7 @@ namespace osu.Game.Overlays.SkinEditor
 
             if (skinEditor != null)
             {
+                disableNestedInputManagers();
                 skinEditor.Show();
                 return;
             }
@@ -132,6 +136,8 @@ namespace osu.Game.Overlays.SkinEditor
         {
             skinEditor?.Save(false);
             skinEditor?.Hide();
+            nestedInputManagerDisable?.Dispose();
+            nestedInputManagerDisable = null;
 
             globallyReenableBeatmapSkinSetting();
         }
@@ -243,6 +249,9 @@ namespace osu.Game.Overlays.SkinEditor
         /// </summary>
         public void SetTarget(OsuScreen screen)
         {
+            nestedInputManagerDisable?.Dispose();
+            nestedInputManagerDisable = null;
+
             lastTargetScreen = screen;
 
             if (skinEditor == null) return;
@@ -271,6 +280,7 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 skinEditor.Save(false);
                 skinEditor.UpdateTargetScreen(target);
+                disableNestedInputManagers();
             }
             else
             {
@@ -280,6 +290,21 @@ namespace osu.Game.Overlays.SkinEditor
             }
         }
 
+        private void disableNestedInputManagers()
+        {
+            if (lastTargetScreen == null)
+                return;
+
+            var nestedInputManagers = lastTargetScreen.ChildrenOfType<PassThroughInputManager>().Where(manager => manager.UseParentInput).ToArray();
+            foreach (var inputManager in nestedInputManagers)
+                inputManager.UseParentInput = false;
+            nestedInputManagerDisable = new InvokeOnDisposal(() =>
+            {
+                foreach (var inputManager in nestedInputManagers)
+                    inputManager.UseParentInput = true;
+            });
+        }
+
         private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
         private LeasedBindable<bool>? leasedBeatmapSkins;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 2620e850c8..96c0b15c44 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -78,6 +78,13 @@ namespace osu.Game.Overlays.Toolbar
                 }
             });
 
+            Flow.Add(new TransientUserStatisticsUpdateDisplay
+            {
+                Alpha = 0
+            });
+            Flow.AutoSizeEasing = Easing.OutQuint;
+            Flow.AutoSizeDuration = 250;
+
             apiState = api.State.GetBoundCopy();
             apiState.BindValueChanged(onlineStateChanged, true);
 
diff --git a/osu.Game/Overlays/Toolbar/TransientUserStatisticsUpdateDisplay.cs b/osu.Game/Overlays/Toolbar/TransientUserStatisticsUpdateDisplay.cs
new file mode 100644
index 0000000000..f56a1a3dd2
--- /dev/null
+++ b/osu.Game/Overlays/Toolbar/TransientUserStatisticsUpdateDisplay.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Framework.Threading;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Solo;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Overlays.Toolbar
+{
+    public partial class TransientUserStatisticsUpdateDisplay : CompositeDrawable
+    {
+        public Bindable<SoloStatisticsUpdate?> LatestUpdate { get; } = new Bindable<SoloStatisticsUpdate?>();
+
+        private Statistic<int> globalRank = null!;
+        private Statistic<decimal> pp = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(SoloStatisticsWatcher? soloStatisticsWatcher)
+        {
+            RelativeSizeAxes = Axes.Y;
+            AutoSizeAxes = Axes.X;
+            Alpha = 0;
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Padding = new MarginPadding { Horizontal = 10 },
+                Spacing = new Vector2(10),
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    globalRank = new Statistic<int>(UsersStrings.ShowRankGlobalSimple, @"#", Comparer<int>.Create((before, after) => before - after)),
+                    pp = new Statistic<decimal>(RankingsStrings.StatPerformance, string.Empty, Comparer<decimal>.Create((before, after) => Math.Sign(after - before))),
+                }
+            };
+
+            if (soloStatisticsWatcher != null)
+                ((IBindable<SoloStatisticsUpdate?>)LatestUpdate).BindTo(soloStatisticsWatcher.LatestUpdate);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            LatestUpdate.BindValueChanged(val =>
+            {
+                if (val.NewValue == null)
+                    return;
+
+                var update = val.NewValue;
+
+                // null handling here is best effort because it is annoying.
+
+                globalRank.Alpha = update.After.GlobalRank == null ? 0 : 1;
+                pp.Alpha = update.After.PP == null ? 0 : 1;
+
+                if (globalRank.Alpha == 0 && pp.Alpha == 0)
+                    return;
+
+                FinishTransforms(true);
+
+                this.FadeIn(500, Easing.OutQuint);
+
+                if (update.After.GlobalRank != null)
+                {
+                    globalRank.Display(
+                        update.Before.GlobalRank ?? update.After.GlobalRank.Value,
+                        Math.Abs((update.After.GlobalRank.Value - update.Before.GlobalRank) ?? 0),
+                        update.After.GlobalRank.Value);
+                }
+
+                if (update.After.PP != null)
+                    pp.Display(update.Before.PP ?? update.After.PP.Value, Math.Abs((update.After.PP - update.Before.PP) ?? 0M), update.After.PP.Value);
+
+                this.Delay(5000).FadeOut(500, Easing.OutQuint);
+            });
+        }
+
+        private partial class Statistic<T> : CompositeDrawable
+            where T : struct, IEquatable<T>, IFormattable
+        {
+            private readonly LocalisableString title;
+            private readonly string mainValuePrefix;
+            private readonly IComparer<T> valueComparer;
+
+            private Counter<T> mainValue = null!;
+            private Counter<T> deltaValue = null!;
+            private OsuSpriteText titleText = null!;
+            private ScheduledDelegate? valueUpdateSchedule;
+
+            [Resolved]
+            private OsuColour colours { get; set; } = null!;
+
+            public Statistic(LocalisableString title, string mainValuePrefix, IComparer<T> valueComparer)
+            {
+                this.title = title;
+                this.mainValuePrefix = mainValuePrefix;
+                this.valueComparer = valueComparer;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Y;
+                AutoSizeAxes = Axes.X;
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        mainValue = new Counter<T>
+                        {
+                            ValuePrefix = mainValuePrefix,
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                        },
+                        new Container
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            Children = new Drawable[]
+                            {
+                                deltaValue = new Counter<T>
+                                {
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    Font = OsuFont.Default.With(size: 12, fixedWidth: true, weight: FontWeight.SemiBold),
+                                    AlwaysPresent = true,
+                                },
+                                titleText = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
+                                    Text = title,
+                                    AlwaysPresent = true,
+                                }
+                            }
+                        }
+                    }
+                };
+            }
+
+            public void Display(T before, T delta, T after)
+            {
+                valueUpdateSchedule?.Cancel();
+                valueUpdateSchedule = null;
+
+                int comparison = valueComparer.Compare(before, after);
+
+                if (comparison > 0)
+                {
+                    deltaValue.Colour = colours.Lime1;
+                    deltaValue.ValuePrefix = "+";
+                }
+                else if (comparison < 0)
+                {
+                    deltaValue.Colour = colours.Red1;
+                    deltaValue.ValuePrefix = "-";
+                }
+                else
+                {
+                    deltaValue.Colour = Colour4.White;
+                    deltaValue.ValuePrefix = string.Empty;
+                }
+
+                mainValue.SetCountWithoutRolling(before);
+                deltaValue.SetCountWithoutRolling(delta);
+
+                titleText.Alpha = 1;
+                deltaValue.Alpha = 0;
+
+                using (BeginDelayedSequence(1200))
+                {
+                    titleText.FadeOut(250, Easing.OutQuad);
+                    deltaValue.FadeIn(250, Easing.OutQuad);
+
+                    using (BeginDelayedSequence(1250))
+                    {
+                        valueUpdateSchedule = Schedule(() =>
+                        {
+                            mainValue.Current.Value = after;
+                            deltaValue.Current.SetDefault();
+                        });
+                    }
+                }
+            }
+        }
+
+        private partial class Counter<T> : RollingCounter<T>
+            where T : struct, IEquatable<T>, IFormattable
+        {
+            public FontUsage Font { get; init; } = OsuFont.Default.With(fixedWidth: true);
+
+            public string ValuePrefix
+            {
+                get => valuePrefix;
+                set
+                {
+                    valuePrefix = value;
+                    UpdateDisplay();
+                }
+            }
+
+            private string valuePrefix = string.Empty;
+
+            protected override LocalisableString FormatCount(T count) => LocalisableString.Format(@"{0}{1:N0}", ValuePrefix, count);
+
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(t =>
+            {
+                t.Font = Font;
+                t.Spacing = new Vector2(-1.5f, 0);
+            });
+
+            protected override double RollingDuration => 1500;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 4563c264f7..946d83b14b 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -113,9 +113,9 @@ namespace osu.Game.Rulesets.Difficulty
         private IEnumerable<HitResult> getPerfectHitResults(HitObject hitObject)
         {
             foreach (HitObject nested in hitObject.NestedHitObjects)
-                yield return nested.CreateJudgement().MaxResult;
+                yield return nested.Judgement.MaxResult;
 
-            yield return hitObject.CreateJudgement().MaxResult;
+            yield return hitObject.Judgement.MaxResult;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index b3ca59a5b0..b2f38662cc 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -124,12 +123,34 @@ namespace osu.Game.Rulesets.Edit
 
         private (HitObject before, HitObject after)? getObjectsOnEitherSideOfCurrentTime()
         {
-            HitObject? lastBefore = playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime < editorClock.CurrentTime)?.HitObject;
+            HitObject? lastBefore = null;
+
+            foreach (var entry in playfield.HitObjectContainer.AliveEntries)
+            {
+                double objTime = entry.Value.HitObject.StartTime;
+
+                if (objTime >= editorClock.CurrentTime)
+                    continue;
+
+                if (objTime > lastBefore?.StartTime)
+                    lastBefore = entry.Value.HitObject;
+            }
 
             if (lastBefore == null)
                 return null;
 
-            HitObject? firstAfter = playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime >= editorClock.CurrentTime)?.HitObject;
+            HitObject? firstAfter = null;
+
+            foreach (var entry in playfield.HitObjectContainer.AliveEntries)
+            {
+                double objTime = entry.Value.HitObject.StartTime;
+
+                if (objTime < editorClock.CurrentTime)
+                    continue;
+
+                if (objTime < firstAfter?.StartTime)
+                    firstAfter = entry.Value.HitObject;
+            }
 
             if (firstAfter == null)
                 return null;
diff --git a/osu.Game/Rulesets/Mods/ModClassic.cs b/osu.Game/Rulesets/Mods/ModClassic.cs
index 16cb928bd4..b0f6ba9374 100644
--- a/osu.Game/Rulesets/Mods/ModClassic.cs
+++ b/osu.Game/Rulesets/Mods/ModClassic.cs
@@ -19,5 +19,16 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Feeling nostalgic?";
 
         public override ModType Type => ModType.Conversion;
+
+        /// <summary>
+        /// Classic mods are not to be ranked yet due to compatibility and multiplier concerns.
+        /// Right now classic mods are considered, for leaderboard purposes, to be equal as scores set on osu-stable.
+        /// But this is not the case.
+        ///
+        /// Some examples for things to resolve before even considering this:
+        ///  - Hit windows differ (https://github.com/ppy/osu/issues/11311).
+        ///  - Sliders always gives combo for slider end, even on miss (https://github.com/ppy/osu/issues/11769).
+        /// </summary>
+        public sealed override bool Ranked => false;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 5a1abf115f..2915cb9bea 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -16,11 +16,11 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => UsesDefaultConfiguration;
 
-        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
+        public virtual void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
         }
 
-        public ScoreRank AdjustRank(ScoreRank rank, double accuracy)
+        public virtual ScoreRank AdjustRank(ScoreRank rank, double accuracy)
         {
             switch (rank)
             {
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c9192ae3eb..16bd4b565c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -770,7 +770,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private void ensureEntryHasResult()
         {
             Debug.Assert(Entry != null);
-            Entry.Result ??= CreateResult(HitObject.CreateJudgement())
+            Entry.Result ??= CreateResult(HitObject.Judgement)
                              ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
         }
 
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index ef8bd08bf4..04bdc35941 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -163,8 +163,19 @@ namespace osu.Game.Rulesets.Objects
         protected void AddNested(HitObject hitObject) => nestedHitObjects.Add(hitObject);
 
         /// <summary>
-        /// Creates the <see cref="Judgement"/> that represents the scoring information for this <see cref="HitObject"/>.
+        /// The <see cref="Judgement"/> that represents the scoring information for this <see cref="HitObject"/>.
         /// </summary>
+        [JsonIgnore]
+        public Judgement Judgement => judgement ??= CreateJudgement();
+
+        private Judgement judgement;
+
+        /// <summary>
+        /// Should be overridden to create a <see cref="Judgement"/> that represents the scoring information for this <see cref="HitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// For read access, use <see cref="Judgement"/> to avoid unnecessary allocations.
+        /// </remarks>
         [NotNull]
         public virtual Judgement CreateJudgement() => new Judgement();
 
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index dc71608132..f33a07f082 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -61,16 +61,17 @@ namespace osu.Game.Rulesets.Objects
                     case NotifyCollectionChangedAction.Add:
                         Debug.Assert(args.NewItems != null);
 
-                        foreach (var c in args.NewItems.Cast<PathControlPoint>())
-                            c.Changed += invalidate;
+                        foreach (object? newItem in args.NewItems)
+                            ((PathControlPoint)newItem).Changed += invalidate;
+
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
                         Debug.Assert(args.OldItems != null);
 
-                        foreach (var c in args.OldItems.Cast<PathControlPoint>())
-                            c.Changed -= invalidate;
+                        foreach (object? oldItem in args.OldItems)
+                            ((PathControlPoint)oldItem).Changed -= invalidate;
                         break;
                 }
 
@@ -269,10 +270,10 @@ namespace osu.Game.Rulesets.Objects
                 {
                     List<Vector2> subPath = calculateSubPath(segmentVertices, segmentType);
                     // Skip the first vertex if it is the same as the last vertex from the previous segment
-                    int skipFirst = calculatedPath.Count > 0 && subPath.Count > 0 && calculatedPath.Last() == subPath[0] ? 1 : 0;
+                    bool skipFirst = calculatedPath.Count > 0 && subPath.Count > 0 && calculatedPath.Last() == subPath[0];
 
-                    foreach (Vector2 t in subPath.Skip(skipFirst))
-                        calculatedPath.Add(t);
+                    for (int j = skipFirst ? 1 : 0; j < subPath.Count; j++)
+                        calculatedPath.Add(subPath[j]);
                 }
 
                 if (i > 0)
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index e9f3bcb949..0e90330651 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Scoring
 
             foreach (var obj in EnumerateHitObjects(beatmap))
             {
-                var judgement = obj.CreateJudgement();
+                var judgement = obj.Judgement;
 
                 var result = CreateResult(obj, judgement);
                 if (result == null)
diff --git a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
index ce2f7d5624..2bc3ea80ec 100644
--- a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Scoring
 
             void increaseHp(HitObject hitObject)
             {
-                double amount = GetHealthIncreaseFor(hitObject, hitObject.CreateJudgement().MaxResult);
+                double amount = GetHealthIncreaseFor(hitObject, hitObject.Judgement.MaxResult);
                 currentHpUncapped += amount;
                 currentHp = Math.Max(0, Math.Min(1, currentHp + amount));
             }
diff --git a/osu.Game/Scoring/Drawables/UnprocessedPerformancePointsPlaceholder.cs b/osu.Game/Scoring/Drawables/UnprocessedPerformancePointsPlaceholder.cs
deleted file mode 100644
index 99eb7e964d..0000000000
--- a/osu.Game/Scoring/Drawables/UnprocessedPerformancePointsPlaceholder.cs
+++ /dev/null
@@ -1,27 +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 osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
-using osu.Game.Resources.Localisation.Web;
-
-namespace osu.Game.Scoring.Drawables
-{
-    /// <summary>
-    /// A placeholder used in PP columns for scores with unprocessed PP value.
-    /// </summary>
-    public partial class UnprocessedPerformancePointsPlaceholder : SpriteIcon, IHasTooltip
-    {
-        public LocalisableString TooltipText => ScoresStrings.StatusProcessing;
-
-        public UnprocessedPerformancePointsPlaceholder()
-        {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-            Icon = FontAwesome.Solid.ExclamationTriangle;
-        }
-    }
-}
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 32e4bbbf29..fd98107792 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -107,6 +107,12 @@ namespace osu.Game.Scoring
 
         public double? PP { get; set; }
 
+        /// <summary>
+        /// Whether the performance points in this score is awarded to the player. This is used for online display purposes (see <see cref="SoloScoreInfo.Ranked"/>).
+        /// </summary>
+        [Ignored]
+        public bool Ranked { get; set; }
+
         /// <summary>
         /// The online ID of this score.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/BottomBar.cs b/osu.Game/Screens/Edit/BottomBar.cs
index aa3c4ba0d0..bc7dfaab88 100644
--- a/osu.Game/Screens/Edit/BottomBar.cs
+++ b/osu.Game/Screens/Edit/BottomBar.cs
@@ -47,35 +47,31 @@ namespace osu.Game.Screens.Edit
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4,
                 },
-                new Container
+                new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = new GridContainer
+                    ColumnDimensions = new[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.Absolute, 170),
-                            new Dimension(),
-                            new Dimension(GridSizeMode.Absolute, 220),
-                            new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new TimeInfoContainer { RelativeSizeAxes = Axes.Both },
-                                new SummaryTimeline { RelativeSizeAxes = Axes.Both },
-                                new PlaybackControl { RelativeSizeAxes = Axes.Both },
-                                TestGameplayButton = new TestGameplayButton
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Size = new Vector2(1),
-                                    Action = editor.TestGameplay,
-                                }
-                            },
-                        }
+                        new Dimension(GridSizeMode.Absolute, 170),
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 220),
+                        new Dimension(GridSizeMode.Absolute, HitObjectComposer.TOOLBOX_CONTRACTED_SIZE_RIGHT),
                     },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new TimeInfoContainer { RelativeSizeAxes = Axes.Both },
+                            new SummaryTimeline { RelativeSizeAxes = Axes.Both },
+                            new PlaybackControl { RelativeSizeAxes = Axes.Both },
+                            TestGameplayButton = new TestGameplayButton
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Size = new Vector2(1),
+                                Action = editor.TestGameplay,
+                            }
+                        },
+                    }
                 }
             };
         }
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 431336aa60..a5ed0d680f 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -97,11 +97,14 @@ namespace osu.Game.Screens.Edit.Components
                 editorClock.Start();
         }
 
+        private static readonly IconUsage play_icon = FontAwesome.Regular.PlayCircle;
+        private static readonly IconUsage pause_icon = FontAwesome.Regular.PauseCircle;
+
         protected override void Update()
         {
             base.Update();
 
-            playButton.Icon = editorClock.IsRunning ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
+            playButton.Icon = editorClock.IsRunning ? pause_icon : play_icon;
         }
 
         private partial class PlaybackTabControl : OsuTabControl<double>
diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index 9c51258f17..4747828bca 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -47,11 +47,26 @@ namespace osu.Game.Screens.Edit.Components
             };
         }
 
+        private double? lastTime;
+        private double? lastBPM;
+
         protected override void Update()
         {
             base.Update();
-            trackTimer.Text = editorClock.CurrentTime.ToEditorFormattedString();
-            bpm.Text = @$"{editorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime).BPM:0} BPM";
+
+            if (lastTime != editorClock.CurrentTime)
+            {
+                lastTime = editorClock.CurrentTime;
+                trackTimer.Text = editorClock.CurrentTime.ToEditorFormattedString();
+            }
+
+            double newBPM = editorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime).BPM;
+
+            if (lastBPM != newBPM)
+            {
+                lastBPM = newBPM;
+                bpm.Text = @$"{newBPM:0} BPM";
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index da1a37d57f..40b97d2137 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -86,35 +86,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
                                         RelativeSizeAxes = Axes.Both,
                                         Colour = colourProvider.Background3
                                     },
-                                    new Container
+                                    new GridContainer
                                     {
                                         RelativeSizeAxes = Axes.Both,
-                                        Child = new GridContainer
+                                        Content = new[]
                                         {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Content = new[]
+                                            new Drawable[]
                                             {
-                                                new Drawable[]
+                                                new ChevronButton
                                                 {
-                                                    new ChevronButton
-                                                    {
-                                                        Icon = FontAwesome.Solid.ChevronLeft,
-                                                        Action = beatDivisor.SelectPrevious
-                                                    },
-                                                    new DivisorDisplay { BeatDivisor = { BindTarget = beatDivisor } },
-                                                    new ChevronButton
-                                                    {
-                                                        Icon = FontAwesome.Solid.ChevronRight,
-                                                        Action = beatDivisor.SelectNext
-                                                    }
+                                                    Icon = FontAwesome.Solid.ChevronLeft,
+                                                    Action = beatDivisor.SelectPrevious
                                                 },
+                                                new DivisorDisplay { BeatDivisor = { BindTarget = beatDivisor } },
+                                                new ChevronButton
+                                                {
+                                                    Icon = FontAwesome.Solid.ChevronRight,
+                                                    Action = beatDivisor.SelectNext
+                                                }
                                             },
-                                            ColumnDimensions = new[]
-                                            {
-                                                new Dimension(GridSizeMode.Absolute, 20),
-                                                new Dimension(),
-                                                new Dimension(GridSizeMode.Absolute, 20)
-                                            }
+                                        },
+                                        ColumnDimensions = new[]
+                                        {
+                                            new Dimension(GridSizeMode.Absolute, 20),
+                                            new Dimension(),
+                                            new Dimension(GridSizeMode.Absolute, 20)
                                         }
                                     }
                                 }
@@ -122,42 +118,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                         new Drawable[]
                         {
-                            new Container
+                            new GridContainer
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
+                                Content = new[]
                                 {
-                                    new Container
+                                    new Drawable[]
                                     {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Child = new GridContainer
+                                        new ChevronButton
                                         {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Content = new[]
-                                            {
-                                                new Drawable[]
-                                                {
-                                                    new ChevronButton
-                                                    {
-                                                        Icon = FontAwesome.Solid.ChevronLeft,
-                                                        Action = () => cycleDivisorType(-1)
-                                                    },
-                                                    new DivisorTypeText { BeatDivisor = { BindTarget = beatDivisor } },
-                                                    new ChevronButton
-                                                    {
-                                                        Icon = FontAwesome.Solid.ChevronRight,
-                                                        Action = () => cycleDivisorType(1)
-                                                    }
-                                                },
-                                            },
-                                            ColumnDimensions = new[]
-                                            {
-                                                new Dimension(GridSizeMode.Absolute, 20),
-                                                new Dimension(),
-                                                new Dimension(GridSizeMode.Absolute, 20)
-                                            }
+                                            Icon = FontAwesome.Solid.ChevronLeft,
+                                            Action = () => cycleDivisorType(-1)
+                                        },
+                                        new DivisorTypeText { BeatDivisor = { BindTarget = beatDivisor } },
+                                        new ChevronButton
+                                        {
+                                            Icon = FontAwesome.Solid.ChevronRight,
+                                            Action = () => cycleDivisorType(1)
                                         }
-                                    }
+                                    },
+                                },
+                                ColumnDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.Absolute, 20),
+                                    new Dimension(),
+                                    new Dimension(GridSizeMode.Absolute, 20)
                                 }
                             }
                         },
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index b60e04afc1..6ebd1961a2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -116,6 +116,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateStacking();
         }
 
+        private readonly Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
+
         private void updateStacking()
         {
             // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.
@@ -125,10 +127,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             // after the stack gets this tall, we can presume there is space underneath to draw subsequent blueprints.
             const int stack_reset_count = 3;
 
-            Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
+            currentConcurrentObjects.Clear();
 
-            foreach (var b in SelectionBlueprints.Reverse())
+            for (int i = SelectionBlueprints.Count - 1; i >= 0; i--)
             {
+                var b = SelectionBlueprints[i];
+
                 // remove objects from the stack as long as their end time is in the past.
                 while (currentConcurrentObjects.TryPeek(out HitObject hitObject))
                 {
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 575a66d421..2b97d363f1 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -57,37 +57,32 @@ namespace osu.Game.Screens.Edit
                                     RelativeSizeAxes = Axes.Both,
                                     Colour = colourProvider.Background4
                                 },
-                                new Container
+                                new GridContainer
                                 {
                                     Name = "Timeline content",
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                     Padding = new MarginPadding { Horizontal = PADDING, Top = PADDING },
-                                    Child = new GridContainer
+                                    Content = new[]
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Content = new[]
+                                        new Drawable[]
                                         {
-                                            new Drawable[]
+                                            TimelineContent = new Container
                                             {
-                                                TimelineContent = new Container
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                },
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
                                             },
                                         },
-                                        RowDimensions = new[]
-                                        {
-                                            new Dimension(GridSizeMode.AutoSize),
-                                        },
-                                        ColumnDimensions = new[]
-                                        {
-                                            new Dimension(),
-                                            new Dimension(GridSizeMode.Absolute, 90),
-                                        }
                                     },
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                    },
+                                    ColumnDimensions = new[]
+                                    {
+                                        new Dimension(),
+                                        new Dimension(GridSizeMode.Absolute, 90),
+                                    }
                                 }
                             }
                         },
diff --git a/osu.Game/Screens/Edit/Timing/TapTimingControl.cs b/osu.Game/Screens/Edit/Timing/TapTimingControl.cs
index bb7a3b8be3..8cdbd97ecb 100644
--- a/osu.Game/Screens/Edit/Timing/TapTimingControl.cs
+++ b/osu.Game/Screens/Edit/Timing/TapTimingControl.cs
@@ -65,35 +65,28 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         new Drawable[]
                         {
-                            new Container
+                            new GridContainer
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding(padding),
-                                Children = new Drawable[]
+                                ColumnDimensions = new[]
                                 {
-                                    new GridContainer
+                                    new Dimension(GridSizeMode.AutoSize),
+                                    new Dimension()
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
                                     {
-                                        RelativeSizeAxes = Axes.Both,
-                                        ColumnDimensions = new[]
+                                        metronome = new MetronomeDisplay
                                         {
-                                            new Dimension(GridSizeMode.AutoSize),
-                                            new Dimension()
-                                        },
-                                        Content = new[]
-                                        {
-                                            new Drawable[]
-                                            {
-                                                metronome = new MetronomeDisplay
-                                                {
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Origin = Anchor.CentreLeft,
-                                                },
-                                                new WaveformComparisonDisplay()
-                                            }
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
                                         },
+                                        new WaveformComparisonDisplay()
                                     }
-                                }
-                            },
+                                },
+                            }
                         },
                         new Drawable[]
                         {
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index b6e0450e23..fe508860e0 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -34,25 +34,21 @@ namespace osu.Game.Screens.Edit.Verify
             InterpretedDifficulty.Default = StarDifficulty.GetDifficultyRating(EditorBeatmap.BeatmapInfo.StarRating);
             InterpretedDifficulty.SetDefault();
 
-            Child = new Container
+            Child = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new GridContainer
+                ColumnDimensions = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    ColumnDimensions = new[]
+                    new Dimension(),
+                    new Dimension(GridSizeMode.Absolute, 250),
+                },
+                Content = new[]
+                {
+                    new Drawable[]
                     {
-                        new Dimension(),
-                        new Dimension(GridSizeMode.Absolute, 250),
+                        IssueList = new IssueList(),
+                        new IssueSettings(),
                     },
-                    Content = new[]
-                    {
-                        new Drawable[]
-                        {
-                            IssueList = new IssueList(),
-                            new IssueSettings(),
-                        },
-                    }
                 }
             };
         }
diff --git a/osu.Game/Screens/Menu/StorageErrorDialog.cs b/osu.Game/Screens/Menu/StorageErrorDialog.cs
index dd43289873..b48046d190 100644
--- a/osu.Game/Screens/Menu/StorageErrorDialog.cs
+++ b/osu.Game/Screens/Menu/StorageErrorDialog.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.IO;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Screens.Menu
 
         public StorageErrorDialog(OsuStorage storage, OsuStorageError error)
         {
-            HeaderText = "osu! storage error";
+            HeaderText = StorageErrorDialogStrings.StorageError;
             Icon = FontAwesome.Solid.ExclamationTriangle;
 
             var buttons = new List<PopupDialogButton>();
@@ -25,13 +26,13 @@ namespace osu.Game.Screens.Menu
             switch (error)
             {
                 case OsuStorageError.NotAccessible:
-                    BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is not accessible. If it is on external storage, please reconnect the device and try again.";
+                    BodyText = StorageErrorDialogStrings.LocationIsNotAccessible(storage.CustomStoragePath);
 
                     buttons.AddRange(new PopupDialogButton[]
                     {
                         new PopupDialogCancelButton
                         {
-                            Text = "Try again",
+                            Text = StorageErrorDialogStrings.TryAgain,
                             Action = () =>
                             {
                                 if (!storage.TryChangeToCustomStorage(out var nextError))
@@ -40,29 +41,29 @@ namespace osu.Game.Screens.Menu
                         },
                         new PopupDialogCancelButton
                         {
-                            Text = "Use default location until restart",
+                            Text = StorageErrorDialogStrings.UseDefaultLocation,
                         },
                         new PopupDialogOkButton
                         {
-                            Text = "Reset to default location",
+                            Text = StorageErrorDialogStrings.ResetToDefaultLocation,
                             Action = storage.ResetCustomStoragePath
                         },
                     });
                     break;
 
                 case OsuStorageError.AccessibleButEmpty:
-                    BodyText = $"The specified osu! data location (\"{storage.CustomStoragePath}\") is empty. If you have moved the files, please close osu! and move them back.";
+                    BodyText = StorageErrorDialogStrings.LocationIsEmpty(storage.CustomStoragePath);
 
                     // Todo: Provide the option to search for the files similar to migration.
                     buttons.AddRange(new PopupDialogButton[]
                     {
                         new PopupDialogCancelButton
                         {
-                            Text = "Start fresh at specified location"
+                            Text = StorageErrorDialogStrings.StartFresh
                         },
                         new PopupDialogOkButton
                         {
-                            Text = "Reset to default location",
+                            Text = StorageErrorDialogStrings.ResetToDefaultLocation,
                             Action = storage.ResetCustomStoragePath
                         },
                     });
diff --git a/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
index dec91d8a37..b0ede8d9b5 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
@@ -26,48 +26,44 @@ namespace osu.Game.Screens.OnlinePlay.Components
         [Resolved(typeof(Room))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
-        private readonly Drawable playlistArea;
+        private readonly GridContainer playlistArea;
         private readonly DrawableRoomPlaylist playlist;
 
         public MatchBeatmapDetailArea()
         {
-            Add(playlistArea = new Container
+            Add(playlistArea = new GridContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Padding = new MarginPadding { Vertical = 10 },
-                Child = new GridContainer
+                Content = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Content = new[]
+                    new Drawable[]
                     {
-                        new Drawable[]
+                        new Container
                         {
-                            new Container
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Bottom = 10 },
+                            Child = playlist = new PlaylistsRoomSettingsPlaylist
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Bottom = 10 },
-                                Child = playlist = new PlaylistsRoomSettingsPlaylist
-                                {
-                                    RelativeSizeAxes = Axes.Both
-                                }
+                                RelativeSizeAxes = Axes.Both
                             }
-                        },
-                        new Drawable[]
-                        {
-                            new RoundedButton
-                            {
-                                Text = "Add new playlist entry",
-                                RelativeSizeAxes = Axes.Both,
-                                Size = Vector2.One,
-                                Action = () => CreateNewItem?.Invoke()
-                            }
-                        },
+                        }
                     },
-                    RowDimensions = new[]
+                    new Drawable[]
                     {
-                        new Dimension(),
-                        new Dimension(GridSizeMode.Absolute, 50),
-                    }
+                        new RoundedButton
+                        {
+                            Text = "Add new playlist entry",
+                            RelativeSizeAxes = Axes.Both,
+                            Size = Vector2.One,
+                            Action = () => CreateNewItem?.Invoke()
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(GridSizeMode.Absolute, 50),
                 }
             });
         }
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 800c73cceb..1b8e2d8be6 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -281,7 +281,13 @@ namespace osu.Game.Screens.OnlinePlay
             }
 
             if (beatmap != null)
-                difficultyIconContainer.Child = new DifficultyIcon(beatmap, ruleset) { Size = new Vector2(icon_height) };
+            {
+                difficultyIconContainer.Child = new DifficultyIcon(beatmap, ruleset, requiredMods)
+                {
+                    Size = new Vector2(icon_height),
+                    TooltipType = DifficultyIconTooltipType.Extended,
+                };
+            }
             else
                 difficultyIconContainer.Clear();
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs
index b473ea82c6..5f77742588 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PillContainer.cs
@@ -40,35 +40,31 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                         Colour = Color4.Black,
                         Alpha = 0.5f
                     },
-                    new Container
+                    new GridContainer
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Horizontal = padding },
-                        Child = new GridContainer
+                        ColumnDimensions = new[]
                         {
-                            AutoSizeAxes = Axes.Both,
-                            ColumnDimensions = new[]
+                            new Dimension(GridSizeMode.AutoSize, minSize: 80 - 2 * padding)
+                        },
+                        Content = new[]
+                        {
+                            new[]
                             {
-                                new Dimension(GridSizeMode.AutoSize, minSize: 80 - 2 * padding)
-                            },
-                            Content = new[]
-                            {
-                                new[]
+                                new Container
                                 {
-                                    new Container
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Padding = new MarginPadding { Bottom = 2 },
+                                    Child = content = new Container
                                     {
                                         AutoSizeAxes = Axes.Both,
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
-                                        Padding = new MarginPadding { Bottom = 2 },
-                                        Child = content = new Container
-                                        {
-                                            AutoSizeAxes = Axes.Both,
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                        }
                                     }
                                 }
                             }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index cf5a8e1985..2460f78c96 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -95,38 +95,34 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                         new Drawable[]
                         {
                             // Playlist items column
-                            new Container
+                            new GridContainer
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding { Right = 5 },
-                                Child = new GridContainer
+                                Content = new[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Content = new[]
+                                    new Drawable[] { new OverlinedPlaylistHeader(), },
+                                    new Drawable[]
                                     {
-                                        new Drawable[] { new OverlinedPlaylistHeader(), },
-                                        new Drawable[]
+                                        new DrawableRoomPlaylist
                                         {
-                                            new DrawableRoomPlaylist
+                                            RelativeSizeAxes = Axes.Both,
+                                            Items = { BindTarget = Room.Playlist },
+                                            SelectedItem = { BindTarget = SelectedItem },
+                                            AllowSelection = true,
+                                            AllowShowingResults = true,
+                                            RequestResults = item =>
                                             {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Items = { BindTarget = Room.Playlist },
-                                                SelectedItem = { BindTarget = SelectedItem },
-                                                AllowSelection = true,
-                                                AllowShowingResults = true,
-                                                RequestResults = item =>
-                                                {
-                                                    Debug.Assert(RoomId.Value != null);
-                                                    ParentScreen?.Push(new PlaylistsResultsScreen(null, RoomId.Value.Value, item, false));
-                                                }
+                                                Debug.Assert(RoomId.Value != null);
+                                                ParentScreen?.Push(new PlaylistsResultsScreen(null, RoomId.Value.Value, item, false));
                                             }
-                                        },
+                                        }
                                     },
-                                    RowDimensions = new[]
-                                    {
-                                        new Dimension(GridSizeMode.AutoSize),
-                                        new Dimension(),
-                                    }
+                                },
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.AutoSize),
+                                    new Dimension(),
                                 }
                             },
                             // Spacer
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 232de53ac3..aa62256348 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Audio.Effects;
 using osu.Game.Configuration;
@@ -550,8 +551,10 @@ namespace osu.Game.Screens.Play
         {
             if (!muteWarningShownOnce.Value)
             {
+                double aggregateVolumeTrack = audioManager.Volume.Value * audioManager.VolumeTrack.Value;
+
                 // Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
-                if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= volume_requirement || audioManager.VolumeTrack.Value <= volume_requirement)
+                if (volumeOverlay?.IsMuted.Value == true || Precision.AlmostBigger(volume_requirement, aggregateVolumeTrack))
                 {
                     notificationOverlay?.Post(new MutedNotification());
                     muteWarningShownOnce.Value = true;
@@ -582,10 +585,8 @@ namespace osu.Game.Screens.Play
 
                     // Check values before resetting, as the user may have only had mute enabled, in which case we might not need to adjust volumes.
                     // Note that we only restore halfway to ensure the user isn't suddenly overloaded by unexpectedly high volume.
-                    if (audioManager.Volume.Value <= volume_requirement)
-                        audioManager.Volume.Value = 0.5f;
-                    if (audioManager.VolumeTrack.Value <= volume_requirement)
-                        audioManager.VolumeTrack.Value = 0.5f;
+                    audioManager.Volume.Value = Math.Max(audioManager.Volume.Value, 0.5);
+                    audioManager.VolumeTrack.Value = Math.Max(audioManager.VolumeTrack.Value, 0.5);
 
                     return true;
                 };
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index f7ae3eb62b..f4cf2da364 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Play
                 Scores = { BindTarget = LeaderboardScores }
             };
 
-        protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
+        protected override bool ShouldExitOnTokenRetrievalFailure(Exception exception) => false;
 
         protected override Task ImportScore(Score score)
         {
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index c8e84f1961..ecb507f382 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -17,6 +17,7 @@ using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Online.Solo;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -42,6 +43,10 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private SessionStatics statics { get; set; }
 
+        [Resolved(canBeNull: true)]
+        [CanBeNull]
+        private SoloStatisticsWatcher soloStatisticsWatcher { get; set; }
+
         private readonly object scoreSubmissionLock = new object();
         private TaskCompletionSource<bool> scoreSubmissionSource;
 
@@ -113,7 +118,7 @@ namespace osu.Game.Screens.Play
                 token = r.ID;
                 tcs.SetResult(true);
             };
-            req.Failure += handleTokenFailure;
+            req.Failure += ex => handleTokenFailure(ex, displayNotification: true);
 
             api.Queue(req);
 
@@ -123,40 +128,49 @@ namespace osu.Game.Screens.Play
 
             return true;
 
-            void handleTokenFailure(Exception exception)
+            void handleTokenFailure(Exception exception, bool displayNotification = false)
             {
                 tcs.SetResult(false);
 
-                if (HandleTokenRetrievalFailure(exception))
+                bool shouldExit = ShouldExitOnTokenRetrievalFailure(exception);
+
+                if (displayNotification || shouldExit)
                 {
+                    string whatWillHappen = shouldExit
+                        ? "Play in this state is not permitted."
+                        : "Your score will not be submitted.";
+
                     if (string.IsNullOrEmpty(exception.Message))
-                        Logger.Error(exception, "Failed to retrieve a score submission token.");
+                        Logger.Error(exception, $"Failed to retrieve a score submission token.\n\n{whatWillHappen}");
                     else
                     {
                         switch (exception.Message)
                         {
-                            case "expired token":
-                                Logger.Log("Score submission failed because your system clock is set incorrectly. Please check your system time, date and timezone.", level: LogLevel.Important);
+                            case @"missing token header":
+                            case @"invalid client hash":
+                            case @"invalid verification hash":
+                                Logger.Log($"Please ensure that you are using the latest version of the official game releases.\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;
 
                             default:
-                                Logger.Log($"You are not able to submit a score: {exception.Message}", level: LogLevel.Important);
+                                Logger.Log($"{whatWillHappen} {exception.Message}", level: LogLevel.Important);
                                 break;
                         }
                     }
+                }
 
+                if (shouldExit)
+                {
                     Schedule(() =>
                     {
                         ValidForResume = false;
                         this.Exit();
                     });
                 }
-                else
-                {
-                    // Gameplay is allowed to continue, but we still should keep track of the error.
-                    // In the future, this should be visible to the user in some way.
-                    Logger.Log($"Score submission token retrieval failed ({exception.Message})");
-                }
             }
         }
 
@@ -165,7 +179,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="exception">The error causing the failure.</param>
         /// <returns>Whether gameplay should be immediately exited as a result. Returning false allows the gameplay session to continue. Defaults to true.</returns>
-        protected virtual bool HandleTokenRetrievalFailure(Exception exception) => true;
+        protected virtual bool ShouldExitOnTokenRetrievalFailure(Exception exception) => true;
 
         protected override async Task PrepareScoreForResultsAsync(Score score)
         {
@@ -175,6 +189,7 @@ namespace osu.Game.Screens.Play
 
             await submitScore(score).ConfigureAwait(false);
             spectatorClient.EndPlaying(GameplayState);
+            soloStatisticsWatcher?.RegisterForStatisticsUpdateAfter(score.ScoreInfo);
         }
 
         [Resolved]
@@ -225,7 +240,7 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// Construct a request to be used for retrieval of the score token.
-        /// Can return null, at which point <see cref="HandleTokenRetrievalFailure"/> will be fired.
+        /// Can return null, at which point <see cref="ShouldExitOnTokenRetrievalFailure"/> will be fired.
         /// </summary>
         [CanBeNull]
         protected abstract APIRequest<APIScoreToken> CreateTokenRequest();
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 195cd03e9b..cfb6465e62 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -150,44 +150,40 @@ namespace osu.Game.Screens.Ranking.Contracted
                     },
                     new Drawable[]
                     {
-                        new Container
+                        new GridContainer
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Vertical = 5 },
-                            Child = new GridContainer
+                            Content = new[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Content = new[]
+                                new Drawable[]
                                 {
-                                    new Drawable[]
+                                    new OsuSpriteText
                                     {
-                                        new OsuSpriteText
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Current = scoreManager.GetBindableTotalScoreString(score),
+                                        Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, fixedWidth: true),
+                                        Spacing = new Vector2(-1, 0)
+                                    },
+                                },
+                                new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding { Top = 2 },
+                                        Child = new DrawableRank(score.Rank)
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            Current = scoreManager.GetBindableTotalScoreString(score),
-                                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, fixedWidth: true),
-                                            Spacing = new Vector2(-1, 0)
-                                        },
-                                    },
-                                    new Drawable[]
-                                    {
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding { Top = 2 },
-                                            Child = new DrawableRank(score.Rank)
-                                            {
-                                                Anchor = Anchor.Centre,
-                                                Origin = Anchor.Centre,
-                                            }
                                         }
-                                    },
+                                    }
                                 },
-                                RowDimensions = new[]
-                                {
-                                    new Dimension(GridSizeMode.AutoSize),
-                                }
+                            },
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
                             }
                         }
                     },
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index d209c305fa..83b02a0951 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// <summary>
         /// Relative width of the rank circles.
         /// </summary>
-        public const float RANK_CIRCLE_RADIUS = 0.06f;
+        public const float RANK_CIRCLE_RADIUS = 0.05f;
 
         /// <summary>
         /// Relative width of the circle showing the accuracy.
@@ -74,12 +74,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// <summary>
         /// SS is displayed as a 1% region, otherwise it would be invisible.
         /// </summary>
-        private const double virtual_ss_percentage = 0.01;
+        public const double VIRTUAL_SS_PERCENTAGE = 0.01;
 
         /// <summary>
-        /// The width of a <see cref="RankNotch"/> in terms of accuracy.
+        /// The width of spacing in terms of accuracy between the grade circles.
         /// </summary>
-        public const double NOTCH_WIDTH_PERCENTAGE = 1.0 / 360;
+        public const double GRADE_SPACING_PERCENTAGE = 2.0 / 360;
 
         /// <summary>
         /// The easing for the circle filling transforms.
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private readonly ScoreInfo score;
 
         private CircularProgress accuracyCircle;
-        private CircularProgress innerMask;
+        private GradedCircles gradedCircles;
         private Container<RankBadge> badges;
         private RankText rankText;
 
@@ -158,82 +158,16 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#7CF6FF"), Color4Extensions.FromHex("#BAFFA9")),
                     InnerRadius = accuracy_circle_radius,
                 },
-                new BufferedContainer
+                new Container
                 {
-                    Name = "Graded circles",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     Size = new Vector2(0.8f),
-                    Padding = new MarginPadding(2),
-                    Children = new Drawable[]
+                    Padding = new MarginPadding(2.5f),
+                    Child = gradedCircles = new GradedCircles(accuracyC, accuracyB, accuracyA, accuracyS, accuracyX)
                     {
-                        new CircularProgress
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.ForRank(ScoreRank.X),
-                            InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracyX }
-                        },
-                        new CircularProgress
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.ForRank(ScoreRank.S),
-                            InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracyX - virtual_ss_percentage }
-                        },
-                        new CircularProgress
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.ForRank(ScoreRank.A),
-                            InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracyS }
-                        },
-                        new CircularProgress
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.ForRank(ScoreRank.B),
-                            InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracyA }
-                        },
-                        new CircularProgress
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.ForRank(ScoreRank.C),
-                            InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracyB }
-                        },
-                        new CircularProgress
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.ForRank(ScoreRank.D),
-                            InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracyC }
-                        },
-                        new RankNotch((float)accuracyX),
-                        new RankNotch((float)(accuracyX - virtual_ss_percentage)),
-                        new RankNotch((float)accuracyS),
-                        new RankNotch((float)accuracyA),
-                        new RankNotch((float)accuracyB),
-                        new RankNotch((float)accuracyC),
-                        new BufferedContainer
-                        {
-                            Name = "Graded circle mask",
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding(1),
-                            Blending = new BlendingParameters
-                            {
-                                Source = BlendingType.DstColor,
-                                Destination = BlendingType.OneMinusSrcColor,
-                                SourceAlpha = BlendingType.One,
-                                DestinationAlpha = BlendingType.SrcAlpha
-                            },
-                            Child = innerMask = new CircularProgress
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                InnerRadius = RANK_CIRCLE_RADIUS - 0.02f,
-                            }
-                        }
+                        RelativeSizeAxes = Axes.Both
                     }
                 },
                 badges = new Container<RankBadge>
@@ -248,7 +182,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                         new RankBadge(accuracyB, Interpolation.Lerp(accuracyB, accuracyA, 0.5), getRank(ScoreRank.B)),
                         // The S and A badges are moved down slightly to prevent collision with the SS badge.
                         new RankBadge(accuracyA, Interpolation.Lerp(accuracyA, accuracyS, 0.25), getRank(ScoreRank.A)),
-                        new RankBadge(accuracyS, Interpolation.Lerp(accuracyS, (accuracyX - virtual_ss_percentage), 0.25), getRank(ScoreRank.S)),
+                        new RankBadge(accuracyS, Interpolation.Lerp(accuracyS, (accuracyX - VIRTUAL_SS_PERCENTAGE), 0.25), getRank(ScoreRank.S)),
                         new RankBadge(accuracyX, accuracyX, getRank(ScoreRank.X)),
                     }
                 },
@@ -296,7 +230,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
             }
 
             using (BeginDelayedSequence(RANK_CIRCLE_TRANSFORM_DELAY))
-                innerMask.FillTo(1f, RANK_CIRCLE_TRANSFORM_DURATION, ACCURACY_TRANSFORM_EASING);
+                gradedCircles.TransformTo(nameof(GradedCircles.Progress), 1.0, RANK_CIRCLE_TRANSFORM_DURATION, ACCURACY_TRANSFORM_EASING);
 
             using (BeginDelayedSequence(ACCURACY_TRANSFORM_DELAY))
             {
@@ -313,10 +247,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 // to prevent ambiguity on what grade it's pointing at.
                 foreach (double p in notchPercentages)
                 {
-                    if (Precision.AlmostEquals(p, targetAccuracy, NOTCH_WIDTH_PERCENTAGE / 2))
+                    if (Precision.AlmostEquals(p, targetAccuracy, GRADE_SPACING_PERCENTAGE / 2))
                     {
                         int tippingDirection = targetAccuracy - p >= 0 ? 1 : -1; // We "round up" here to match rank criteria
-                        targetAccuracy = p + tippingDirection * (NOTCH_WIDTH_PERCENTAGE / 2);
+                        targetAccuracy = p + tippingDirection * (GRADE_SPACING_PERCENTAGE / 2);
                         break;
                     }
                 }
@@ -325,7 +259,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 if (score.Rank == ScoreRank.X || score.Rank == ScoreRank.XH)
                     targetAccuracy = 1;
                 else
-                    targetAccuracy = Math.Min(accuracyX - virtual_ss_percentage - NOTCH_WIDTH_PERCENTAGE / 2, targetAccuracy);
+                    targetAccuracy = Math.Min(accuracyX - VIRTUAL_SS_PERCENTAGE - GRADE_SPACING_PERCENTAGE / 2, targetAccuracy);
 
                 // The accuracy circle gauge visually fills up a bit too much.
                 // This wouldn't normally matter but we want it to align properly with the inner graded circle in the above cases.
@@ -365,7 +299,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                             continue;
 
                         using (BeginDelayedSequence(
-                                   inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(accuracyX - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION))
+                                   inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(accuracyX - VIRTUAL_SS_PERCENTAGE, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION))
                         {
                             badge.Appear();
 
@@ -425,7 +359,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                                 .FadeOut(800, Easing.Out);
 
                             accuracyCircle
-                                .FillTo(accuracyS - NOTCH_WIDTH_PERCENTAGE / 2 - visual_alignment_offset, 70, Easing.OutQuint);
+                                .FillTo(accuracyS - GRADE_SPACING_PERCENTAGE / 2 - visual_alignment_offset, 70, Easing.OutQuint);
 
                             badges.Single(b => b.Rank == getRank(ScoreRank.S))
                                   .FadeOut(70, Easing.OutQuint);
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/GradedCircles.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/GradedCircles.cs
new file mode 100644
index 0000000000..33b71c53a7
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/GradedCircles.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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Ranking.Expanded.Accuracy
+{
+    public partial class GradedCircles : CompositeDrawable
+    {
+        private double progress;
+
+        public double Progress
+        {
+            get => progress;
+            set
+            {
+                progress = value;
+
+                foreach (var circle in circles)
+                    circle.RevealProgress = value;
+            }
+        }
+
+        private readonly Container<GradedCircle> circles;
+
+        public GradedCircles(double accuracyC, double accuracyB, double accuracyA, double accuracyS, double accuracyX)
+        {
+            InternalChild = circles = new Container<GradedCircle>
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    new GradedCircle(0.0, accuracyC)
+                    {
+                        Colour = OsuColour.ForRank(ScoreRank.D),
+                    },
+                    new GradedCircle(accuracyC, accuracyB)
+                    {
+                        Colour = OsuColour.ForRank(ScoreRank.C),
+                    },
+                    new GradedCircle(accuracyB, accuracyA)
+                    {
+                        Colour = OsuColour.ForRank(ScoreRank.B),
+                    },
+                    new GradedCircle(accuracyA, accuracyS)
+                    {
+                        Colour = OsuColour.ForRank(ScoreRank.A),
+                    },
+                    new GradedCircle(accuracyS, accuracyX - AccuracyCircle.VIRTUAL_SS_PERCENTAGE)
+                    {
+                        Colour = OsuColour.ForRank(ScoreRank.S),
+                    },
+                    new GradedCircle(accuracyX - AccuracyCircle.VIRTUAL_SS_PERCENTAGE, 1.0)
+                    {
+                        Colour = OsuColour.ForRank(ScoreRank.X)
+                    }
+                }
+            };
+        }
+
+        private partial class GradedCircle : CircularProgress
+        {
+            public double RevealProgress
+            {
+                set => Current.Value = Math.Clamp(value, startProgress, endProgress) - startProgress;
+            }
+
+            private readonly double startProgress;
+            private readonly double endProgress;
+
+            public GradedCircle(double startProgress, double endProgress)
+            {
+                this.startProgress = startProgress + AccuracyCircle.GRADE_SPACING_PERCENTAGE * 0.5;
+                this.endProgress = endProgress - AccuracyCircle.GRADE_SPACING_PERCENTAGE * 0.5;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                RelativeSizeAxes = Axes.Both;
+                InnerRadius = AccuracyCircle.RANK_CIRCLE_RADIUS;
+                Rotation = (float)this.startProgress * 360;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
deleted file mode 100644
index 244acbe8b1..0000000000
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
+++ /dev/null
@@ -1,49 +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;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osuTK;
-
-namespace osu.Game.Screens.Ranking.Expanded.Accuracy
-{
-    /// <summary>
-    /// A solid "notch" of the <see cref="AccuracyCircle"/> that appears at the ends of the rank circles to add separation.
-    /// </summary>
-    public partial class RankNotch : CompositeDrawable
-    {
-        private readonly float position;
-
-        public RankNotch(float position)
-        {
-            this.position = position;
-
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Rotation = position * 360f,
-                Child = new Box
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.Y,
-                    Height = AccuracyCircle.RANK_CIRCLE_RADIUS,
-                    Width = (float)AccuracyCircle.NOTCH_WIDTH_PERCENTAGE * 360f,
-                    Colour = OsuColour.Gray(0.3f),
-                    EdgeSmoothness = new Vector2(1f)
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 82dade40eb..69cfbed8f2 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -41,9 +41,6 @@ namespace osu.Game.Screens.Ranking
 
         public override bool? AllowGlobalTrackControl => true;
 
-        // Temporary for now to stop dual transitions. Should respect the current toolbar mode, but there's no way to do so currently.
-        public override bool HideOverlaysOnEnter => true;
-
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
         [CanBeNull]
diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 22d631e137..866440bbd6 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -31,10 +31,7 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
-        [Resolved]
-        private SoloStatisticsWatcher soloStatisticsWatcher { get; set; } = null!;
-
-        private IDisposable? statisticsSubscription;
+        private IBindable<SoloStatisticsUpdate?> latestUpdate = null!;
         private readonly Bindable<SoloStatisticsUpdate?> statisticsUpdate = new Bindable<SoloStatisticsUpdate?>();
 
         public SoloResultsScreen(ScoreInfo score, bool allowRetry)
@@ -42,14 +39,20 @@ namespace osu.Game.Screens.Ranking
         {
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load(SoloStatisticsWatcher? soloStatisticsWatcher)
         {
-            base.LoadComplete();
+            if (ShowUserStatistics && soloStatisticsWatcher != null)
+            {
+                Debug.Assert(Score != null);
 
-            Debug.Assert(Score != null);
-
-            if (ShowUserStatistics)
-                statisticsSubscription = soloStatisticsWatcher.RegisterForStatisticsUpdateAfter(Score, update => statisticsUpdate.Value = update);
+                latestUpdate = soloStatisticsWatcher.LatestUpdate.GetBoundCopy();
+                latestUpdate.BindValueChanged(update =>
+                {
+                    if (update.NewValue?.Score.MatchesOnlineID(Score) == true)
+                        statisticsUpdate.Value = update.NewValue;
+                });
+            }
         }
 
         protected override StatisticsPanel CreateStatisticsPanel()
@@ -84,7 +87,6 @@ namespace osu.Game.Screens.Ranking
             base.Dispose(isDisposing);
 
             getScoreRequest?.Cancel();
-            statisticsSubscription?.Dispose();
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index dec2c1c1de..2bb60716ff 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -75,99 +75,92 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Both,
                     Colour = Colour4.Black.Opacity(0.3f),
                 },
-                new Container
+                new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
-                    Children = new Drawable[]
+                    RowDimensions = new[]
                     {
-                        new GridContainer
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension()
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            RowDimensions = new[]
+                            new FillFlowContainer
                             {
-                                new Dimension(GridSizeMode.AutoSize),
-                                new Dimension()
-                            },
-                            Content = new[]
-                            {
-                                new Drawable[]
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Horizontal,
+                                Children = new Drawable[]
                                 {
                                     new FillFlowContainer
                                     {
                                         RelativeSizeAxes = Axes.X,
                                         AutoSizeAxes = Axes.Y,
-                                        Direction = FillDirection.Horizontal,
-                                        Children = new Drawable[]
+                                        Width = 0.5f,
+                                        Spacing = new Vector2(spacing),
+                                        Padding = new MarginPadding { Right = spacing / 2 },
+                                        Children = new[]
                                         {
-                                            new FillFlowContainer
+                                            new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
                                             {
                                                 RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Width = 0.5f,
-                                                Spacing = new Vector2(spacing),
-                                                Padding = new MarginPadding { Right = spacing / 2 },
-                                                Children = new[]
+                                                Height = 134,
+                                                Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
+                                                Child = ratingsDisplay = new UserRatings
                                                 {
-                                                    new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
-                                                    {
-                                                        RelativeSizeAxes = Axes.X,
-                                                        Height = 134,
-                                                        Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
-                                                        Child = ratingsDisplay = new UserRatings
-                                                        {
-                                                            RelativeSizeAxes = Axes.Both,
-                                                        },
-                                                    }),
+                                                    RelativeSizeAxes = Axes.Both,
                                                 },
-                                            },
-                                            new OsuScrollContainer
+                                            }),
+                                        },
+                                    },
+                                    new OsuScrollContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = 250,
+                                        Width = 0.5f,
+                                        ScrollbarVisible = false,
+                                        Padding = new MarginPadding { Left = spacing / 2 },
+                                        Child = new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            LayoutDuration = transition_duration,
+                                            LayoutEasing = Easing.OutQuad,
+                                            Children = new[]
                                             {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = 250,
-                                                Width = 0.5f,
-                                                ScrollbarVisible = false,
-                                                Padding = new MarginPadding { Left = spacing / 2 },
-                                                Child = new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    LayoutDuration = transition_duration,
-                                                    LayoutEasing = Easing.OutQuad,
-                                                    Children = new[]
-                                                    {
-                                                        description = new MetadataSectionDescription(query => songSelect?.Search(query)),
-                                                        source = new MetadataSectionSource(query => songSelect?.Search(query)),
-                                                        tags = new MetadataSectionTags(query => songSelect?.Search(query)),
-                                                    },
-                                                },
+                                                description = new MetadataSectionDescription(query => songSelect?.Search(query)),
+                                                source = new MetadataSectionSource(query => songSelect?.Search(query)),
+                                                tags = new MetadataSectionTags(query => songSelect?.Search(query)),
                                             },
                                         },
                                     },
                                 },
-                                new Drawable[]
+                            },
+                        },
+                        new Drawable[]
+                        {
+                            failRetryContainer = new OnlineViewContainer("Sign in to view more details")
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
                                 {
-                                    failRetryContainer = new OnlineViewContainer("Sign in to view more details")
+                                    new OsuSpriteText
+                                    {
+                                        Text = BeatmapsetsStrings.ShowInfoPointsOfFailure,
+                                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                    },
+                                    failRetryGraph = new FailRetryGraph
                                     {
                                         RelativeSizeAxes = Axes.Both,
-                                        Children = new Drawable[]
-                                        {
-                                            new OsuSpriteText
-                                            {
-                                                Text = BeatmapsetsStrings.ShowInfoPointsOfFailure,
-                                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
-                                            },
-                                            failRetryGraph = new FailRetryGraph
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Padding = new MarginPadding { Top = 14 + spacing / 2 },
-                                            },
-                                        },
+                                        Padding = new MarginPadding { Top = 14 + spacing / 2 },
                                     },
-                                }
-                            }
-                        },
-                    },
+                                },
+                            },
+                        }
+                    }
                 },
                 loading = new LoadingLayer(true)
             };
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index c69cd6ead6..3cab4b67b6 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -31,6 +31,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Graphics.Containers;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Select
 {
@@ -405,9 +406,9 @@ namespace osu.Game.Screens.Select
                 foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                     rate = mod.ApplyToRate(0, rate);
 
-                int bpmMax = (int)Math.Round(Math.Round(beatmap.ControlPointInfo.BPMMaximum) * rate);
-                int bpmMin = (int)Math.Round(Math.Round(beatmap.ControlPointInfo.BPMMinimum) * rate);
-                int mostCommonBPM = (int)Math.Round(Math.Round(60000 / beatmap.GetMostCommonBeatLength()) * rate);
+                int bpmMax = FormatUtils.RoundBPM(beatmap.ControlPointInfo.BPMMaximum, rate);
+                int bpmMin = FormatUtils.RoundBPM(beatmap.ControlPointInfo.BPMMinimum, rate);
+                int mostCommonBPM = FormatUtils.RoundBPM(60000 / beatmap.GetMostCommonBeatLength(), rate);
 
                 string labelText = bpmMin == bpmMax
                     ? $"{bpmMin}"
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 1ca4b371c3..43461a48bb 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.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;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
@@ -64,6 +65,7 @@ namespace osu.Game.Screens.Select.Carousel
             match &= !criteria.CircleSize.HasFilter || criteria.CircleSize.IsInRange(BeatmapInfo.Difficulty.CircleSize);
             match &= !criteria.OverallDifficulty.HasFilter || criteria.OverallDifficulty.IsInRange(BeatmapInfo.Difficulty.OverallDifficulty);
             match &= !criteria.Length.HasFilter || criteria.Length.IsInRange(BeatmapInfo.Length);
+            match &= !criteria.LastPlayed.HasFilter || criteria.LastPlayed.IsInRange(BeatmapInfo.LastPlayed ?? DateTimeOffset.MinValue);
             match &= !criteria.BPM.HasFilter || criteria.BPM.IsInRange(BeatmapInfo.BPM);
 
             match &= !criteria.BeatDivisor.HasFilter || criteria.BeatDivisor.IsInRange(BeatmapInfo.BeatDivisor);
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 6d2e938fb7..43c9c621e8 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Select.Filter;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -67,19 +68,19 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 default:
                 case SortMode.Artist:
-                    comparison = string.Compare(BeatmapSet.Metadata.Artist, otherSet.BeatmapSet.Metadata.Artist, StringComparison.OrdinalIgnoreCase);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Artist, otherSet.BeatmapSet.Metadata.Artist);
                     break;
 
                 case SortMode.Title:
-                    comparison = string.Compare(BeatmapSet.Metadata.Title, otherSet.BeatmapSet.Metadata.Title, StringComparison.OrdinalIgnoreCase);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Title, otherSet.BeatmapSet.Metadata.Title);
                     break;
 
                 case SortMode.Author:
-                    comparison = string.Compare(BeatmapSet.Metadata.Author.Username, otherSet.BeatmapSet.Metadata.Author.Username, StringComparison.OrdinalIgnoreCase);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Author.Username, otherSet.BeatmapSet.Metadata.Author.Username);
                     break;
 
                 case SortMode.Source:
-                    comparison = string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source);
                     break;
 
                 case SortMode.DateAdded:
@@ -91,19 +92,19 @@ namespace osu.Game.Screens.Select.Carousel
                     break;
 
                 case SortMode.LastPlayed:
-                    comparison = -compareUsingAggregateMax(otherSet, b => (b.LastPlayed ?? DateTimeOffset.MinValue).ToUnixTimeSeconds());
+                    comparison = -compareUsingAggregateMax(otherSet, static b => (b.LastPlayed ?? DateTimeOffset.MinValue).ToUnixTimeSeconds());
                     break;
 
                 case SortMode.BPM:
-                    comparison = compareUsingAggregateMax(otherSet, b => b.BPM);
+                    comparison = compareUsingAggregateMax(otherSet, static b => b.BPM);
                     break;
 
                 case SortMode.Length:
-                    comparison = compareUsingAggregateMax(otherSet, b => b.Length);
+                    comparison = compareUsingAggregateMax(otherSet, static b => b.Length);
                     break;
 
                 case SortMode.Difficulty:
-                    comparison = compareUsingAggregateMax(otherSet, b => b.StarRating);
+                    comparison = compareUsingAggregateMax(otherSet, static b => b.StarRating);
                     break;
 
                 case SortMode.DateSubmitted:
@@ -127,12 +128,40 @@ namespace osu.Game.Screens.Select.Carousel
         /// <summary>
         /// All beatmaps which are not filtered and valid for display.
         /// </summary>
-        protected IEnumerable<BeatmapInfo> ValidBeatmaps => Beatmaps.Where(b => !b.Filtered.Value || b.State.Value == CarouselItemState.Selected).Select(b => b.BeatmapInfo);
+        protected IEnumerable<BeatmapInfo> ValidBeatmaps
+        {
+            get
+            {
+                foreach (var item in Items) // iterating over Items directly to not allocate 2 enumerators
+                {
+                    if (item is CarouselBeatmap b && (!b.Filtered.Value || b.State.Value == CarouselItemState.Selected))
+                        yield return b.BeatmapInfo;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Whether there are available beatmaps which are not filtered and valid for display.
+        /// Cheaper alternative to <see cref="ValidBeatmaps"/>.Any()
+        /// </summary>
+        public bool HasValidBeatmaps
+        {
+            get
+            {
+                foreach (var item in Items) // iterating over Items directly to not allocate 2 enumerators
+                {
+                    if (item is CarouselBeatmap b && (!b.Filtered.Value || b.State.Value == CarouselItemState.Selected))
+                        return true;
+                }
+
+                return false;
+            }
+        }
 
         private int compareUsingAggregateMax(CarouselBeatmapSet other, Func<BeatmapInfo, double> func)
         {
-            bool ourBeatmaps = ValidBeatmaps.Any();
-            bool otherBeatmaps = other.ValidBeatmaps.Any();
+            bool ourBeatmaps = HasValidBeatmaps;
+            bool otherBeatmaps = other.HasValidBeatmaps;
 
             if (!ourBeatmaps && !otherBeatmaps) return 0;
             if (!ourBeatmaps) return -1;
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index b2ca117cec..62d694976f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Extensions.ListExtensions;
+using osu.Framework.Lists;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -12,7 +14,7 @@ namespace osu.Game.Screens.Select.Carousel
     {
         public override DrawableCarouselItem? CreateDrawableRepresentation() => null;
 
-        public IReadOnlyList<CarouselItem> Items => items;
+        public SlimReadOnlyListWrapper<CarouselItem> Items => items.AsSlimReadOnly();
 
         public int TotalItemsNotFiltered { get; private set; }
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index baf0a14062..01e58d4ab2 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Select.Carousel
                     {
                         difficultyIcon = new DifficultyIcon(beatmapInfo)
                         {
-                            ShowTooltip = false,
+                            TooltipType = DifficultyIconTooltipType.None,
                             Scale = new Vector2(1.8f),
                         },
                         new FillFlowContainer
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index a7c8e7d093..46083f7c88 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Screens.Select
         public OptionalRange<double> BPM;
         public OptionalRange<int> BeatDivisor;
         public OptionalRange<BeatmapOnlineStatus> OnlineStatus;
+        public OptionalRange<DateTimeOffset> LastPlayed;
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
         public OptionalTextFilter Title;
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 0d8905347b..2c4077dacf 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -61,6 +61,10 @@ namespace osu.Game.Screens.Select
                 case "length":
                     return tryUpdateLengthRange(criteria, op, value);
 
+                case "played":
+                case "lastplayed":
+                    return tryUpdateDateAgoRange(ref criteria.LastPlayed, op, value);
+
                 case "divisor":
                     return TryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
@@ -68,6 +72,8 @@ namespace osu.Game.Screens.Select
                     return TryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value, tryParseEnum);
 
                 case "creator":
+                case "author":
+                case "mapper":
                     return TryUpdateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
@@ -374,5 +380,107 @@ namespace osu.Game.Screens.Select
 
             return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
         }
+
+        /// <summary>
+        /// This function is intended for parsing "days / months / years ago" type filters.
+        /// </summary>
+        private static bool tryUpdateDateAgoRange(ref FilterCriteria.OptionalRange<DateTimeOffset> dateRange, Operator op, string val)
+        {
+            switch (op)
+            {
+                case Operator.Equal:
+                    // an equality filter is difficult to define for support here.
+                    // if "3 months 2 days ago" means a single concrete time instant, such a filter is basically useless.
+                    // if it means a range of 24 hours, then that is annoying to write and also comes with its own implications
+                    // (does it mean "time instant 3 months 2 days ago, within 12 hours of tolerance either direction"?
+                    // does it mean "the full calendar day, from midnight to midnight, 3 months 2 days ago"?)
+                    // as such, for simplicity, just refuse to support this.
+                    return false;
+
+                // for the remaining operators, since the value provided to this function is an "ago" type value
+                // (as in, referring to some amount of time back),
+                // we'll want to flip the operator, such that `>5d` means "more than five days ago", as in "*before* five days ago",
+                // as intended by the user.
+                case Operator.Less:
+                    op = Operator.Greater;
+                    break;
+
+                case Operator.LessOrEqual:
+                    op = Operator.GreaterOrEqual;
+                    break;
+
+                case Operator.Greater:
+                    op = Operator.Less;
+                    break;
+
+                case Operator.GreaterOrEqual:
+                    op = Operator.LessOrEqual;
+                    break;
+            }
+
+            GroupCollection? match = null;
+
+            match ??= tryMatchRegex(val, @"^((?<years>\d+)y)?((?<months>\d+)M)?((?<days>\d+(\.\d+)?)d)?((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$");
+            match ??= tryMatchRegex(val, @"^(?<days>\d+(\.\d+)?)$");
+
+            if (match == null)
+                return false;
+
+            DateTimeOffset? dateTimeOffset = null;
+            DateTimeOffset now = DateTimeOffset.Now;
+
+            try
+            {
+                List<string> keys = new List<string> { @"seconds", @"minutes", @"hours", @"days", @"months", @"years" };
+
+                foreach (string key in keys)
+                {
+                    if (!match.TryGetValue(key, out var group) || !group.Success)
+                        continue;
+
+                    if (group.Success)
+                    {
+                        if (!tryParseDoubleWithPoint(group.Value, out double length))
+                            return false;
+
+                        switch (key)
+                        {
+                            case @"seconds":
+                                dateTimeOffset = (dateTimeOffset ?? now).AddSeconds(-length);
+                                break;
+
+                            case @"minutes":
+                                dateTimeOffset = (dateTimeOffset ?? now).AddMinutes(-length);
+                                break;
+
+                            case @"hours":
+                                dateTimeOffset = (dateTimeOffset ?? now).AddHours(-length);
+                                break;
+
+                            case @"days":
+                                dateTimeOffset = (dateTimeOffset ?? now).AddDays(-length);
+                                break;
+
+                            case @"months":
+                                dateTimeOffset = (dateTimeOffset ?? now).AddMonths(-(int)length);
+                                break;
+
+                            case @"years":
+                                dateTimeOffset = (dateTimeOffset ?? now).AddYears(-(int)length);
+                                break;
+                        }
+                    }
+                }
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                dateTimeOffset = DateTimeOffset.MinValue.AddMilliseconds(1);
+            }
+
+            if (!dateTimeOffset.HasValue)
+                return false;
+
+            return tryUpdateCriteriaRange(ref dateRange, op, dateTimeOffset.Value);
+        }
     }
 }
diff --git a/osu.Game/Tests/Visual/OsuGameTestScene.cs b/osu.Game/Tests/Visual/OsuGameTestScene.cs
index 6069fe4fb0..b86273b4a3 100644
--- a/osu.Game/Tests/Visual/OsuGameTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuGameTestScene.cs
@@ -153,6 +153,8 @@ namespace osu.Game.Tests.Visual
 
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
+            public new Storage Storage => base.Storage;
+
             public new SpectatorClient SpectatorClient => base.SpectatorClient;
 
             // if we don't apply these changes, when running under nUnit the version that gets populated is that of nUnit.
@@ -166,7 +168,7 @@ namespace osu.Game.Tests.Visual
             public TestOsuGame(Storage storage, IAPIProvider api, string[] args = null)
                 : base(args)
             {
-                Storage = storage;
+                base.Storage = storage;
                 API = api;
             }
 
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index d9cae6b03b..579a1934e0 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual
             PauseOnFocusLost = pauseOnFocusLost;
         }
 
-        protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
+        protected override bool ShouldExitOnTokenRetrievalFailure(Exception exception) => false;
 
         protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
diff --git a/osu.Game/Users/UserRankPanel.cs b/osu.Game/Users/UserRankPanel.cs
index c780e5eed1..21ed754b39 100644
--- a/osu.Game/Users/UserRankPanel.cs
+++ b/osu.Game/Users/UserRankPanel.cs
@@ -169,6 +169,9 @@ namespace osu.Game.Users
                                 {
                                     Title = UsersStrings.ShowRankGlobalSimple,
                                     Margin = new MarginPadding { Bottom = padding }
+                                    // TODO: implement highest rank tooltip
+                                    // `RankHighest` resides in `APIUser`, but `api.LocalUser` doesn't update
+                                    // maybe move to `UserStatistics` in api, so `SoloStatisticsWatcher` can update the value
                                 },
                                 countryRankDisplay = new ProfileValueDisplay(true)
                                 {
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 799dc75ca9..cccad3711c 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -49,5 +49,15 @@ namespace osu.Game.Utils
 
             return precision;
         }
+
+        /// <summary>
+        /// Applies rounding to the given BPM value.
+        /// </summary>
+        /// <remarks>
+        /// Double-rounding is applied intentionally (see https://github.com/ppy/osu/pull/18345#issue-1243311382 for rationale).
+        /// </remarks>
+        /// <param name="baseBpm">The base BPM to round.</param>
+        /// <param name="rate">Rate adjustment, if applicable.</param>
+        public static int RoundBPM(double baseBpm, double rate = 1) => (int)Math.Round(Math.Round(baseBpm) * rate);
     }
 }
diff --git a/osu.Game/Utils/OrdinalSortByCaseStringComparer.cs b/osu.Game/Utils/OrdinalSortByCaseStringComparer.cs
new file mode 100644
index 0000000000..6c1532eef5
--- /dev/null
+++ b/osu.Game/Utils/OrdinalSortByCaseStringComparer.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;
+using System.Collections.Generic;
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// This string comparer is something of a cross-over between <see cref="StringComparer.Ordinal"/> and <see cref="StringComparer.OrdinalIgnoreCase"/>.
+    /// <see cref="StringComparer.OrdinalIgnoreCase"/> is used first, but <see cref="StringComparer.Ordinal"/> is used as a tie-breaker.
+    /// </summary>
+    /// <remarks>
+    /// This comparer's behaviour somewhat emulates <see cref="StringComparer.InvariantCulture"/>,
+    /// but non-ordinal comparers - both culture-aware and culture-invariant - have huge performance overheads due to i18n factors (up to 5x slower).
+    /// </remarks>
+    /// <example>
+    /// Given the following strings to sort: <c>[A, B, C, D, a, b, c, d, A]</c> and a stable sorting algorithm:
+    /// <list type="bullet">
+    /// <item>
+    /// <see cref="StringComparer.Ordinal"/> would return <c>[A, A, B, C, D, a, b, c, d]</c>.
+    /// This is undesirable as letters are interleaved.
+    /// </item>
+    /// <item>
+    /// <see cref="StringComparer.OrdinalIgnoreCase"/> would return <c>[A, a, A, B, b, C, c, D, d]</c>.
+    /// Different letters are not interleaved, but because case is ignored, the As are left in arbitrary order.
+    /// </item>
+    /// </list>
+    /// <item>
+    /// <see cref="OrdinalSortByCaseStringComparer"/> would return <c>[a, A, A, b, B, c, C, d, D]</c>, which is the expected behaviour.
+    /// </item>
+    /// </example>
+    public class OrdinalSortByCaseStringComparer : IComparer<string>
+    {
+        public static readonly OrdinalSortByCaseStringComparer DEFAULT = new OrdinalSortByCaseStringComparer();
+
+        private OrdinalSortByCaseStringComparer()
+        {
+        }
+
+        public int Compare(string? a, string? b)
+        {
+            int result = StringComparer.OrdinalIgnoreCase.Compare(a, b);
+            if (result == 0)
+                result = -StringComparer.Ordinal.Compare(a, b); // negative to place lowercase letters before uppercase.
+            return result;
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 935b759e4d..0782922f5a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2024.205.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.129.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2024.221.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.207.0" />
     <PackageReference Include="Sentry" Version="3.41.3" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.36.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a4cd26a372..463a726856 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.205.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.221.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 21f5f0f3a0..9287a71040 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