Merge pull request #303 from peppy/options-refactor

Global shadows and more sane font size setting.

osu.Game/Beatmaps/Drawables/BeatmapPanel.cs

@@ -14,6 +14,7 @@ using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Beatmaps.Drawables
 {
@@ -102,7 +103,7 @@ namespace osu.Game.Beatmaps.Drawables
                                     Spacing = new Vector2(4, 0),
                                     Children = new[]
                                     {
-                                        new SpriteText
+                                        new OsuSpriteText
                                         {
                                             Font = @"Exo2.0-Medium",
                                             Text = beatmap.Version,
@@ -110,7 +111,7 @@ namespace osu.Game.Beatmaps.Drawables
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft
                                         },
-                                        new SpriteText
+                                        new OsuSpriteText
                                         {
                                             Font = @"Exo2.0-Medium",
                                             Text = "mapped by",
@@ -118,7 +119,7 @@ namespace osu.Game.Beatmaps.Drawables
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft
                                         },
-                                        new SpriteText
+                                        new OsuSpriteText
                                         {
                                             Font = @"Exo2.0-MediumItalic",
                                             Text = $"{(beatmap.Metadata ?? beatmap.BeatmapSet.Metadata).Author}",

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -43,14 +44,14 @@ namespace osu.Game.Beatmaps.Drawables
                     AutoSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        title = new SpriteText
+                        title = new OsuSpriteText
                         {
                             Font = @"Exo2.0-BoldItalic",
                             Text = beatmap.BeatmapSetInfo.Metadata.Title,
                             TextSize = 22,
                             Shadow = true,
                         },
-                        artist = new SpriteText
+                        artist = new OsuSpriteText
                         {
                             Margin = new MarginPadding { Top = -1 },
                             Font = @"Exo2.0-SemiBoldItalic",

osu.Game/Graphics/Sprites/OsuSpriteText.cs

@@ -0,0 +1,18 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Graphics.Sprites
+{
+    class OsuSpriteText : SpriteText
+    {
+        public const float FONT_SIZE = 16;
+
+        public OsuSpriteText()
+        {
+            Shadow = true;
+            TextSize = FONT_SIZE;
+        }
+    }
+}

osu.Game/Graphics/UserInterface/BackButton.cs

@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {

osu.Game/Graphics/UserInterface/OsuButton.cs

@@ -5,31 +5,81 @@ using System;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transformations;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
 using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuButton : Button
     {
+        private Box hover;
+
         public OsuButton()
         {
             Height = 40;
         }
-
+
+        protected override SpriteText CreateText() => new OsuSpriteText
+        {
+            Depth = -1,
+            Origin = Anchor.Centre,
+            Anchor = Anchor.Centre,
+            Font = @"Exo2.0-Bold",
+        };
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.BlueDark;
+            Colour = colours.BlueDark;
-            Masking = true;
+
-            CornerRadius = 5;
+            Content.Masking = true;
+            Content.CornerRadius = 5;
 
-            Add(new Triangles
+            Add(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
+                new Triangles
-                ColourDark = colours.BlueDarker,
+                {
-                ColourLight = colours.Blue,
+                    RelativeSizeAxes = Axes.Both,
+                    ColourDark = colours.BlueDarker,
+                    ColourLight = colours.Blue,
+                },
+                hover = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    BlendingMode = BlendingMode.Additive,
+                    Colour = Color4.White.Opacity(0.1f),
+                    Alpha = 0,
+                },
             });
         }
+
+        protected override bool OnHover(InputState state)
+        {
+            hover.FadeIn(200);
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(InputState state)
+        {
+            hover.FadeOut(200);
+            base.OnHoverLost(state);
+        }
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            Content.ScaleTo(0.9f, 4000, EasingTypes.OutQuint);
+            return base.OnMouseDown(state, args);
+        }
+
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            Content.ScaleTo(1, 1000, EasingTypes.OutElastic);
+            return base.OnMouseUp(state, args);
+        }
     }
 }

osu.Game/Graphics/UserInterface/OsuCheckbox.cs

@@ -13,14 +13,15 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Input;
-using osu.Game.Graphics;
 
-namespace osu.Game.Overlays.Options
+namespace osu.Game.Graphics.UserInterface
 {
-    public class CheckBoxOption : CheckBox
+    public class OsuCheckbox : CheckBox
     {
         private Bindable<bool> bindable;
 
@@ -70,15 +71,15 @@ namespace osu.Game.Overlays.Options
         private AudioSample sampleChecked;
         private AudioSample sampleUnchecked;
 
-        public CheckBoxOption()
+        public OsuCheckbox()
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 
             Children = new Drawable[]
             {
-                labelSpriteText = new SpriteText(),
+                labelSpriteText = new OsuSpriteText(),
-                light = new Light()
+                light = new Light
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
@@ -145,7 +146,7 @@ namespace osu.Game.Overlays.Options
 
             public Light()
             {
-                Size = new Vector2(40, 12);
+                Size = new Vector2(20, 12);
 
                 Masking = true;                
 
@@ -187,11 +188,13 @@ namespace osu.Game.Overlays.Options
                 {
                     if (value)
                     {
+                        ResizeTo(new Vector2(40, 12), 500, EasingTypes.OutQuint);
                         FadeColour(glowingColour, 500, EasingTypes.OutQuint);
                         FadeGlowTo(1, 500, EasingTypes.OutQuint);
                     }
                     else
                     {
+                        ResizeTo(new Vector2(20, 12), 500, EasingTypes.OutQuint);
                         FadeGlowTo(0, 500);
                         FadeColour(idleColour, 500);
                     }

osu.Game/Graphics/UserInterface/OsuTextBox.cs

@@ -5,16 +5,22 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using OpenTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTextBox : TextBox
     {
+        protected override Color4 BackgroundUnfocused => Color4.Black.Opacity(0.5f);
+        protected override Color4 BackgroundFocused => OsuColour.Gray(0.3f).Opacity(0.8f);
+        protected override Color4 BackgroundCommit => BorderColour;
+
         public OsuTextBox()
         {
             Height = 40;
-            TextContainer.Height = 0.6f;
+            TextContainer.Height = OsuSpriteText.FONT_SIZE / Height;
             CornerRadius = 5;
         }
 

osu.Game/Graphics/UserInterface/RollingCounter.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Transformations;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -106,7 +107,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             Children = new Drawable[]
             {
-                DisplayedCountSpriteText = new SpriteText(),
+                DisplayedCountSpriteText = new OsuSpriteText(),
             };
 
             TextSize = 40;

osu.Game/Graphics/UserInterface/TwoLayerButton.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -131,7 +132,7 @@ namespace osu.Game.Graphics.UserInterface
                                 },
                             }
                         },
-                        text = new SpriteText
+                        text = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,

osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -51,7 +52,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
                         }
                     }
                 },
-                new SpriteText
+                new OsuSpriteText
                 {
                     Text = meterName,
                     Anchor = Anchor.BottomCentre,

osu.Game/Modes/UI/ComboCounter.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.MathUtils;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Modes.UI
 {
@@ -100,11 +101,11 @@ namespace osu.Game.Modes.UI
 
             Children = new Drawable[]
             {
-                DisplayedCountSpriteText = new SpriteText
+                DisplayedCountSpriteText = new OsuSpriteText
                 {
                     Alpha = 0,
                 },
-                PopOutCount = new SpriteText
+                PopOutCount = new OsuSpriteText
                 {
                     Alpha = 0,
                     Margin = new MarginPadding(0.05f),

osu.Game/Online/Chat/Drawables/ChannelDisplay.cs

@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 
 namespace osu.Game.Online.Chat.Drawables
@@ -27,7 +28,7 @@ namespace osu.Game.Online.Chat.Drawables
 
             Children = new Drawable[]
             {
-                new SpriteText
+                new OsuSpriteText
                 {
                     Text = channel.Name,
                     TextSize = 50,

osu.Game/Online/Chat/Drawables/ChatLine.cs

@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -31,13 +32,13 @@ namespace osu.Game.Online.Chat.Drawables
                     Size = new Vector2(padding, text_size),
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = Message.Timestamp.LocalDateTime.ToLongTimeString(),
                             TextSize = text_size,
                             Colour = Color4.Gray
                         },
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = Message.User.Name,
                             TextSize = text_size,
@@ -53,7 +54,7 @@ namespace osu.Game.Online.Chat.Drawables
                     Padding = new MarginPadding { Left = padding + 10 },
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = Message.Content,
                             TextSize = text_size,

osu.Game/Overlays/ChatOverlay.cs

@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
@@ -137,7 +138,7 @@ namespace osu.Game.Overlays
             //  return;
 
             SpriteText loading;
-            Add(loading = new SpriteText
+            Add(loading = new OsuSpriteText
             {
                 Text = @"Loading available channels...",
                 Anchor = Anchor.Centre,

osu.Game/Overlays/LoginOverlay.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Game.Graphics;
-using osu.Game.Overlays.Options.General;
+using osu.Game.Overlays.Options.Sections.General;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays
                 new Box {
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black,
-                    Alpha = 0.8f,
+                    Alpha = 0.6f,
                 },
                 new Container
                 {

osu.Game/Overlays/MusicController.cs

@@ -23,6 +23,7 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays
 {
@@ -95,7 +96,7 @@ namespace osu.Game.Overlays
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        title = new SpriteText
+                        title = new OsuSpriteText
                         {
                             Origin = Anchor.BottomCentre,
                             Anchor = Anchor.TopCentre,
@@ -105,7 +106,7 @@ namespace osu.Game.Overlays
                             Text = @"Nothing to play",
                             Font = @"Exo2.0-MediumItalic"
                         },
-                        artist = new SpriteText
+                        artist = new OsuSpriteText
                         {
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,

osu.Game/Overlays/Options/OptionDropdown.cs

@@ -12,16 +12,16 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
-    public class DropdownOption<T> : FlowContainer
+    public class OptionDropdown<T> : FlowContainer
     {
         private DropDownMenu<T> dropdown;
         private SpriteText text;
-    
+
         public string LabelText
         {
             get { return text.Text; }
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Options
                 text.Alpha = string.IsNullOrEmpty(value) ? 0 : 1;
             }
         }
-        
+
         public Bindable<T> Bindable
         {
             get { return bindable; }
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Options
         {
             bindable.Value = dropdown.SelectedValue;
         }
-        
+
         protected override void Dispose(bool isDisposing)
         {
             bindable.ValueChanged -= Bindable_ValueChanged;
@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Options
             base.Dispose(isDisposing);
         }
 
-        public DropdownOption()
+        public OptionDropdown()
         {
             if (!typeof(T).IsEnum)
                 throw new InvalidOperationException("OptionsDropdown only supports enums as the generic type argument");
@@ -73,7 +73,9 @@ namespace osu.Game.Overlays.Options
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
             {
-                text = new SpriteText { Alpha = 0 },
+                text = new OsuSpriteText {
+                    Alpha = 0,
+                },
                 dropdown = new StyledDropDownMenu<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
@@ -83,7 +85,7 @@ namespace osu.Game.Overlays.Options
             };
             dropdown.ValueChanged += Dropdown_ValueChanged;
         }
-        
+
         private class StyledDropDownMenu<U> : DropDownMenu<U>
         {
             protected override float DropDownListSpacing => 4;
@@ -92,7 +94,7 @@ namespace osu.Game.Overlays.Options
             {
                 return new StyledDropDownComboBox();
             }
-            
+
             protected override IEnumerable<DropDownMenuItem<U>> GetDropDownItems(IEnumerable<U> values)
             {
                 return values.Select(v =>
@@ -101,7 +103,7 @@ namespace osu.Game.Overlays.Options
                     return new StyledDropDownMenuItem<U>(
                         field.GetCustomAttribute<DescriptionAttribute>()?.Description ?? field.Name, v);
                 });
-                    
+
             }
 
             public StyledDropDownMenu()
@@ -143,9 +145,16 @@ namespace osu.Game.Overlays.Options
             {
                 Foreground.Padding = new MarginPadding(4);
 
+                AutoSizeAxes = Axes.None;
+                Height = 40;
+
                 Children = new[]
                 {
-                    label = new SpriteText(),
+                    label = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    },
                     new TextAwesome
                     {
                         Icon = FontAwesome.fa_chevron_down,
@@ -185,11 +194,16 @@ namespace osu.Game.Overlays.Options
                             {
                                 Icon = FontAwesome.fa_chevron_right,
                                 Colour = Color4.Black,
+                                TextSize = 12,
                                 Margin = new MarginPadding { Right = 3 },
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
                             },
-                            new SpriteText { Text = text }
+                            new OsuSpriteText {
+                                Text = text,
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                            }
                         }
                     }
                 };

osu.Game/Overlays/Options/OptionLabel.cs

@@ -0,0 +1,19 @@
+//Copyright (c) 2007-2016 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.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Options
+{
+    class OptionLabel : OsuSpriteText
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            Colour = colour.Gray6;
+        }
+    }
+}

osu.Game/Overlays/Options/OptionSlider.cs

@@ -18,10 +18,11 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using System.Linq;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
-    public class SliderOption<T> : FlowContainer where T : struct
+    public class OptionSlider<T> : FlowContainer where T : struct
     {
         private SliderBar<T> slider;
         private SpriteText text;
@@ -42,14 +43,16 @@ namespace osu.Game.Overlays.Options
             set { slider.Bindable = value; }
         }
 
-        public SliderOption()
+        public OptionSlider()
         {
             Direction = FlowDirection.VerticalOnly;
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
             {
-                text = new SpriteText { Alpha = 0 },
+                text = new OsuSpriteText {
+                    Alpha = 0,
+                },
                 slider = new OsuSliderBar<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
@@ -76,7 +79,7 @@ namespace osu.Game.Overlays.Options
             
             public OsuSliderBar()
             {
-                Height = 22;
+                Height = 20;
                 Padding = new MarginPadding { Left = Height / 2, Right = Height / 2 };
                 Children = new Drawable[]
                 {

osu.Game/Overlays/Options/OptionTextBox.cs

@@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
 {
-    public class TextBoxOption : OsuTextBox
+    public class OptionTextBox : OsuTextBox
     {
         private Bindable<string> bindable;
 

osu.Game/Overlays/Options/OptionsSection.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
@@ -51,7 +52,7 @@ namespace osu.Game.Overlays.Options
                     AutoSizeAxes = Axes.Y,
                     Children = new[]
                     {
-                        headerLabel = new SpriteText
+                        headerLabel = new OsuSpriteText
                         {
                             TextSize = headerSize,
                             Text = Header,
@@ -60,7 +61,7 @@ namespace osu.Game.Overlays.Options
                         {
                             Margin = new MarginPadding { Top = headerSize + headerMargin },
                             Direction = FlowDirection.VerticalOnly,
-                            Spacing = new Vector2(0, 50),
+                            Spacing = new Vector2(0, 30),
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                         },
@@ -72,7 +73,7 @@ namespace osu.Game.Overlays.Options
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            headerLabel.Colour = colours.Pink;
+            headerLabel.Colour = colours.Yellow;
         }
     }
 }

osu.Game/Overlays/Options/OptionsSubsection.cs

@@ -1,14 +1,16 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
+using OpenTK;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Primitives;
-
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
+
 namespace osu.Game.Overlays.Options
 {
-    public abstract class OptionsSubsection : Container
+    public abstract class OptionsSubsection : FlowContainer
     {
         private Container<Drawable> content;
         protected override Container<Drawable> Content => content;
@@ -19,23 +21,21 @@ namespace osu.Game.Overlays.Options
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+            Direction = FlowDirection.VerticalOnly;
             AddInternal(new Drawable[]
             {
+                new OsuSpriteText
+                {
+                    Text = Header.ToUpper(),
+                    Margin = new MarginPadding { Bottom = 10 },
+                    Font = @"Exo2.0-Black",
+                },
                 content = new FlowContainer
                 {
                     Direction = FlowDirection.VerticalOnly,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Spacing = new Vector2(0, 5),
-                    Children = new[]
-                    {
-                        new SpriteText
-                        {
-                            TextSize = 17,
-                            Text = Header.ToUpper(),
-                            Font = @"Exo2.0-Black",
-                        }
-                    }
                 },
             });
         }

osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs

@@ -1,9 +1,7 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics.Sprites;
+namespace osu.Game.Overlays.Options.Sections.Audio
-
-namespace osu.Game.Overlays.Options.Audio
 {
     public class AudioDevicesOptions : OptionsSubsection
     {
@@ -13,7 +11,7 @@ namespace osu.Game.Overlays.Options.Audio
         {
             Children = new[]
             {
-                new SpriteText { Text = "Output device: TODO dropdown" }
+                new OptionLabel { Text = "Output device: TODO dropdown" }
             };
         }
     }

osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs

@@ -1,16 +1,15 @@
 //Copyright (c) 2007-2016 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.Allocation;
-using osu.Framework.Configuration;
+using osu.Framework.Configuration;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
-using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterface;
+
-
+namespace osu.Game.Overlays.Options.Sections.Audio
-namespace osu.Game.Overlays.Options.Audio
 {
-    public class OffsetAdjustmentOptions : OptionsSubsection
+    public class OffsetOptions : OptionsSubsection
     {
         protected override string Header => "Offset Adjustment";
 
@@ -19,7 +18,7 @@ namespace osu.Game.Overlays.Options.Audio
         {
             Children = new Drawable[]
             {
-                new SliderOption<int>
+                new OptionSlider<int>
                 {
                     LabelText = "Universal Offset",
                     Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.Offset)

osu.Game/Overlays/Options/Sections/Audio/VolumeOptions.cs

@@ -1,15 +1,13 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Audio
+namespace osu.Game.Overlays.Options.Sections.Audio
 {
     public class VolumeOptions : OptionsSubsection
     {
@@ -20,10 +18,10 @@ namespace osu.Game.Overlays.Options.Audio
         {
             Children = new Drawable[]
             {
-                new SliderOption<double> { LabelText = "Master", Bindable = audio.Volume },
+                new OptionSlider<double> { LabelText = "Master", Bindable = audio.Volume },
-                new SliderOption<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
+                new OptionSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
-                new SliderOption<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
+                new OptionSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Ignore beatmap hitsounds",
                     Bindable = config.GetBindable<bool>(OsuConfig.IgnoreBeatmapSamples)

osu.Game/Overlays/Options/Sections/AudioSection.cs

@@ -1,11 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
+using osu.Framework;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Game.Graphics;
-
+using osu.Game.Overlays.Options.Sections.Audio;
-namespace osu.Game.Overlays.Options.Audio
+
+namespace osu.Game.Overlays.Options.Sections
 {
     public class AudioSection : OptionsSection
     {
@@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Options.Audio
             {
                 new AudioDevicesOptions { Alpha = RuntimeInfo.IsWindows ? 1 : 0 },
                 new VolumeOptions(),
-                new OffsetAdjustmentOptions(),
+                new OffsetOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/EditorSection.cs

@@ -1,15 +1,14 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using OpenTK;
 
-namespace osu.Game.Overlays.Options
+namespace osu.Game.Overlays.Options.Sections
 {
     public class EditorSection : OptionsSection
     {
@@ -22,32 +21,32 @@ namespace osu.Game.Overlays.Options
             content.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Background video",
                     Bindable = config.GetBindable<bool>(OsuConfig.VideoEditor)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Always use default skin",
                     Bindable = config.GetBindable<bool>(OsuConfig.EditorDefaultSkin)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Snaking sliders",
                     Bindable = config.GetBindable<bool>(OsuConfig.EditorSnakingSliders)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Hit animations",
                     Bindable = config.GetBindable<bool>(OsuConfig.EditorHitAnimations)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Follow points",
                     Bindable = config.GetBindable<bool>(OsuConfig.EditorFollowPoints)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Stacking",
                     Bindable = config.GetBindable<bool>(OsuConfig.EditorStacking)

osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs

@@ -1,17 +1,15 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
+using osu.Framework.Allocation;
-using osu.Framework.Allocation;
+using osu.Framework.Configuration;
-using osu.Framework.Configuration;
+using osu.Framework.Graphics;
-using osu.Framework.Graphics;
+using osu.Game.Configuration;
-using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
-using osu.Framework.Graphics.UserInterface;
+
-using osu.Game.Configuration;
+namespace osu.Game.Overlays.Options.Sections.Gameplay
-
-namespace osu.Game.Overlays.Options.Gameplay
 {
-    public class GeneralGameplayOptions : OptionsSubsection
+    public class GeneralOptions : OptionsSubsection
     {
         protected override string Header => "General";
 
@@ -20,42 +18,42 @@ namespace osu.Game.Overlays.Options.Gameplay
         {
             Children = new Drawable[]
             {
-                new SliderOption<int>
+                new OptionSlider<int>
                 {
                     LabelText = "Background dim",
                     Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel)
                 },
-                new DropdownOption<ProgressBarType>
+                new OptionDropdown<ProgressBarType>
                 {
                     LabelText = "Progress display",
                     Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
                 },
-                new DropdownOption<ScoreMeterType>
+                new OptionDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
                     Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)
                 },
-                new SliderOption<double>
+                new OptionSlider<double>
                 {
                     LabelText = "Score meter size",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.ScoreMeterScale)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuConfig.KeyOverlay)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show approach circle on first \"Hidden\" object",
                     Bindable = config.GetBindable<bool>(OsuConfig.HiddenShowFirstApproach)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Scale osu!mania scroll speed with BPM",
                     Bindable = config.GetBindable<bool>(OsuConfig.ManiaSpeedBPMScale)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Remember osu!mania scroll speed per beatmap",
                     Bindable = config.GetBindable<bool>(OsuConfig.UsePerBeatmapManiaSpeed)

osu.Game/Overlays/Options/Sections/Gameplay/SongSelectOptions.cs

@@ -1,17 +1,14 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
+using osu.Framework.Allocation;
-using osu.Framework.Allocation;
+using osu.Framework.Configuration;
-using osu.Framework.Configuration;
+using osu.Framework.Graphics;
-using osu.Framework.Graphics;
+using osu.Game.Configuration;
-using osu.Framework.Graphics.Sprites;
+
-using osu.Game.Configuration;
+namespace osu.Game.Overlays.Options.Sections.Gameplay
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Options.Gameplay
 {
-    public class SongSelectGameplayOptions : OptionsSubsection
+    public class SongSelectOptions : OptionsSubsection
     {
         protected override string Header => "Song Select";
 
@@ -20,12 +17,12 @@ namespace osu.Game.Overlays.Options.Gameplay
         {
             Children = new Drawable[]
             {
-                new SliderOption<double>
+                new OptionSlider<double>
                 {
                     LabelText = "Display beatmaps from",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.DisplayStarsMinimum)
                 },
-                new SliderOption<double>
+                new OptionSlider<double>
                 {
                     LabelText = "up to",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.DisplayStarsMaximum)

osu.Game/Overlays/Options/Sections/GameplaySection.cs

@@ -1,10 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Game.Graphics;
-
+using osu.Game.Overlays.Options.Sections.Gameplay;
-namespace osu.Game.Overlays.Options.Gameplay
+
+namespace osu.Game.Overlays.Options.Sections
 {
     public class GameplaySection : OptionsSection
     {
@@ -13,10 +14,10 @@ namespace osu.Game.Overlays.Options.Gameplay
 
         public GameplaySection()
         {
-            Children = new Drawable[]
+            base.Children = new Drawable[]
             {
-                new GeneralGameplayOptions(),
+                new Gameplay.GeneralOptions(),
-                new SongSelectGameplayOptions(),
+                new SongSelectOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/General/LanguageOptions.cs

@@ -1,13 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.General
+namespace osu.Game.Overlays.Options.Sections.General
 {
     public class LanguageOptions : OptionsSubsection
     {
@@ -18,13 +17,13 @@ namespace osu.Game.Overlays.Options.General
         {
             Children = new Drawable[]
             {
-                new SpriteText { Text = "TODO: Dropdown" },
+                new OptionLabel { Text = "TODO: Dropdown" },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
                     Bindable = config.GetBindable<bool>(OsuConfig.ShowUnicode)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Use alternative font for chat display",
                     Bindable = config.GetBindable<bool>(OsuConfig.AlternativeChatFont)

osu.Game/Overlays/Options/Sections/General/LoginOptions.cs

@@ -1,20 +1,19 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using OpenTK;
-using osu.Framework;
 using osu.Framework.Allocation;
 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.Configuration;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Configuration;
+using OpenTK;
-using osu.Framework.Graphics.Primitives;
 
-namespace osu.Game.Overlays.Options.General
+namespace osu.Game.Overlays.Options.Sections.General
 {
     public class LoginOptions : OptionsSubsection, IOnlineComponent
     {
@@ -53,7 +52,7 @@ namespace osu.Game.Overlays.Options.General
                 case APIState.Failing:
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = "Connection failing :(",
                         },
@@ -62,7 +61,7 @@ namespace osu.Game.Overlays.Options.General
                 case APIState.Connecting:
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = "Connecting...",
                         },
@@ -71,7 +70,7 @@ namespace osu.Game.Overlays.Options.General
                 case APIState.Online:
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = $"Connected as {api.Username}!",
                         },
@@ -92,8 +91,8 @@ namespace osu.Game.Overlays.Options.General
             private TextBox password;
             private APIAccess api;
 
-            private CheckBoxOption saveUsername;
+            private OsuCheckbox saveUsername;
-            private CheckBoxOption savePassword;
+            private OsuCheckbox savePassword;
 
             private void performLogin()
             {
@@ -111,23 +110,21 @@ namespace osu.Game.Overlays.Options.General
                 Spacing = new Vector2(0, 5);
                 Children = new Drawable[]
                 {
-                    new SpriteText { Text = "Username" },
                     username = new OsuTextBox
                     {
                         RelativeSizeAxes = Axes.X,
                         Text = api?.Username ?? string.Empty
                     },
-                    new SpriteText { Text = "Password" },
                     password = new OsuPasswordTextBox
                     {
                         RelativeSizeAxes = Axes.X
                     },
-                    saveUsername = new CheckBoxOption
+                    saveUsername = new OsuCheckbox
                     {
                         LabelText = "Remember username",
                         Bindable = config.GetBindable<bool>(OsuConfig.SaveUsername),
                     },
-                    savePassword = new CheckBoxOption
+                    savePassword = new OsuCheckbox
                     {
                         LabelText = "Stay logged in",
                         Bindable = config.GetBindable<bool>(OsuConfig.SavePassword),

osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs

@@ -1,15 +1,13 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.General
+namespace osu.Game.Overlays.Options.Sections.General
 {
     public class UpdateOptions : OptionsSubsection
     {
@@ -20,12 +18,12 @@ namespace osu.Game.Overlays.Options.General
         {
             Children = new Drawable[]
             {
-                new DropdownOption<ReleaseStream>
+                new OptionDropdown<ReleaseStream>
                 {
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),
                 },
-                new SpriteText { Text = "Your osu! is up to date" }, // TODO: map this to reality
+                new OptionLabel { Text = "Your osu! is up to date" }, // TODO: map this to reality
                 new OsuButton
                 {
                     RelativeSizeAxes = Axes.X,

osu.Game/Overlays/Options/Sections/GeneralSection.cs

@@ -1,10 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Game.Graphics;
-
+using osu.Game.Overlays.Options.Sections.General;
-namespace osu.Game.Overlays.Options.General
+
+namespace osu.Game.Overlays.Options.Sections
 {
     public class GeneralSection : OptionsSection
     {

osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs

@@ -3,10 +3,10 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Graphics
+namespace osu.Game.Overlays.Options.Sections.Graphics
 {
     public class DetailOptions : OptionsSubsection
     {
@@ -17,47 +17,47 @@ namespace osu.Game.Overlays.Options.Graphics
         {
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Snaking in sliders",
                     Bindable = config.GetBindable<bool>(OsuConfig.SnakingInSliders)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Snaking out sliders",
                     Bindable = config.GetBindable<bool>(OsuConfig.SnakingOutSliders)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Background video",
                     Bindable = config.GetBindable<bool>(OsuConfig.Video)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Storyboards",
                     Bindable = config.GetBindable<bool>(OsuConfig.ShowStoryboard)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Combo bursts",
                     Bindable = config.GetBindable<bool>(OsuConfig.ComboBurst)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Hit lighting",
                     Bindable = config.GetBindable<bool>(OsuConfig.HitLighting)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Shaders",
                     Bindable = config.GetBindable<bool>(OsuConfig.Bloom)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Softening filter",
                     Bindable = config.GetBindable<bool>(OsuConfig.BloomSoftening)
                 },
-                new DropdownOption<ScreenshotFormat>
+                new OptionDropdown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)

osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs

@@ -1,15 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Configuration;
 
-namespace osu.Game.Overlays.Options.Graphics
+namespace osu.Game.Overlays.Options.Sections.Graphics
 {
     public class LayoutOptions : OptionsSubsection
     {
@@ -20,23 +17,23 @@ namespace osu.Game.Overlays.Options.Graphics
         {
             Children = new Drawable[]
             {
-                new SpriteText { Text = "Resolution: TODO dropdown" },
+                new OptionLabel { Text = "Resolution: TODO dropdown" },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Fullscreen mode",
                     Bindable = config.GetBindable<bool>(FrameworkConfig.Fullscreen),
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Letterboxing",
                     Bindable = config.GetBindable<bool>(FrameworkConfig.Letterboxing),
                 },
-                new SliderOption<int>
+                new OptionSlider<int>
                 {
                     LabelText = "Horizontal position",
                     Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionX)
                 },
-                new SliderOption<int>
+                new OptionSlider<int>
                 {
                     LabelText = "Vertical position",
                     Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionY)

osu.Game/Overlays/Options/Sections/Graphics/MainMenuOptions.cs

@@ -1,12 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Graphics
+namespace osu.Game.Overlays.Options.Sections.Graphics
 {
     public class MainMenuOptions : OptionsSubsection
     {
@@ -17,27 +16,27 @@ namespace osu.Game.Overlays.Options.Graphics
         {
             Children = new[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Snow",
                     Bindable = config.GetBindable<bool>(OsuConfig.MenuSnow)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Parallax",
                     Bindable = config.GetBindable<bool>(OsuConfig.MenuParallax)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Menu tips",
                     Bindable = config.GetBindable<bool>(OsuConfig.ShowMenuTips)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Interface voices",
                     Bindable = config.GetBindable<bool>(OsuConfig.MenuVoice)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "osu! music theme",
                     Bindable = config.GetBindable<bool>(OsuConfig.MenuMusic)

osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs

@@ -1,15 +1,13 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Graphics
+namespace osu.Game.Overlays.Options.Sections.Graphics
 {
     public class RendererOptions : OptionsSubsection
     {
@@ -22,22 +20,22 @@ namespace osu.Game.Overlays.Options.Graphics
             Children = new Drawable[]
             {
                 // TODO: this needs to be a custom dropdown at some point
-                new DropdownOption<FrameSync>
+                new OptionDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show FPS counter",
                     Bindable = osuConfig.GetBindable<bool>(OsuConfig.FpsCounter),
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Reduce dropped frames",
                     Bindable = osuConfig.GetBindable<bool>(OsuConfig.ForceFrameFlush),
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Detect performance issues",
                     Bindable = osuConfig.GetBindable<bool>(OsuConfig.DetectPerformanceIssues),

osu.Game/Overlays/Options/Sections/Graphics/SongSelectGraphicsOptions.cs

@@ -1,12 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Graphics
+namespace osu.Game.Overlays.Options.Sections.Graphics
 {
     public class SongSelectGraphicsOptions : OptionsSubsection
     {
@@ -17,7 +16,7 @@ namespace osu.Game.Overlays.Options.Graphics
         {
             Children = new[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show thumbnails",
                     Bindable = config.GetBindable<bool>(OsuConfig.SongSelectThumbnails)

osu.Game/Overlays/Options/Sections/GraphicsSection.cs

@@ -1,10 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Game.Graphics;
-
+using osu.Game.Overlays.Options.Sections.Graphics;
-namespace osu.Game.Overlays.Options.Graphics
+
+namespace osu.Game.Overlays.Options.Sections
 {
     public class GraphicsSection : OptionsSection
     {

osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs

@@ -1,10 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterface;
-
+
-namespace osu.Game.Overlays.Options.Input
+namespace osu.Game.Overlays.Options.Sections.Input
 {
     public class KeyboardOptions : OptionsSubsection
     {

osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs

@@ -1,15 +1,13 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Input
+namespace osu.Game.Overlays.Options.Sections.Input
 {
     public class MouseOptions : OptionsSubsection
     {
@@ -20,37 +18,37 @@ namespace osu.Game.Overlays.Options.Input
         {
             Children = new Drawable[]
             {
-                new SliderOption<double>
+                new OptionSlider<double>
                 {
                     LabelText = "Sensitivity",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.MouseSpeed),
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Raw input",
                     Bindable = config.GetBindable<bool>(OsuConfig.RawInput)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Map absolute raw input to the osu! window",
                     Bindable = config.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
                 },
-                new DropdownOption<ConfineMouseMode>
+                new OptionDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
                     Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Disable mouse wheel in play mode",
                     Bindable = config.GetBindable<bool>(OsuConfig.MouseDisableWheel)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Disable mouse buttons in play mode",
                     Bindable = config.GetBindable<bool>(OsuConfig.MouseDisableButtons)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Cursor ripples",
                     Bindable = config.GetBindable<bool>(OsuConfig.CursorRipple)

osu.Game/Overlays/Options/Sections/Input/OtherInputOptions.cs

@@ -1,13 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Input
+namespace osu.Game.Overlays.Options.Sections.Input
 {
     public class OtherInputOptions : OptionsSubsection
     {
@@ -18,12 +17,12 @@ namespace osu.Game.Overlays.Options.Input
         {
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "OS TabletPC support",
                     Bindable = config.GetBindable<bool>(OsuConfig.Tablet)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Wiimote/TaTaCon Drum Support",
                     Bindable = config.GetBindable<bool>(OsuConfig.Wiimote)

osu.Game/Overlays/Options/Sections/InputSection.cs

@@ -1,10 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Game.Graphics;
-
+using osu.Game.Overlays.Options.Sections.Input;
-namespace osu.Game.Overlays.Options.Input
+
+namespace osu.Game.Overlays.Options.Sections
 {
     public class InputSection : OptionsSection
     {

osu.Game/Overlays/Options/Sections/MaintenanceSection.cs

@@ -1,13 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
+using osu.Framework.Graphics;
-using osu.Framework.Graphics;
+using osu.Game.Graphics;
-using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics;
+using OpenTK;
-using osu.Game.Graphics.UserInterface;
+
-
+namespace osu.Game.Overlays.Options.Sections
-namespace osu.Game.Overlays.Options
 {
     public class MaintenanceSection : OptionsSection
     {
@@ -39,7 +38,7 @@ namespace osu.Game.Overlays.Options
                     RelativeSizeAxes = Axes.X,
                     Text = "Run osu! updater",
                 },
-                new SpriteText
+                new OptionLabel
                 {
                     Text = "TODO: osu version here",
                     Anchor = Anchor.TopCentre,

osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs

@@ -1,53 +1,51 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Online
+namespace osu.Game.Overlays.Options.Sections.Online
 {
     public class InGameChatOptions : OptionsSubsection
     {
-        private TextBoxOption chatIgnoreList;
+        private OptionTextBox chatIgnoreList;
-        private TextBoxOption chatHighlightWords;
+        private OptionTextBox chatHighlightWords;
-        protected override string Header => "In-game Chat";
+        protected override string Header => "Chat";
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Filter offensive words",
                     Bindable = config.GetBindable<bool>(OsuConfig.ChatFilter)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Filter foreign characters",
                     Bindable = config.GetBindable<bool>(OsuConfig.ChatRemoveForeign)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Log private messages",
                     Bindable = config.GetBindable<bool>(OsuConfig.LogPrivateMessages)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Block private messages from non-friends",
                     Bindable = config.GetBindable<bool>(OsuConfig.BlockNonFriendPM)
                 },
-                new SpriteText { Text = "Chat ignore list (space-seperated list)" },
+                new OptionLabel { Text = "Chat ignore list (space-seperated list)" },
-                chatIgnoreList = new TextBoxOption {
+                chatIgnoreList = new OptionTextBox {
                     RelativeSizeAxes = Axes.X,
                     Bindable = config.GetBindable<string>(OsuConfig.IgnoreList)
                 },
-                new SpriteText { Text = "Chat highlight words (space-seperated list)" },
+                new OptionLabel { Text = "Chat highlight words (space-seperated list)" },
-                chatHighlightWords = new TextBoxOption {
+                chatHighlightWords = new OptionTextBox {
                     RelativeSizeAxes = Axes.X,
                     Bindable = config.GetBindable<string>(OsuConfig.HighlightWords)
                 },

osu.Game/Overlays/Options/Sections/Online/IntegrationOptions.cs

@@ -1,15 +1,14 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Online
+namespace osu.Game.Overlays.Options.Sections.Online
 {
-    public class OnlineIntegrationOptions : OptionsSubsection
+    public class IntegrationOptions : OptionsSubsection
     {
         protected override string Header => "Integration";
 
@@ -18,22 +17,22 @@ namespace osu.Game.Overlays.Options.Online
         {
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Integrate with Yahoo! status display",
                     Bindable = config.GetBindable<bool>(OsuConfig.YahooIntegration)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Integrate with MSN Live status display",
                     Bindable = config.GetBindable<bool>(OsuConfig.MsnIntegration)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Automatically start osu!direct downloads",
                     Bindable = config.GetBindable<bool>(OsuConfig.AutomaticDownload)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Prefer no-video downloads",
                     Bindable = config.GetBindable<bool>(OsuConfig.AutomaticDownloadNoVideo)

osu.Game/Overlays/Options/Sections/Online/NotificationsOptions.cs

@@ -1,13 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Online
+namespace osu.Game.Overlays.Options.Sections.Online
 {
     public class NotificationsOptions : OptionsSubsection
     {
@@ -18,32 +17,32 @@ namespace osu.Game.Overlays.Options.Online
         {
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Enable chat ticker",
                     Bindable = config.GetBindable<bool>(OsuConfig.Ticker)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show a notification popup when someone says your name",
                     Bindable = config.GetBindable<bool>(OsuConfig.ChatHighlightName)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show chat message notifications",
                     Bindable = config.GetBindable<bool>(OsuConfig.ChatMessageNotification)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Play a sound when someone says your name",
                     Bindable = config.GetBindable<bool>(OsuConfig.ChatAudibleHighlight)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show notification popups instantly during gameplay",
                     Bindable = config.GetBindable<bool>(OsuConfig.PopupDuringGameplay)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Show notification popups when friends change status",
                     Bindable = config.GetBindable<bool>(OsuConfig.NotifyFriends)

osu.Game/Overlays/Options/Sections/Online/PrivacyOptions.cs

@@ -1,13 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Online
+namespace osu.Game.Overlays.Options.Sections.Online
 {
     public class PrivacyOptions : OptionsSubsection
     {
@@ -18,12 +17,12 @@ namespace osu.Game.Overlays.Options.Online
         {
             Children = new Drawable[]
             {
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Share your city location with others",
                     Bindable = config.GetBindable<bool>(OsuConfig.DisplayCityLocation)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Allow multiplayer game invites from all users",
                     Bindable = config.GetBindable<bool>(OsuConfig.AllowPublicInvites)

osu.Game/Overlays/Options/Sections/OnlineSection.cs

@@ -1,10 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Game.Graphics;
-
+using osu.Game.Overlays.Options.Sections.Online;
-namespace osu.Game.Overlays.Options.Online
+
+namespace osu.Game.Overlays.Options.Sections
 {
     public class OnlineSection : OptionsSection
     {
@@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Options.Online
                 new InGameChatOptions(),
                 new PrivacyOptions(),
                 new NotificationsOptions(),
-                new OnlineIntegrationOptions(),
+                new IntegrationOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/SkinSection.cs

@@ -1,18 +1,15 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using OpenTK;
 
-namespace osu.Game.Overlays.Options
+namespace osu.Game.Overlays.Options.Sections
 {
     public class SkinSection : OptionsSection
     {
@@ -25,8 +22,8 @@ namespace osu.Game.Overlays.Options
             content.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
-                new SpriteText { Text = "TODO: Skin preview textures" },
+                new OptionLabel { Text = "TODO: Skin preview textures" },
-                new SpriteText { Text = "Current skin: TODO dropdown" },
+                new OptionLabel { Text = "Current skin: TODO dropdown" },
                 new OsuButton
                 {
                     RelativeSizeAxes = Axes.X,
@@ -42,32 +39,32 @@ namespace osu.Game.Overlays.Options
                     RelativeSizeAxes = Axes.X,
                     Text = "Export as .osk",
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Ignore all beatmap skins",
                     Bindable = config.GetBindable<bool>(OsuConfig.IgnoreBeatmapSkins)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Use skin's sound samples",
                     Bindable = config.GetBindable<bool>(OsuConfig.SkinSamples)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Use Taiko skin for Taiko mode",
                     Bindable = config.GetBindable<bool>(OsuConfig.UseTaikoSkin)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Always use skin cursor",
                     Bindable = config.GetBindable<bool>(OsuConfig.UseSkinCursor)
                 },
-                new SliderOption<double>
+                new OptionSlider<double>
                 {
                     LabelText = "Cursor size",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize)
                 },
-                new CheckBoxOption
+                new OsuCheckbox
                 {
                     LabelText = "Automatic cursor size",
                     Bindable = config.GetBindable<bool>(OsuConfig.AutomaticCursorSizing)

osu.Game/Overlays/Options/Sidebar.cs

@@ -14,13 +14,13 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionsSidebar : Container
+    public class Sidebar : Container
     {
         private FlowContainer content;
         internal const int default_width = 60, expanded_width = 200;
         protected override Container<Drawable> Content => content;
 
-        public OptionsSidebar()
+        public Sidebar()
         {
             RelativeSizeAxes = Axes.Y;
             InternalChildren = new Drawable[]

osu.Game/Overlays/Options/SidebarButton.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
@@ -19,6 +20,7 @@ namespace osu.Game.Overlays.Options
         private SpriteText headerText;
         private Box backgroundBox;
         private Box selectionIndicator;
+        public Container text;
         public Action Action;
 
         private OptionsSection section;
@@ -44,15 +46,21 @@ namespace osu.Game.Overlays.Options
             {
                 selected = value;
                 if (selected)
+                {
                     selectionIndicator.FadeIn(50);
+                    text.FadeColour(Color4.White, 50);
+                }
                 else
+                {
                     selectionIndicator.FadeOut(50);
+                    text.FadeColour(OsuColour.Gray(0.6f), 50);
+                }
             }
         }
 
         public SidebarButton()
         {
-            Height = OptionsSidebar.default_width;
+            Height = Sidebar.default_width;
             RelativeSizeAxes = Axes.X;
             Children = new Drawable[]
             {
@@ -63,12 +71,18 @@ namespace osu.Game.Overlays.Options
                     Colour = OsuColour.Gray(60),
                     Alpha = 0,
                 },
-                new Container
+                text = new Container
                 {
-                    Width = OptionsSidebar.default_width,
+                    Width = Sidebar.default_width,
                     RelativeSizeAxes = Axes.Y,
                     Children = new[]
                     {
+                        headerText = new OsuSpriteText
+                        {
+                            Position = new Vector2(Sidebar.default_width + 10, 0),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        },
                         drawableIcon = new TextAwesome
                         {
                             Anchor = Anchor.Centre,
@@ -76,12 +90,6 @@ namespace osu.Game.Overlays.Options
                         },
                     }
                 },
-                headerText = new SpriteText
-                {
-                    Position = new Vector2(OptionsSidebar.default_width + 10, 0),
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                },
                 selectionIndicator = new Box
                 {
                     Alpha = 0,
@@ -96,7 +104,7 @@ namespace osu.Game.Overlays.Options
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            selectionIndicator.Colour = colours.Pink;
+            selectionIndicator.Colour = colours.Yellow;
         }
 
         protected override bool OnClick(InputState state)

osu.Game/Overlays/OptionsOverlay.cs

@@ -16,14 +16,10 @@ using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Overlays.Options;
-using osu.Game.Overlays.Options.Audio;
-using osu.Game.Overlays.Options.Gameplay;
-using osu.Game.Overlays.Options.General;
-using osu.Game.Overlays.Options.Graphics;
-using osu.Game.Overlays.Options.Input;
-using osu.Game.Overlays.Options.Online;
 using System;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.Options.Sections;
 
 namespace osu.Game.Overlays
 {
@@ -33,14 +29,14 @@ namespace osu.Game.Overlays
 
         public const float TRANSITION_LENGTH = 600;
 
-        public const float SIDEBAR_WIDTH = OptionsSidebar.default_width;
+        public const float SIDEBAR_WIDTH = Sidebar.default_width;
 
         private const float width = 400;
         
         private const float sidebar_padding = 10;
 
         private ScrollContainer scrollContainer;
-        private OptionsSidebar sidebar;
+        private Sidebar sidebar;
         private SidebarButton[] sidebarButtons;
         private OptionsSection[] sections;
         private float lastKnownScroll;
@@ -90,13 +86,13 @@ namespace osu.Game.Overlays
 
                             Children = new Drawable[]
                             {
-                                new SpriteText
+                                new OsuSpriteText
                                 {
                                     Text = "settings",
                                     TextSize = 40,
                                     Margin = new MarginPadding { Left = CONTENT_MARGINS, Top = 30 },
                                 },
-                                new SpriteText
+                                new OsuSpriteText
                                 {
                                     Colour = colours.Pink,
                                     Text = "Change the way osu! behaves",
@@ -114,7 +110,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                sidebar = new OptionsSidebar
+                sidebar = new Sidebar
                 {
                     Width = SIDEBAR_WIDTH,
                     Children = sidebarButtons = sections.Select(section =>

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -90,7 +91,7 @@ namespace osu.Game.Overlays.Toolbar
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        DrawableText = new SpriteText
+                        DrawableText = new OsuSpriteText
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
@@ -106,13 +107,13 @@ namespace osu.Game.Overlays.Toolbar
                     Alpha = 0,
                     Children = new[]
                     {
-                        tooltip1 = new SpriteText
+                        tooltip1 = new OsuSpriteText
                         {
                             Shadow = true,
                             TextSize = 22,
                             Font = @"Exo2.0-Bold",
                         },
-                        tooltip2 = new SpriteText
+                        tooltip2 = new OsuSpriteText
                         {
                             Shadow = true,
                             TextSize = 16

osu.Game/Screens/GameModeWhiteBox.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
@@ -98,14 +99,14 @@ namespace osu.Game.Screens
                     Origin = Anchor.Centre,
                     Children = new[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = GetType().Name,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             TextSize = 50,
                         },
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = GetType().Namespace,
                             Anchor = Anchor.Centre,

osu.Game/Screens/Menu/Button.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
@@ -100,7 +101,7 @@ namespace osu.Game.Screens.Menu
                             Position = new Vector2(0, 0),
                             Icon = symbol
                         },
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Shadow = true,
                             Direction = FlowDirection.HorizontalOnly,

osu.Game/Screens/Play/FailDialog.cs

@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Game.Screens.Backgrounds;
 using OpenTK;
@@ -21,7 +22,7 @@ namespace osu.Game.Screens.Play
 
         public FailDialog()
         {
-            Add(new SpriteText
+            Add(new OsuSpriteText
             {
                 Text = "You failed!",
                 Anchor = Anchor.Centre,

osu.Game/Screens/Play/KeyCounter.cs

@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -85,7 +86,7 @@ namespace osu.Game.Screens.Play
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Text = Name,
                             Anchor = Anchor.Centre,
@@ -94,7 +95,7 @@ namespace osu.Game.Screens.Play
                             Position = new Vector2(0, -0.25f),
                             Colour = KeyUpTextColor
                         },
-                        countSpriteText = new SpriteText
+                        countSpriteText = new OsuSpriteText
                         {
                             Text = Count.ToString(@"#,0"),
                             Anchor = Anchor.Centre,

osu.Game/Screens/Ranking/Results.cs

@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Game.Screens.Backgrounds;
 using OpenTK;
@@ -71,17 +72,17 @@ namespace osu.Game.Screens.Ranking
                     Direction = FlowDirection.VerticalOnly,
                     Children = new Drawable[]
                     {
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             TextSize = 40,
                             Text = $@"Accuracy: {s.Accuracy:#0.00%}",
                         },
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             TextSize = 40,
                             Text = $@"Score: {s.TotalScore}",
                         },
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             TextSize = 40,
                             Text = $@"MaxCombo: {s.MaxCombo}",

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -20,6 +20,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 
 namespace osu.Game.Screens.Select
@@ -131,14 +132,14 @@ namespace osu.Game.Screens.Select
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            new SpriteText
+                            new OsuSpriteText
                             {
                                 Font = @"Exo2.0-MediumItalic",
                                 Text = beatmapSetInfo.Metadata.Artist + " -- " + beatmapSetInfo.Metadata.Title,
                                 TextSize = 28,
                                 Shadow = true,
                             },
-                            new SpriteText
+                            new OsuSpriteText
                             {
                                 Font = @"Exo2.0-MediumItalic",
                                 Text = beatmapInfo.Version,
@@ -152,14 +153,14 @@ namespace osu.Game.Screens.Select
                                 AutoSizeAxes = Axes.Both,
                                 Children = new []
                                 {
-                                    new SpriteText
+                                    new OsuSpriteText
                                     {
                                         Font = @"Exo2.0-Medium",
                                         Text = "mapped by ",
                                         TextSize = 15,
                                         Shadow = true,
                                     },
-                                    new SpriteText
+                                    new OsuSpriteText
                                     {
                                         Font = @"Exo2.0-Bold",
                                         Text = beatmapSetInfo.Metadata.Author,
@@ -204,7 +205,7 @@ namespace osu.Game.Screens.Select
             public InfoLabel(BeatmapStatistic statistic)
             {
                 AutoSizeAxes = Axes.Both;
-                Children = new[]
+                Children = new Drawable[]
                 {
                     new TextAwesome
                     {
@@ -218,7 +219,7 @@ namespace osu.Game.Screens.Select
                         Colour = new Color4(255, 221, 85, 255),
                         Scale = new Vector2(0.8f)
                     },
-                    new SpriteText
+                    new OsuSpriteText
                     {
                         Margin = new MarginPadding { Left = 13 },
                         Font = @"Exo2.0-Bold",

osu.Game/Screens/Select/FooterButton.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using System;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Select
 {
@@ -72,7 +73,7 @@ namespace osu.Game.Screens.Select
                     EdgeSmoothness = new Vector2(2, 0),
                     RelativeSizeAxes = Axes.X,
                 },
-                spriteText = new SpriteText
+                spriteText = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

osu.Game/osu.Game.csproj

@@ -66,6 +66,7 @@
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
     <Compile Include="Graphics\Backgrounds\Triangles.cs" />
     <Compile Include="Graphics\Cursor\CursorTrail.cs" />
+    <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
     <Compile Include="Graphics\UserInterface\BackButton.cs" />
     <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
     <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
@@ -96,6 +97,7 @@
     <Compile Include="Beatmaps\Timing\SampleChange.cs" />
     <Compile Include="Beatmaps\Timing\TimingChange.cs" />
     <Compile Include="Configuration\OsuConfigManager.cs" />
+    <Compile Include="Overlays\Options\OptionLabel.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarHomeButton.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarMusicButton.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarSettingsButton.cs" />
@@ -194,45 +196,45 @@
     <Compile Include="Database\BeatmapInfo.cs" />
     <Compile Include="Database\BaseDifficulty.cs" />
     <Compile Include="Graphics\UserInterface\OsuButton.cs" />
-    <Compile Include="Overlays\Options\MaintenanceSection.cs" />
+    <Compile Include="Overlays\Options\Sections\MaintenanceSection.cs" />
     <Compile Include="Overlays\Options\OptionsSection.cs" />
     <Compile Include="Overlays\Options\OptionsSubsection.cs" />
     <Compile Include="Graphics\UserInterface\LoadingAnimation.cs" />
-    <Compile Include="Overlays\Options\OptionsSidebar.cs" />
+    <Compile Include="Overlays\Options\Sidebar.cs" />
-    <Compile Include="Overlays\Options\General\GeneralSection.cs" />
+    <Compile Include="Overlays\Options\Sections\GeneralSection.cs" />
-    <Compile Include="Overlays\Options\General\LoginOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\General\LoginOptions.cs" />
-    <Compile Include="Overlays\Options\General\UpdateOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\General\UpdateOptions.cs" />
-    <Compile Include="Overlays\Options\General\LanguageOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\General\LanguageOptions.cs" />
-    <Compile Include="Overlays\Options\Graphics\GraphicsSection.cs" />
+    <Compile Include="Overlays\Options\Sections\GraphicsSection.cs" />
-    <Compile Include="Overlays\Options\Graphics\RendererOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Graphics\RendererOptions.cs" />
-    <Compile Include="Overlays\Options\Graphics\LayoutOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Graphics\LayoutOptions.cs" />
-    <Compile Include="Overlays\Options\Graphics\DetailOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Graphics\DetailOptions.cs" />
-    <Compile Include="Overlays\Options\Graphics\MainMenuOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Graphics\MainMenuOptions.cs" />
-    <Compile Include="Overlays\Options\Graphics\SongSelectGraphicsOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Graphics\SongSelectGraphicsOptions.cs" />
-    <Compile Include="Overlays\Options\Gameplay\GameplaySection.cs" />
+    <Compile Include="Overlays\Options\Sections\GameplaySection.cs" />
-    <Compile Include="Overlays\Options\Gameplay\GeneralGameplayOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Gameplay\GeneralOptions.cs" />
-    <Compile Include="Overlays\Options\Gameplay\SongSelectGameplayOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Gameplay\SongSelectOptions.cs" />
-    <Compile Include="Overlays\Options\Audio\AudioSection.cs" />
+    <Compile Include="Overlays\Options\Sections\AudioSection.cs" />
-    <Compile Include="Overlays\Options\Audio\AudioDevicesOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\AudioDevicesOptions.cs" />
-    <Compile Include="Overlays\Options\Audio\VolumeOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\VolumeOptions.cs" />
-    <Compile Include="Overlays\Options\Audio\OffsetAdjustmentOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\OffsetOptions.cs" />
-    <Compile Include="Overlays\Options\Input\InputSection.cs" />
+    <Compile Include="Overlays\Options\Sections\InputSection.cs" />
-    <Compile Include="Overlays\Options\Input\MouseOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Input\MouseOptions.cs" />
-    <Compile Include="Overlays\Options\Input\KeyboardOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Input\KeyboardOptions.cs" />
-    <Compile Include="Overlays\Options\Input\OtherInputOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Input\OtherInputOptions.cs" />
-    <Compile Include="Overlays\Options\Online\OnlineSection.cs" />
+    <Compile Include="Overlays\Options\Sections\OnlineSection.cs" />
-    <Compile Include="Overlays\Options\Online\OnlineIntegrationOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Online\IntegrationOptions.cs" />
-    <Compile Include="Overlays\Options\Online\InGameChatOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Online\InGameChatOptions.cs" />
-    <Compile Include="Overlays\Options\EditorSection.cs" />
+    <Compile Include="Overlays\Options\Sections\EditorSection.cs" />
-    <Compile Include="Overlays\Options\SkinSection.cs" />
+    <Compile Include="Overlays\Options\Sections\SkinSection.cs" />
-    <Compile Include="Overlays\Options\Online\PrivacyOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Online\PrivacyOptions.cs" />
-    <Compile Include="Overlays\Options\Online\NotificationsOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Online\NotificationsOptions.cs" />
-    <Compile Include="Overlays\Options\CheckBoxOption.cs" />
+    <Compile Include="Graphics\UserInterface\OsuCheckbox.cs" />
     <Compile Include="Overlays\Options\SidebarButton.cs" />
-    <Compile Include="Overlays\Options\TextBoxOption.cs" />
+    <Compile Include="Overlays\Options\OptionTextBox.cs" />
-    <Compile Include="Overlays\Options\SliderOption.cs" />
+    <Compile Include="Overlays\Options\OptionSlider.cs" />
     <Compile Include="Configuration\ProgressBarType.cs" />
-    <Compile Include="Overlays\Options\DropdownOption.cs" />
+    <Compile Include="Overlays\Options\OptionDropdown.cs" />
     <Compile Include="Configuration\RankingType.cs" />
     <Compile Include="Configuration\ScoreMeterType.cs" />
     <Compile Include="Configuration\ReleaseStream.cs" />