diff --git a/osu-framework b/osu-framework
index 2b9a56e8b3..6650f7fbbc 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 2b9a56e8b3bb6c99bf4c75307639e6726fe8d3ec
+Subproject commit 6650f7fbbcbfb29489e378e73cb4f3b1042384bd
diff --git a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
index 0f1538953a..2b52657f1e 100644
--- a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
+++ b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Additive = true,
+                            BlendingMode = BlendingMode.Additive,
                             Alpha = 0.5f,
                         }
                 };
@@ -203,7 +203,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
 
-                Additive = true;
+                BlendingMode = BlendingMode.Additive;
                 Alpha = 0;
 
                 Children = new Framework.Graphics.Drawable[]
@@ -225,7 +225,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
 
-                Additive = true;
+                BlendingMode = BlendingMode.Additive;
                 Alpha = 0;
 
                 Children = new Framework.Graphics.Drawable[]
@@ -296,7 +296,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
                     },
                     triangles = new Triangles
                     {
-                        Additive = true,
+                        BlendingMode = BlendingMode.Additive,
                         RelativeSizeAxes = Axes.Both,
                     },
                 };
diff --git a/osu.Game/GameModes/GameModeWhiteBox.cs b/osu.Game/GameModes/GameModeWhiteBox.cs
index d4a0893cba..3bb8dd4566 100644
--- a/osu.Game/GameModes/GameModeWhiteBox.cs
+++ b/osu.Game/GameModes/GameModeWhiteBox.cs
@@ -91,7 +91,7 @@ namespace osu.Game.GameModes
                         Origin = Anchor.Centre,
                         Colour = getColourFor(GetType()),
                         Alpha = 1,
-                        Additive = false
+                        BlendingMode = BlendingMode.Additive,
                     },
                     textContainer = new Container
                     {
diff --git a/osu.Game/GameModes/Menu/Intro.cs b/osu.Game/GameModes/Menu/Intro.cs
index 308eb157d3..c107fd0c92 100644
--- a/osu.Game/GameModes/Menu/Intro.cs
+++ b/osu.Game/GameModes/Menu/Intro.cs
@@ -35,7 +35,7 @@ namespace osu.Game.GameModes.Menu
                 logo = new OsuLogo()
                 {
                     Alpha = 0,
-                    Additive = true,
+                    BlendingMode = BlendingMode.Additive,
                     Interactive = false,
                     Colour = Color4.DarkGray,
                     Ripple = false
diff --git a/osu.Game/GameModes/Menu/OsuLogo.cs b/osu.Game/GameModes/Menu/OsuLogo.cs
index 889b7ccb32..106df1a1be 100644
--- a/osu.Game/GameModes/Menu/OsuLogo.cs
+++ b/osu.Game/GameModes/Menu/OsuLogo.cs
@@ -83,7 +83,7 @@ namespace osu.Game.GameModes.Menu
                                 {
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-                                    Additive = true,
+                                    BlendingMode = BlendingMode.Additive,
                                     Alpha = 0.05f
                                 }
                             }
@@ -93,7 +93,7 @@ namespace osu.Game.GameModes.Menu
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Size = logo.Size,
-                            Additive = true,
+                            BlendingMode = BlendingMode.Additive,
                             Alpha = 0.2f,
                         }
                     }
diff --git a/osu.Game/Graphics/Background/Background.cs b/osu.Game/Graphics/Background/Background.cs
index 1b36feb761..8d004dcf86 100644
--- a/osu.Game/Graphics/Background/Background.cs
+++ b/osu.Game/Graphics/Background/Background.cs
@@ -10,7 +10,6 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework;
 using System.Threading.Tasks;
-using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Graphics.Background
 {
diff --git a/osu.Game/Overlays/OptionsOverlay.cs b/osu.Game/Overlays/OptionsOverlay.cs
index 5f6e3ba3e3..cdf7628953 100644
--- a/osu.Game/Overlays/OptionsOverlay.cs
+++ b/osu.Game/Overlays/OptionsOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
                 new ScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    ScrollDraggerOnLeft = true,
+                    ScrollDraggerAnchor = Anchor.TopLeft,
                     Children = new[]
                     {
                         new FlowContainer
diff --git a/osu.Game/Overlays/ToolbarButton.cs b/osu.Game/Overlays/ToolbarButton.cs
index adc436a3b4..65004a78da 100644
--- a/osu.Game/Overlays/ToolbarButton.cs
+++ b/osu.Game/Overlays/ToolbarButton.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays
                 HoverBackground = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Additive = true,
+                    BlendingMode = BlendingMode.Additive,
                     Colour = new Color4(60, 60, 60, 255),
                     Alpha = 0,
                 },