diff --git a/osu-framework b/osu-framework
index 31cf1c4b58..42ec8a62fb 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 31cf1c4b58c866d047876b15a95a4cf0115d3105
+Subproject commit 42ec8a62fb697f1d967a927549dc51336cd66968
diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
new file mode 100644
index 0000000000..babca8ee06
--- /dev/null
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
+        }
+
+        private Beatmap beatmap;
+        
+        protected override Beatmap GetBeatmap() => beatmap;
+        protected override Texture GetBackground() => null;
+        protected override Track GetTrack() => null;
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index c2e33f7f32..e876c21a12 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -8,7 +8,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Mania.UI;
@@ -17,6 +16,7 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -95,16 +95,5 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 41bd24b900..a08cb3e97e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -8,13 +8,13 @@ using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -23,7 +23,6 @@ namespace osu.Desktop.VisualTests.Tests
         protected Player Player;
         private BeatmapDatabase db;
 
-
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
@@ -97,16 +96,5 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap
             };
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 6eb9e5e648..b67b4c4bb3 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -205,9 +205,13 @@
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
+    <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Beatmaps\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/osu.Game.Modes.Taiko/Objects/DrumRoll.cs b/osu.Game.Modes.Taiko/Objects/DrumRoll.cs
new file mode 100644
index 0000000000..cdb8ef2405
--- /dev/null
+++ b/osu.Game.Modes.Taiko/Objects/DrumRoll.cs
@@ -0,0 +1,104 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps.Samples;
+using osu.Game.Modes.Objects.Types;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Database;
+
+namespace osu.Game.Modes.Taiko.Objects
+{
+    public class DrumRoll : TaikoHitObject, IHasDistance
+    {
+        public double EndTime => StartTime + Distance / Velocity;
+
+        public double Duration => EndTime - StartTime;
+
+        /// <summary>
+        /// Raw length of the drum roll in positional length units.
+        /// </summary>
+        public double Distance { get; set; }
+
+        /// <summary>
+        /// Velocity of the drum roll in positional length units per millisecond.
+        /// </summary>
+        public double Velocity { get; protected set; }
+
+        /// <summary>
+        /// The distance between ticks of this drumroll.
+        /// <para>Half of this value is the hit window of the ticks.</para>
+        /// </summary>
+        public double TickTimeDistance { get; protected set; }
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Good" hit.
+        /// </summary>
+        public double RequiredGoodHits { get; protected set; }
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Great" hit.
+        /// </summary>
+        public double RequiredGreatHits { get; protected set; }
+
+        /// <summary>
+        /// Total number of drum roll ticks.
+        /// </summary>
+        public int TotalTicks => Ticks.Count();
+
+        /// <summary>
+        /// Initializes the drum roll ticks if not initialized and returns them.
+        /// </summary>
+        public IEnumerable<DrumRollTick> Ticks => ticks ?? (ticks = createTicks());
+
+        private List<DrumRollTick> ticks;
+
+        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
+        {
+            base.ApplyDefaults(timing, difficulty);
+
+            Velocity = timing.SliderVelocityAt(StartTime) * difficulty.SliderMultiplier / 1000;
+            TickTimeDistance = timing.BeatLengthAt(StartTime);
+
+            //TODO: move this to legacy conversion code to allow for direct division without special case.
+            if (difficulty.SliderTickRate == 3)
+                TickTimeDistance /= 3;
+            else
+                TickTimeDistance /= 4;
+
+            RequiredGoodHits = TotalTicks * Math.Min(0.15, 0.05 + 0.10 / 6 * difficulty.OverallDifficulty);
+            RequiredGreatHits = TotalTicks * Math.Min(0.30, 0.10 + 0.20 / 6 * difficulty.OverallDifficulty);
+        }
+
+        private List<DrumRollTick> createTicks()
+        {
+            var ret = new List<DrumRollTick>();
+
+            if (TickTimeDistance == 0)
+                return ret;
+
+            bool first = true;
+            for (double t = StartTime; t < EndTime + (int)TickTimeDistance; t += TickTimeDistance)
+            {
+                ret.Add(new DrumRollTick
+                {
+                    FirstTick = first,
+                    PreEmpt = PreEmpt,
+                    TickTimeDistance = TickTimeDistance,
+                    StartTime = t,
+                    Sample = new HitSampleInfo
+                    {
+                        Type = SampleType.None,
+                        Set = SampleSet.Soft
+                    }
+                });
+
+                first = false;
+            }
+
+            return ret;
+        }
+    }
+}
diff --git a/osu.Game.Modes.Taiko/Objects/DrumRollTick.cs b/osu.Game.Modes.Taiko/Objects/DrumRollTick.cs
new file mode 100644
index 0000000000..66a2d16fe1
--- /dev/null
+++ b/osu.Game.Modes.Taiko/Objects/DrumRollTick.cs
@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Taiko.Objects
+{
+    public class DrumRollTick : TaikoHitObject
+    {
+        /// <summary>
+        /// Whether this is the first (initial) tick of the slider.
+        /// </summary>
+        public bool FirstTick;
+
+        /// <summary>
+        /// The distance between this tick and the next in milliseconds.
+        /// <para>Half of this value is the hit window of the tick.</para>
+        /// </summary>
+        public double TickTimeDistance;
+    }
+}
\ No newline at end of file
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index db578d2e3c..1f372e99e6 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -52,6 +52,8 @@
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
     <Compile Include="Judgements\TaikoHitResult.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
+    <Compile Include="Objects\DrumRoll.cs" />
+    <Compile Include="Objects\DrumRollTick.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 16db4fc2a6..2a2de1b6ef 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -4,14 +4,11 @@
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Mods;
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace osu.Game.Beatmaps
 {
@@ -27,14 +24,12 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public PlayMode? PreferredPlayMode;
 
-        public PlayMode PlayMode => beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
+        public PlayMode PlayMode => Beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? Beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
 
         public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
 
         public readonly bool WithStoryboard;
 
-        protected abstract ArchiveReader GetReader();
-
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
         {
             BeatmapInfo = beatmapInfo;
@@ -42,31 +37,10 @@ namespace osu.Game.Beatmaps
             WithStoryboard = withStoryboard;
         }
 
-        private Texture background;
-        private object backgroundLock = new object();
-        public Texture Background
-        {
-            get
-            {
-                lock (backgroundLock)
-                {
-                    if (background != null) return background;
-
-                    if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                            background = new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                    catch { }
-
-                    return background;
-                }
-            }
-            set { lock (backgroundLock) background = value; }
-        }
-
+        protected abstract Beatmap GetBeatmap();
+        protected abstract Texture GetBackground();
+        protected abstract Track GetTrack();
+        
         private Beatmap beatmap;
         private object beatmapLock = new object();
         public Beatmap Beatmap
@@ -75,33 +49,24 @@ namespace osu.Game.Beatmaps
             {
                 lock (beatmapLock)
                 {
-                    if (beatmap != null) return beatmap;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                        {
-                            BeatmapDecoder decoder;
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                            {
-                                decoder = BeatmapDecoder.GetDecoder(stream);
-                                beatmap = decoder?.Decode(stream);
-                            }
-
-                            if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                    decoder?.Decode(stream, beatmap);
-                        }
-                    }
-                    catch { }
-
-                    return beatmap;
+                    return beatmap ?? (beatmap = GetBeatmap());
+                }
+            }
+        }
+        
+        private object backgroundLock = new object();
+        private Texture background;
+        public Texture Background
+        {
+            get
+            {
+                lock (backgroundLock)
+                {
+                    return background ?? (background = GetBackground());
                 }
             }
-            set { lock (beatmapLock) beatmap = value; }
         }
 
-        private ArchiveReader trackReader;
         private Track track;
         private object trackLock = new object();
         public Track Track
@@ -110,48 +75,25 @@ namespace osu.Game.Beatmaps
             {
                 lock (trackLock)
                 {
-                    if (track != null) return track;
-
-                    try
-                    {
-                        //store a reference to the reader as we may continue accessing the stream in the background.
-                        trackReader = GetReader();
-                        var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                        if (trackData != null)
-                            track = new TrackBass(trackData);
-                    }
-                    catch { }
-
-                    return track;
+                    return track ?? (track = GetTrack());
                 }
             }
-            set { lock (trackLock) track = value; }
         }
 
         public bool TrackLoaded => track != null;
 
-        private bool isDisposed;
-
-        protected virtual void Dispose(bool disposing)
+        public void TransferTo(WorkingBeatmap other)
         {
-            if (!isDisposed)
-            {
-                track?.Dispose();
-                background?.Dispose();
-                isDisposed = true;
-            }
+            if (track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
+                other.track = track;
         }
-
-        public void Dispose()
+        
+        public virtual void Dispose()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void TransferTo(WorkingBeatmap working)
-        {
-            if (track != null && BeatmapInfo.AudioEquals(working.BeatmapInfo))
-                working.track = track;
+            track?.Dispose();
+            track = null;
+            background?.Dispose();
+            background = null;
         }
     }
 }
diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index 3f865d65f1..317467d792 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -342,18 +342,5 @@ namespace osu.Game.Database
         }
 
         public bool Exists(BeatmapSetInfo beatmapSet) => storage.Exists(beatmapSet.Path);
-
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
-        {
-            private readonly BeatmapDatabase database;
-
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
-            {
-                this.database = database;
-            }
-
-            protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
new file mode 100644
index 0000000000..1b37cf2fa0
--- /dev/null
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -0,0 +1,73 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.IO;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Game.Database
+{
+    internal class DatabaseWorkingBeatmap : WorkingBeatmap
+    {
+        private readonly BeatmapDatabase database;
+
+        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+            : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+        {
+            this.database = database;
+        }
+
+        private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
+
+        protected override Beatmap GetBeatmap()
+        {
+            try
+            {
+                Beatmap beatmap;
+
+                using (var reader = getReader())
+                {
+                    BeatmapDecoder decoder;
+                    using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
+                    {
+                        decoder = BeatmapDecoder.GetDecoder(stream);
+                        beatmap = decoder?.Decode(stream);
+                    }
+
+                    if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                            decoder.Decode(stream, beatmap);
+                }
+
+                return beatmap;
+            }
+            catch { return null; }
+        }
+
+        protected override Texture GetBackground()
+        {
+            if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                return null;
+
+            try
+            {
+                using (var reader = getReader())
+                    return new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
+            }
+            catch { return null; }
+        }
+
+        protected override Track GetTrack()
+        {
+            try
+            {
+                var trackData = getReader()?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                return trackData == null ? null : new TrackBass(trackData);
+            }
+            catch { return null; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 4c50162194..478fe8a877 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -99,15 +99,14 @@ namespace osu.Game.Graphics.Backgrounds
 
             const float size = 100;
 
-            return new Triangle
+            return new EquilateralTriangle
             {
                 Origin = Anchor.TopCentre,
                 RelativePositionAxes = Axes.Both,
+                Size = new Vector2(size),
                 Scale = new Vector2(scale),
                 EdgeSmoothness = new Vector2(1),
                 Colour = GetTriangleShade(),
-                // Scaling height by 0.866 results in equiangular triangles (== 60° and equal side length)
-                Size = new Vector2(size, 0.866f * size),
                 Depth = scale,
             };
         }
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
deleted file mode 100644
index 559ffca283..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
-using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropDownHeader : DropDownHeader
-    {
-        private SpriteText label;
-        protected override string Label
-        {
-            get { return label.Text; }
-            set { label.Text = value; }
-        }
-
-        private Color4? accentColour;
-        public virtual Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                BackgroundColourHover = value;
-            }
-        }
-
-        public OsuDropDownHeader()
-        {
-            Foreground.Padding = new MarginPadding(4);
-
-            AutoSizeAxes = Axes.None;
-            Margin = new MarginPadding { Bottom = 4 };
-            CornerRadius = 4;
-            Height = 40;
-
-            Foreground.Children = new Drawable[]
-            {
-                label = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                },
-                new TextAwesome
-                {
-                    Icon = FontAwesome.fa_chevron_down,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding { Right = 4 },
-                    TextSize = 20
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BackgroundColour = Color4.Black.Opacity(0.5f);
-            BackgroundColourHover = accentColour ?? colours.PinkDarker;
-        }
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
deleted file mode 100644
index 5d9e30db8d..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Linq;
-using osu.Framework.Allocation;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics.UserInterface;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropDownMenu<T> : DropDownMenu<T>
-    {
-        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
-
-        private Color4? accentColour;
-        public virtual Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                if (Header != null)
-                    ((OsuDropDownHeader)Header).AccentColour = value;
-                foreach (var item in ItemList.OfType<OsuDropDownMenuItem<T>>())
-                    item.AccentColour = value;
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            if (accentColour == null)
-                AccentColour = colours.PinkDarker;
-        }
-
-        public OsuDropDownMenu()
-        {
-            ContentContainer.CornerRadius = 4;
-            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
-
-            DropDownItemsContainer.Padding = new MarginPadding(5);
-        }
-
-        protected override void AnimateOpen() => ContentContainer.FadeIn(300, EasingTypes.OutQuint);
-
-        protected override void AnimateClose() => ContentContainer.FadeOut(300, EasingTypes.OutQuint);
-
-        protected override void UpdateContentHeight()
-        {
-            var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
-            ContentContainer.ResizeTo(new Vector2(1, State == DropDownMenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
-        }
-
-        protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
deleted file mode 100644
index 71650dee52..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
-using OpenTK.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropDownMenuItem<U> : DropDownMenuItem<U>
-    {
-        public OsuDropDownMenuItem(string text, U value) : base(text, value)
-        {
-            Foreground.Padding = new MarginPadding(2);
-
-            Masking = true;
-            CornerRadius = 6;
-
-            Children = new[]
-            {
-                new FillFlowContainer
-                {
-                    Direction = FillDirection.Horizontal,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        chevron = new TextAwesome
-                        {
-                            AlwaysPresent = true,
-                            Icon = FontAwesome.fa_chevron_right,
-                            UseFullGlyphHeight = false,
-                            Colour = Color4.Black,
-                            Alpha = 0.5f,
-                            TextSize = 8,
-                            Margin = new MarginPadding { Left = 3, Right = 3 },
-                            Origin = Anchor.CentreLeft,
-                            Anchor = Anchor.CentreLeft,
-                        },
-                        new OsuSpriteText {
-                            Text = text,
-                            Origin = Anchor.CentreLeft,
-                            Anchor = Anchor.CentreLeft,
-                        }
-                    }
-                }
-            };
-        }
-
-        private Color4? accentColour;
-
-        private TextAwesome chevron;
-
-        protected override void FormatForeground(bool hover = false)
-        {
-            base.FormatForeground(hover);
-            chevron.Alpha = hover ? 1 : 0;
-        }
-
-        public Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                BackgroundColourHover = BackgroundColourSelected = value;
-                FormatBackground();
-                FormatForeground();
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BackgroundColour = Color4.Transparent;
-            BackgroundColourHover = accentColour ?? colours.PinkDarker;
-            BackgroundColourSelected = Color4.Black.Opacity(0.5f);
-        }
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
new file mode 100644
index 0000000000..7a31337660
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -0,0 +1,172 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuDropdown<T> : Dropdown<T>
+    {
+        protected override DropdownHeader CreateHeader() => new OsuDropdownHeader { AccentColour = AccentColour };
+
+        protected override Menu CreateMenu() => new OsuMenu();
+
+        private Color4? accentColour;
+        public virtual Color4 AccentColour
+        {
+            get { return accentColour.GetValueOrDefault(); }
+            set
+            {
+                accentColour = value;
+                if (Header != null)
+                    ((OsuDropdownHeader)Header).AccentColour = value;
+                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem>())
+                    item.AccentColour = value;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            if (accentColour == null)
+                AccentColour = colours.PinkDarker;
+        }
+
+        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem(text, value) { AccentColour = AccentColour };
+
+        private class OsuDropdownMenuItem : DropdownMenuItem<T>
+        {
+            public OsuDropdownMenuItem(string text, T value) : base(text, value)
+            {
+                Foreground.Padding = new MarginPadding(2);
+
+                Masking = true;
+                CornerRadius = 6;
+
+                Children = new[]
+                {
+                new FillFlowContainer
+                {
+                    Direction = FillDirection.Horizontal,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        chevron = new TextAwesome
+                        {
+                            AlwaysPresent = true,
+                            Icon = FontAwesome.fa_chevron_right,
+                            UseFullGlyphHeight = false,
+                            Colour = Color4.Black,
+                            Alpha = 0.5f,
+                            TextSize = 8,
+                            Margin = new MarginPadding { Left = 3, Right = 3 },
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        },
+                        new OsuSpriteText {
+                            Text = text,
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        }
+                    }
+                }
+            };
+            }
+
+            private Color4? accentColour;
+
+            private TextAwesome chevron;
+
+            protected override void FormatForeground(bool hover = false)
+            {
+                base.FormatForeground(hover);
+                chevron.Alpha = hover ? 1 : 0;
+            }
+
+            public Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    BackgroundColourHover = BackgroundColourSelected = value;
+                    FormatBackground();
+                    FormatForeground();
+                }
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = Color4.Transparent;
+                BackgroundColourHover = accentColour ?? colours.PinkDarker;
+                BackgroundColourSelected = Color4.Black.Opacity(0.5f);
+            }
+        }
+
+        protected class OsuDropdownHeader : DropdownHeader
+        {
+            private SpriteText label;
+            protected override string Label
+            {
+                get { return label.Text; }
+                set { label.Text = value; }
+            }
+
+            private Color4? accentColour;
+            public virtual Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    BackgroundColourHover = value;
+                }
+            }
+
+            public OsuDropdownHeader()
+            {
+                Foreground.Padding = new MarginPadding(4);
+
+                AutoSizeAxes = Axes.None;
+                Margin = new MarginPadding { Bottom = 4 };
+                CornerRadius = 4;
+                Height = 40;
+
+                Foreground.Children = new Drawable[]
+                {
+                label = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                new TextAwesome
+                {
+                    Icon = FontAwesome.fa_chevron_down,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Margin = new MarginPadding { Right = 4 },
+                    TextSize = 20
+                }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = Color4.Black.Opacity(0.5f);
+                BackgroundColourHover = accentColour ?? colours.PinkDarker;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
new file mode 100644
index 0000000000..95df3be9bf
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -0,0 +1,34 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuMenu : Menu
+    {
+        public OsuMenu()
+        {
+            CornerRadius = 4;
+            Background.Colour = Color4.Black.Opacity(0.5f);
+
+            ItemsContainer.Padding = new MarginPadding(5);
+        }
+
+        protected override void AnimateOpen() => FadeIn(300, EasingTypes.OutQuint);
+
+        protected override void AnimateClose() => FadeOut(300, EasingTypes.OutQuint);
+
+        protected override void UpdateContentHeight()
+        {
+            var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
+            ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index d5699eddaf..8283c1baa0 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -6,21 +6,25 @@ using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu<T>();
+        protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
 
-        protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
+        protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem { Value = value };
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || DropDown.Contains(screenSpacePos);
+        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
 
         public OsuTabControl()
         {
@@ -45,42 +49,146 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDownMenu<T>;
+                var dropDown = Dropdown as OsuTabDropdown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
-                foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
+                foreach (var item in TabContainer.Children.OfType<OsuTabItem>())
                     item.AccentColour = value;
             }
         }
 
-        public class OsuTabDropDownMenu<T1> : OsuDropDownMenu<T1>
+        private class OsuTabItem : TabItem<T>
         {
-            protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
+            private SpriteText text;
+            private Box box;
+
+            private Color4? accentColour;
+            public Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    if (!Active)
+                        text.Colour = value;
+                }
+            }
+
+            public new T Value
+            {
+                get { return base.Value; }
+                set
+                {
+                    base.Value = value;
+                    text.Text = (value as Enum)?.GetDescription();
+                }
+            }
+
+            public override bool Active
+            {
+                get { return base.Active; }
+                set
+                {
+                    if (Active == value) return;
+
+                    if (value)
+                        fadeActive();
+                    else
+                        fadeInactive();
+                    base.Active = value;
+                }
+            }
+
+            private const float transition_length = 500;
+
+            private void fadeActive()
+            {
+                box.FadeIn(transition_length, EasingTypes.OutQuint);
+                text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint);
+            }
+
+            private void fadeInactive()
+            {
+                box.FadeOut(transition_length, EasingTypes.OutQuint);
+                text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint);
+            }
+
+            protected override bool OnHover(InputState state)
+            {
+                if (!Active)
+                    fadeActive();
+                return true;
+            }
+
+            protected override void OnHoverLost(InputState state)
+            {
+                if (!Active)
+                    fadeInactive();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                if (accentColour == null)
+                    AccentColour = colours.Blue;
+            }
+
+            public OsuTabItem()
+            {
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+
+                Children = new Drawable[]
+                {
+                text = new OsuSpriteText
+                {
+                    Margin = new MarginPadding(5),
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    TextSize = 14,
+                    Font = @"Exo2.0-Bold", // Font should only turn bold when active?
+                },
+                box = new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1,
+                    Alpha = 0,
+                    Colour = Color4.White,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                }
+                };
+            }
+        }
+
+        private class OsuTabDropdown : OsuDropdown<T>
+        {
+            protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
             {
                 AccentColour = AccentColour,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T1> CreateDropDownItem(string key, T1 value)
+            protected override DropdownMenuItem<T> CreateMenuItem(string text, T value)
             {
-                var item = base.CreateDropDownItem(key, value);
+                var item = base.CreateMenuItem(text, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
 
-            public OsuTabDropDownMenu()
+            public OsuTabDropdown()
             {
-                ContentContainer.Anchor = Anchor.TopRight;
-                ContentContainer.Origin = Anchor.TopRight;
+                DropdownMenu.Anchor = Anchor.TopRight;
+                DropdownMenu.Origin = Anchor.TopRight;
 
                 RelativeSizeAxes = Axes.X;
 
-                ContentBackground.Colour = Color4.Black.Opacity(0.7f);
-                MaxDropDownHeight = 400;
+                DropdownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
+                DropdownMenu.MaxHeight = 400;
             }
 
-            public class OsuTabDropDownHeader : OsuDropDownHeader
+            protected class OsuTabDropdownHeader : OsuDropdownHeader
             {
                 public override Color4 AccentColour
                 {
@@ -104,7 +212,7 @@ namespace osu.Game.Graphics.UserInterface
                     base.OnHoverLost(state);
                 }
 
-                public OsuTabDropDownHeader()
+                public OsuTabDropdownHeader()
                 {
                     RelativeSizeAxes = Axes.None;
                     AutoSizeAxes = Axes.X;
diff --git a/osu.Game/Graphics/UserInterface/OsuTabItem.cs b/osu.Game/Graphics/UserInterface/OsuTabItem.cs
deleted file mode 100644
index acfca1b67b..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuTabItem.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input;
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuTabItem<T> : TabItem<T>
-    {
-        private SpriteText text;
-        private Box box;
-        
-        private Color4? accentColour;
-        public Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                if (!Active)
-                    text.Colour = value;
-            }
-        }
-
-        public new T Value
-        {
-            get { return base.Value; }
-            set
-            {
-                base.Value = value;
-                text.Text = (value as Enum)?.GetDescription();
-            }
-        }
-
-        public override bool Active
-        {
-            get { return base.Active; }
-            set
-            {
-                if (Active == value) return;
-
-                if (value)
-                    fadeActive();
-                else
-                    fadeInactive();
-                base.Active = value;
-            }
-        }
-
-        private const float transition_length = 500;
-
-        private void fadeActive()
-        {
-            box.FadeIn(transition_length, EasingTypes.OutQuint);
-            text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint);
-        }
-
-        private void fadeInactive()
-        {
-            box.FadeOut(transition_length, EasingTypes.OutQuint);
-            text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint);
-        }
-
-        protected override bool OnHover(InputState state)
-        {
-            if (!Active)
-                fadeActive();
-            return true;
-        }
-
-        protected override void OnHoverLost(InputState state)
-        {
-            if (!Active)
-                fadeInactive();
-        }
-
-        public OsuTabItem()
-        {
-            AutoSizeAxes = Axes.X;
-            RelativeSizeAxes = Axes.Y;
-
-            Children = new Drawable[]
-            {
-                text = new OsuSpriteText
-                {
-                    Margin = new MarginPadding(5),
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    TextSize = 14,
-                    Font = @"Exo2.0-Bold", // Font should only turn bold when active?
-                },
-                box = new Box
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 1,
-                    Alpha = 0,
-                    Colour = Color4.White,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            if (accentColour == null)
-                AccentColour = colours.Blue;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropdown.cs
similarity index 56%
rename from osu.Game/Overlays/Options/OptionDropDown.cs
rename to osu.Game/Overlays/Options/OptionDropdown.cs
index 4387e90b5a..d46e786bca 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
+using System.Collections.Generic;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,13 +10,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionDropDown<T> : FillFlowContainer
+    public class OptionDropdown<T> : FillFlowContainer
     {
-        private DropDownMenu<T> dropdown;
+        private Dropdown<T> dropdown;
         private SpriteText text;
 
         public string LabelText
@@ -33,12 +32,8 @@ namespace osu.Game.Overlays.Options
             get { return bindable; }
             set
             {
-                if (bindable != null)
-                    bindable.ValueChanged -= bindable_ValueChanged;
                 bindable = value;
-                bindable.ValueChanged += bindable_ValueChanged;
-                bindable_ValueChanged(null, null);
-
+                dropdown.SelectedValue.BindTo(bindable);
                 if (bindable.Disabled)
                     Alpha = 0.3f;
             }
@@ -46,23 +41,6 @@ namespace osu.Game.Overlays.Options
 
         private Bindable<T> bindable;
 
-        private void bindable_ValueChanged(object sender, EventArgs e)
-        {
-            dropdown.SelectedValue = bindable.Value;
-        }
-
-        private void dropdown_ValueChanged(object sender, EventArgs e)
-        {
-            bindable.Value = dropdown.SelectedValue;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            bindable.ValueChanged -= bindable_ValueChanged;
-            dropdown.ValueChanged -= dropdown_ValueChanged;
-            base.Dispose(isDisposing);
-        }
-
         private IEnumerable<KeyValuePair<string, T>> items;
         public IEnumerable<KeyValuePair<string, T>> Items
         {
@@ -73,19 +51,12 @@ namespace osu.Game.Overlays.Options
             set
             {
                 items = value;
-                if(dropdown != null)
-                {
+                if (dropdown != null)
                     dropdown.Items = value;
-
-                    // We need to refresh the dropdown because our items changed,
-                    // thus its selected value may be outdated.
-                    if (bindable != null)
-                        dropdown.SelectedValue = bindable.Value;
-                }
             }
         }
 
-        public OptionDropDown()
+        public OptionDropdown()
         {
             Items = new KeyValuePair<string, T>[0];
 
@@ -97,14 +68,13 @@ namespace osu.Game.Overlays.Options
                 text = new OsuSpriteText {
                     Alpha = 0,
                 },
-                dropdown = new OsuDropDownMenu<T>
+                dropdown = new OsuDropdown<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
                     Items = Items,
                 }
             };
-            dropdown.ValueChanged += dropdown_ValueChanged;
         }
     }
 }
diff --git a/osu.Game/Overlays/Options/OptionEnumDropDown.cs b/osu.Game/Overlays/Options/OptionEnumDropdown.cs
similarity index 89%
rename from osu.Game/Overlays/Options/OptionEnumDropDown.cs
rename to osu.Game/Overlays/Options/OptionEnumDropdown.cs
index 50d1d36b4c..1a4f4635e2 100644
--- a/osu.Game/Overlays/Options/OptionEnumDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionEnumDropdown.cs
@@ -8,9 +8,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionEnumDropDown<T> : OptionDropDown<T>
+    public class OptionEnumDropdown<T> : OptionDropdown<T>
     {
-        public OptionEnumDropDown()
+        public OptionEnumDropdown()
         {
             if (!typeof(T).IsEnum)
                 throw new InvalidOperationException("OptionsDropdown only supports enums as the generic type argument");
diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
index 25585845b0..2818f5fbd7 100644
--- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections.Audio
         protected override string Header => "Devices";
 
         private AudioManager audio;
-        private OptionDropDown<string> dropdown;
+        private OptionDropdown<string> dropdown;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Options.Sections.Audio
 
             Children = new Drawable[]
             {
-                dropdown = new OptionDropDown<string>
+                dropdown = new OptionDropdown<string>
                 {
                     Bindable = audio.AudioDevice
                 },
diff --git a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
index ada57e8dd0..4350625d51 100644
--- a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Options.Sections.Debug
         {
             Children = new Drawable[]
             {
-                new OptionEnumDropDown<GCLatencyMode>
+                new OptionEnumDropdown<GCLatencyMode>
                 {
                     LabelText = "Active mode",
                     Bindable = config.GetBindable<GCLatencyMode>(FrameworkDebugConfig.ActiveGCMode)
diff --git a/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs b/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
index 1c28f6247d..70a2c52322 100644
--- a/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
@@ -23,12 +23,12 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
                     LabelText = "Background dim",
                     Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel)
                 },
-                new OptionEnumDropDown<ProgressBarType>
+                new OptionEnumDropdown<ProgressBarType>
                 {
                     LabelText = "Progress display",
                     Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
                 },
-                new OptionEnumDropDown<ScoreMeterType>
+                new OptionEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
                     Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)
diff --git a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
index c45dc9cbd4..2b2939e432 100644
--- a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Options.Sections.General
         {
             Children = new Drawable[]
             {
-                new OptionEnumDropDown<ReleaseStream>
+                new OptionEnumDropdown<ReleaseStream>
                 {
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
index e66d097094..0af8a4c580 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
                     LabelText = "Softening filter",
                     Bindable = config.GetBindable<bool>(OsuConfig.BloomSoftening)
                 },
-                new OptionEnumDropDown<ScreenshotFormat>
+                new OptionEnumDropdown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
index 0a2e8f91a4..8c4930d99d 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
             Children = new Drawable[]
             {
                 new OptionLabel { Text = "Resolution: TODO dropdown" },
-                new OptionEnumDropDown<WindowMode>
+                new OptionEnumDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
                     Bindable = config.GetBindable<WindowMode>(FrameworkConfig.WindowMode),
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
index b98337f1e6..c898879167 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
             Children = new Drawable[]
             {
                 // TODO: this needs to be a custom dropdown at some point
-                new OptionEnumDropDown<FrameSync>
+                new OptionEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)
diff --git a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
index ef1dd755b7..92be00bdb0 100644
--- a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Options.Sections.Input
                     LabelText = "Map absolute raw input to the osu! window",
                     Bindable = config.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
                 },
-                new OptionEnumDropDown<ConfineMouseMode>
+                new OptionEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
                     Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9cedaa1b09..bfb787cd51 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -86,6 +86,7 @@
     <Compile Include="Graphics\UserInterface\BackButton.cs" />
     <Compile Include="Graphics\UserInterface\FocusedTextBox.cs" />
     <Compile Include="Graphics\UserInterface\Nub.cs" />
+    <Compile Include="Graphics\UserInterface\OsuMenu.cs" />
     <Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
     <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
     <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
@@ -160,9 +161,7 @@
     <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownMenu.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
     <Compile Include="Overlays\Options\OptionsFooter.cs" />
     <Compile Include="Overlays\Options\Sections\DebugSection.cs" />
     <Compile Include="Overlays\Options\Sections\Debug\GeneralOptions.cs" />
@@ -280,6 +279,7 @@
     <Compile Include="Database\BeatmapMetadata.cs" />
     <Compile Include="Database\BeatmapInfo.cs" />
     <Compile Include="Database\BaseDifficulty.cs" />
+    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
     <Compile Include="Graphics\UserInterface\OsuButton.cs" />
     <Compile Include="Overlays\Options\Sections\MaintenanceSection.cs" />
     <Compile Include="Overlays\Options\OptionsSection.cs" />
@@ -362,7 +362,6 @@
     <Compile Include="Users\Avatar.cs" />
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">