diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index c3579b923d..d7fe33f6a0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -198,13 +198,15 @@
                        BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}"
                        TargetType="{x:Type Controls:ToggleSwitch}">
                     <Setter Property="OffLabel" Value="False" />
+                    <Setter Property="OffSwitchBrush" Value="Red" />
                     <Setter Property="OnLabel" Value="True" />
-                    <Setter Property="SwitchForeground" Value="Red" />
+                    <Setter Property="OnSwitchBrush" Value="Green" />
                 </Style>
                 <Style x:Key="CustomMetroToggleSwitchButton"
                        BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}"
                        TargetType="{x:Type Controls:ToggleSwitchButton}">
-                    <Setter Property="SwitchForeground" Value="YellowGreen" />
+                    <Setter Property="OffSwitchBrush" Value="DarkRed" />
+                    <Setter Property="OnSwitchBrush" Value="DarkGreen" />
                 </Style>
             </StackPanel.Resources>
             <Label Content="Toggle switch" Style="{DynamicResource DescriptionHeaderStyle}" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
index 8b950c0604..278a166fc9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
@@ -205,7 +205,7 @@
                                IsNavigationEnabled="{Binding ElementName=ShowNaviCheckBox, Path=IsChecked, Mode=OneWay}"
                                ItemTemplate="{StaticResource ImageDataTemplate}"
                                ItemsSource="{Binding FlipViewImages, Mode=OneWay}"
-                               MouseOverGlowEnabled="{Binding ElementName=ShowMouseOverCheckBox, Path=IsChecked, Mode=OneWay}"
+                               MouseHoverBorderEnabled="{Binding ElementName=ShowMouseOverCheckBox, Path=IsChecked, Mode=OneWay}"
                                Orientation="{Binding ElementName=Orientation, Path=SelectedValue, Mode=OneWay}" />
             <StackPanel HorizontalAlignment="Center"
                         DataContext="{Binding ElementName=FlipView2nd, Mode=OneWay}"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
index 3eb45f7ec5..829fd09a93 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -14,6 +14,14 @@
     <UserControl.Resources>
         <Thickness x:Key="ColumnMargin">10 5 10 5</Thickness>
         <Thickness x:Key="ControlMargin">0 5 0 0</Thickness>
+
+        <ObjectDataProvider x:Key="NumericInputValues"
+                            MethodName="GetValues"
+                            ObjectType="{x:Type Controls:NumericInput}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="Controls:NumericInput" />
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
     </UserControl.Resources>
 
     <AdornerDecorator>
@@ -262,23 +270,34 @@
                         Grid.IsSharedSizeScope="True">
                 <Label Content="NumericUpDown" Style="{DynamicResource DescriptionHeaderStyle}" />
 
-                <UniformGrid Columns="2">
-                    <CheckBox x:Name="ReadOnlyCheck"
-                              Margin="1"
-                              Content="IsReadOnly" />
-                    <CheckBox x:Name="HasDecimalsCheckBox"
+                <CheckBox x:Name="ReadOnlyCheck"
+                          Margin="1"
+                          Content="IsReadOnly" />
+                <CheckBox x:Name="HasDecimalsCheckBox"
+                          Margin="1"
+                          Content="HasDecimals"
+                          IsChecked="True" />
+
+                <Grid Margin="{StaticResource ControlMargin}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Label Grid.Column="0" Content="NumericInputMode" />
+                    <ComboBox x:Name="NumericInputCheckBox"
+                              Grid.Column="1"
+                              Width="100"
                               Margin="1"
-                              Content="HasDecimals"
-                              IsChecked="True" />
-                </UniformGrid>
+                              ItemsSource="{Binding Source={StaticResource NumericInputValues}}" />
+                </Grid>
 
                 <Label Content="Min=&quot;0&quot; Max=&quot;10&quot; TextAlignment=&quot;Left&quot;" />
                 <Controls:NumericUpDown x:Name="Test"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsEnabled="False"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         Maximum="10"
                                         Minimum="0"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         TextAlignment="Left"
                                         Value="5" />
 
@@ -289,33 +308,33 @@
                           IsChecked="True" />
                 <Controls:NumericUpDown Controls:TextBoxHelper.ClearTextButton="True"
                                         ButtonsAlignment="Left"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         Interval="5.5"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         IsTabStop="False"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         SnapToMultipleOfInterval="{Binding ElementName=SnapToMultipleOfIntervalCheck, Path=IsChecked, Mode=TwoWay}"
                                         Value="5" />
 
                 <Controls:NumericUpDown Margin="{StaticResource ControlMargin}"
                                         Controls:TextBoxHelper.Watermark="No Speedup when long pressed"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         Speedup="false" />
                 <Controls:NumericUpDown Margin="{StaticResource ControlMargin}"
                                         Controls:TextBoxHelper.UseFloatingWatermark="True"
                                         Controls:TextBoxHelper.Watermark="Speedup when pressed after 1000ms"
                                         Delay="1000"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         Speedup="true" />
 
                 <Label Margin="{StaticResource ControlMargin}"
                        Content="{Binding ElementName=test, Path=Value, Mode=OneWay}"
                        ContentStringFormat="StringFormat, Real Value = {0}" />
                 <Controls:NumericUpDown x:Name="test"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         Maximum="100"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         StringFormat="pcs. {0:N2} pcs."
                                         Value="5" />
                 <Grid Margin="{StaticResource ControlMargin}">
@@ -344,18 +363,18 @@
                 </Grid>
                 <Controls:NumericUpDown x:Name="StringFormatNumUpDown"
                                         Margin="{StaticResource ControlMargin}"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         Interval=".1"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         StringFormat="0,000.00"
                                         Value="{Binding ElementName=test, Path=Value, Mode=TwoWay}" />
 
                 <Label Content="Select all on focus" />
                 <Controls:NumericUpDown Controls:TextBoxHelper.SelectAllOnFocus="True"
                                         ButtonsAlignment="Left"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         Interval="5"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        NumericInputMode="{Binding ElementName=NumericInputCheckBox, Path=SelectedItem, Mode=TwoWay}"
                                         Value="500" />
             </StackPanel>
 
@@ -364,9 +383,9 @@
                         Margin="{StaticResource ColumnMargin}">
                 <Label Content="HotKeyBox" Style="{DynamicResource DescriptionHeaderStyle}" />
                 <Controls:HotKeyBox Margin="{StaticResource ControlMargin}"
+                                    Controls:TextBoxHelper.Watermark="Enter hot key"
                                     AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
-                                    HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}"
-                                    Watermark="Enter hot key" />
+                                    HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
                 <TextBlock Margin="{StaticResource ControlMargin}"
                            Foreground="{DynamicResource DarkIdealForegroundDisabledBrush}"
                            Text="Try SHIFT+D to demonstrate validation" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
index 310d241bab..0409d8969c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
@@ -4,6 +4,7 @@
 #endif
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using MetroDemo.ExampleWindows;
@@ -440,8 +441,9 @@ private void MenuWindowWithShadowOnClick(object sender, RoutedEventArgs e)
         {
             var w = this.GetTestWindow();
             w.Content = new TextBlock() { Text = "Window with drop shadow", FontSize = 28, FontWeight = FontWeights.Light, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center };
-            // use this to test the obsolete under the hood code
-            w.EnableDWMDropShadow = true;
+            w.BorderThickness = new Thickness(0);
+            w.BorderBrush = null;
+            w.GlowBrush = Brushes.Black;
             w.Show();
         }
 
diff --git a/src/MahApps.Metro/Actions/CloseTabItemAction.cs b/src/MahApps.Metro/Actions/CloseTabItemAction.cs
index 5c1f657e3b..b18ab5b4eb 100644
--- a/src/MahApps.Metro/Actions/CloseTabItemAction.cs
+++ b/src/MahApps.Metro/Actions/CloseTabItemAction.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Linq;
-using System.Windows;
 using System.Windows.Controls;
 using MahApps.Metro.Controls;
 
@@ -13,34 +12,6 @@ public class CloseTabItemAction : CommandTriggerAction
 
         private TabItem AssociatedTabItem => this.associatedTabItem ?? (this.associatedTabItem = this.AssociatedObject.TryFindParent<TabItem>());
 
-        [Obsolete("This property will be deleted in the next release.")]
-        public static readonly DependencyProperty TabControlProperty =
-            DependencyProperty.Register(nameof(TabControl),
-                                        typeof(TabControl),
-                                        typeof(CloseTabItemAction),
-                                        new PropertyMetadata(default(TabControl)));
-
-        [Obsolete("This property will be deleted in the next release.")]
-        public TabControl TabControl
-        {
-            get { return (TabControl)this.GetValue(TabControlProperty); }
-            set { this.SetValue(TabControlProperty, value); }
-        }
-
-        [Obsolete("This property will be deleted in the next release.")]
-        public static readonly DependencyProperty TabItemProperty =
-            DependencyProperty.Register(nameof(TabItem),
-                                        typeof(TabItem),
-                                        typeof(CloseTabItemAction),
-                                        new PropertyMetadata(default(TabItem)));
-
-        [Obsolete("This property will be deleted in the next release.")]
-        public TabItem TabItem
-        {
-            get { return (TabItem)this.GetValue(TabItemProperty); }
-            set { this.SetValue(TabItemProperty, value); }
-        }
-
         protected override void Invoke(object parameter)
         {
             if (this.AssociatedObject == null || (this.AssociatedObject != null && !this.AssociatedObject.IsEnabled))
diff --git a/src/MahApps.Metro/Actions/SetFlyoutOpenAction.cs b/src/MahApps.Metro/Actions/SetFlyoutOpenAction.cs
deleted file mode 100644
index ff9a55d3a5..0000000000
--- a/src/MahApps.Metro/Actions/SetFlyoutOpenAction.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Interactivity;
-using MahApps.Metro.Controls;
-
-namespace MahApps.Metro.Actions
-{
-    [Obsolete(@"This TargetedTriggerAction will be deleted in the next release.")]
-    public class SetFlyoutOpenAction : TargetedTriggerAction<FrameworkElement>
-    {
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(bool), typeof(SetFlyoutOpenAction), new PropertyMetadata(default(bool)));
-
-        public bool Value
-        {
-            get { return (bool)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
-
-        protected override void Invoke(object parameter)
-        {
-            ((Flyout) TargetObject).IsOpen = Value;
-        }
-    }
-}
diff --git a/src/MahApps.Metro/Controls/CloseCommand.cs b/src/MahApps.Metro/Controls/CloseCommand.cs
deleted file mode 100644
index 0c5c3759fb..0000000000
--- a/src/MahApps.Metro/Controls/CloseCommand.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Windows.Input;
-
-namespace MahApps.Metro.Controls
-{
-    internal class CloseCommand : ICommand
-    {
-        private readonly Func<object, bool> canExecute;
-        private readonly Action<object> executeAction;
-
-        public CloseCommand(Func<object, bool> canExecute, Action<object> executeAction)
-        {
-            this.canExecute = canExecute;
-            this.executeAction = executeAction;
-        }
-
-        /// <summary>
-        /// Defines the method that determines whether the command can execute in its current state.
-        /// </summary>
-        /// <returns>
-        /// true if this command can be executed; otherwise, false.
-        /// </returns>
-        /// <param name="parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
-        public bool CanExecute(object parameter)
-        {
-            return this.canExecute != null && this.canExecute(parameter);
-        }
-
-        /// <summary>
-        /// Defines the method to be called when the command is invoked.
-        /// </summary>
-        /// <param name="parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
-        public void Execute(object parameter)
-        {
-            this.executeAction?.Invoke(parameter);
-        }
-
-        public event EventHandler CanExecuteChanged
-        {
-            add { CommandManager.RequerySuggested += value; }
-            remove { CommandManager.RequerySuggested -= value; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/Dialogs/MetroDialogSettings.cs b/src/MahApps.Metro/Controls/Dialogs/MetroDialogSettings.cs
index ab8c29b982..3a269917bd 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MetroDialogSettings.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/MetroDialogSettings.cs
@@ -130,11 +130,5 @@ public MetroDialogSettings()
         /// Gets or sets the text used for the second auxiliary button.
         /// </summary>
         public string SecondAuxiliaryButtonText { get; set; }
-
-        /// <summary>
-        /// If set, stops standard resource dictionaries being applied to the dialog.
-        /// </summary>
-        [Obsolete("This property will be deleted in the next release.")]
-        public bool SuppressDefaultResources { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/FlipView.cs b/src/MahApps.Metro/Controls/FlipView.cs
index 71947dda8f..a9bb9e9b76 100644
--- a/src/MahApps.Metro/Controls/FlipView.cs
+++ b/src/MahApps.Metro/Controls/FlipView.cs
@@ -496,8 +496,6 @@ private static void ExecuteWhenLoaded(FlipView flipview, Action body)
         public static readonly DependencyProperty DownTransitionProperty = DependencyProperty.Register("DownTransition", typeof(TransitionType), typeof(FlipView), new PropertyMetadata(TransitionType.Down));
         public static readonly DependencyProperty LeftTransitionProperty = DependencyProperty.Register("LeftTransition", typeof(TransitionType), typeof(FlipView), new PropertyMetadata(TransitionType.LeftReplace));
         public static readonly DependencyProperty RightTransitionProperty = DependencyProperty.Register("RightTransition", typeof(TransitionType), typeof(FlipView), new PropertyMetadata(TransitionType.RightReplace));
-        [Obsolete("This property will be deleted in the next release. You should use now MouseHoverBorderEnabled instead.")]
-        public static readonly DependencyProperty MouseOverGlowEnabledProperty = DependencyProperty.Register("MouseOverGlowEnabled", typeof(bool), typeof(FlipView), new PropertyMetadata(true, (o, e) => ((FlipView)o).SetCurrentValue(MouseHoverBorderEnabledProperty, (bool)e.NewValue)));
         public static readonly DependencyProperty MouseHoverBorderEnabledProperty = DependencyProperty.Register("MouseHoverBorderEnabled", typeof(bool), typeof(FlipView), new PropertyMetadata(true));
         public static readonly DependencyProperty MouseHoverBorderBrushProperty = DependencyProperty.Register("MouseHoverBorderBrush", typeof(Brush), typeof(FlipView), new PropertyMetadata(Brushes.LightGray));
         public static readonly DependencyProperty MouseHoverBorderThicknessProperty = DependencyProperty.Register("MouseHoverBorderThickness", typeof(Thickness), typeof(FlipView), new PropertyMetadata(new Thickness(4)));
@@ -531,13 +529,6 @@ public TransitionType RightTransition
             set { this.SetValue(RightTransitionProperty, value); }
         }
 
-        [Obsolete("This property will be deleted in the next release. You should use now MouseHoverBorderEnabled instead.")]
-        public bool MouseOverGlowEnabled
-        {
-            get { return (bool)this.GetValue(MouseOverGlowEnabledProperty); }
-            set { this.SetValue(MouseOverGlowEnabledProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether the border for mouse over state is enabled or not.
         /// </summary>
diff --git a/src/MahApps.Metro/Controls/Flyout.cs b/src/MahApps.Metro/Controls/Flyout.cs
index 5df602d5c9..7eeb864340 100644
--- a/src/MahApps.Metro/Controls/Flyout.cs
+++ b/src/MahApps.Metro/Controls/Flyout.cs
@@ -57,9 +57,6 @@ public event RoutedEventHandler ClosingFinished
         public static readonly DependencyProperty CloseCommandProperty = DependencyProperty.RegisterAttached("CloseCommand", typeof(ICommand), typeof(Flyout), new UIPropertyMetadata(null));
         public static readonly DependencyProperty CloseCommandParameterProperty = DependencyProperty.Register("CloseCommandParameter", typeof(object), typeof(Flyout), new PropertyMetadata(null));
 
-        [Obsolete("This property will be deleted in the next release. Please use the new CloseFlyoutAction trigger.")]
-        internal static readonly DependencyProperty InternalCloseCommandProperty = DependencyProperty.Register("InternalCloseCommand", typeof(ICommand), typeof(Flyout));
-
         public static readonly DependencyProperty ThemeProperty = DependencyProperty.Register("Theme", typeof(FlyoutTheme), typeof(Flyout), new FrameworkPropertyMetadata(FlyoutTheme.Dark, ThemeChanged));
         public static readonly DependencyProperty ExternalCloseButtonProperty = DependencyProperty.Register("ExternalCloseButton", typeof(MouseButton), typeof(Flyout), new PropertyMetadata(MouseButton.Left));
         public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register("CloseButtonVisibility", typeof(Visibility), typeof(Flyout), new FrameworkPropertyMetadata(Visibility.Visible));
@@ -126,16 +123,6 @@ public object CloseCommandParameter
             set { this.SetValue(CloseCommandParameterProperty, value); }
         }
 
-        /// <summary>
-        /// Gets/sets a command which will be executed if the close button was clicked.
-        /// </summary>
-        [Obsolete("This property will be deleted in the next release. Please use the new CloseFlyoutAction trigger.")]
-        internal ICommand InternalCloseCommand
-        {
-            get { return (ICommand)this.GetValue(InternalCloseCommandProperty); }
-            set { this.SetValue(InternalCloseCommandProperty, value); }
-        }
-
         /// <summary>
         /// Gets/sets whether this flyout is visible.
         /// </summary>
@@ -251,9 +238,6 @@ static Flyout()
 
         public Flyout()
         {
-#pragma warning disable 618
-            this.InternalCloseCommand = new CloseCommand(this.InternalCloseCommandCanExecute, this.InternalCloseCommandExecuteAction);
-#pragma warning restore 618
             this.Loaded += (sender, args) => this.UpdateFlyoutTheme();
             this.InitializeAutoCloseTimer();
         }
@@ -263,31 +247,6 @@ protected override AutomationPeer OnCreateAutomationPeer()
             return new FlyoutAutomationPeer(this);
         }
 
-        private void InternalCloseCommandExecuteAction(object o)
-        {
-            var closeCommand = this.CloseCommand;
-            // close the Flyout only if there is no command
-            if (closeCommand == null)
-            {
-                this.SetCurrentValue(IsOpenProperty, false);
-            }
-            else
-            {
-                var closeCommandParameter = this.CloseCommandParameter ?? this;
-                if (closeCommand.CanExecute(closeCommandParameter))
-                {
-                    // force the command handler to run
-                    closeCommand.Execute(closeCommandParameter);
-                }
-            }
-        }
-
-        private bool InternalCloseCommandCanExecute(object o)
-        {
-            var closeCommand = this.CloseCommand;
-            return closeCommand == null || closeCommand.CanExecute(this.CloseCommandParameter ?? this);
-        }
-
         private void InitializeAutoCloseTimer()
         {
             this.StopAutoCloseTimer();
diff --git a/src/MahApps.Metro/Controls/Helper/ButtonHelper.cs b/src/MahApps.Metro/Controls/Helper/ButtonHelper.cs
deleted file mode 100644
index cda050baed..0000000000
--- a/src/MahApps.Metro/Controls/Helper/ButtonHelper.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-
-namespace MahApps.Metro.Controls
-{
-    using System.ComponentModel;
-
-    public static class ButtonHelper
-    {
-        [Obsolete(@"This property will be deleted in the next release. You should use ContentCharacterCasing attached property located in ControlsHelper.")]
-        public static readonly DependencyProperty PreserveTextCaseProperty =
-            DependencyProperty.RegisterAttached("PreserveTextCase", typeof(bool), typeof(ButtonHelper),
-                                                new FrameworkPropertyMetadata(
-                                                    false,
-                                                    FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsMeasure,
-                                                    (o, e) =>
-                                                        {
-                                                            var button = o as ButtonBase;
-                                                            if (button != null && e.NewValue is bool)
-                                                            {
-                                                                ControlsHelper.SetContentCharacterCasing(button, (bool)e.NewValue ? CharacterCasing.Normal : CharacterCasing.Upper);
-                                                            }
-                                                        }));
-
-        /// <summary>
-        /// Overrides the text case behavior for certain buttons.
-        /// When set to <c>true</c>, the text case will be preserved and won't be changed to upper or lower case.
-        /// </summary>
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(ButtonBase))]
-        [Obsolete(@"This property will be deleted in the next release. You should use ContentCharacterCasing attached property located in ControlsHelper.")]
-        public static bool GetPreserveTextCase(UIElement element)
-        {
-            return (bool)element.GetValue(PreserveTextCaseProperty);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release. You should use ContentCharacterCasing attached property located in ControlsHelper.")]
-        public static void SetPreserveTextCase(UIElement element, bool value)
-        {
-            element.SetValue(PreserveTextCaseProperty, value);
-        }
-
-        /// <summary>
-        /// DependencyProperty for <see cref="CornerRadius" /> property.
-        /// </summary>
-        [Obsolete(@"This property will be deleted in the next release. You should use CornerRadius attached property located in ControlsHelper.")]
-        public static readonly DependencyProperty CornerRadiusProperty
-            = DependencyProperty.RegisterAttached("CornerRadius", typeof(CornerRadius), typeof(ButtonHelper),
-                                                  new FrameworkPropertyMetadata(
-                                                      new CornerRadius(-1), // this is not valid, but this property is obsolete, set this to -1 to get the fired property changed callback
-                                                      FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
-                                                      (o, e) =>
-                                                          {
-                                                              var element = o as UIElement;
-                                                              if (element != null && e.OldValue != e.NewValue && e.NewValue is CornerRadius)
-                                                              {
-                                                                  ControlsHelper.SetCornerRadius(element, (CornerRadius)e.NewValue);
-                                                              }
-                                                          }));
-
-        /// <summary> 
-        /// The CornerRadius property allows users to control the roundness of the button corners independently by 
-        /// setting a radius value for each corner. Radius values that are too large are scaled so that they
-        /// smoothly blend from corner to corner. (Can be used e.g. at MetroButton style)
-        /// Description taken from original Microsoft description :-D
-        /// </summary>
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(ButtonBase))]
-        [AttachedPropertyBrowsableForType(typeof(ToggleButton))]
-        [Obsolete(@"This property will be deleted in the next release. You should use CornerRadius attached property located in ControlsHelper.")]
-        public static CornerRadius GetCornerRadius(UIElement element)
-        {
-            return (CornerRadius)element.GetValue(CornerRadiusProperty);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release. You should use CornerRadius attached property located in ControlsHelper.")]
-        public static void SetCornerRadius(UIElement element, CornerRadius value)
-        {
-            element.SetValue(CornerRadiusProperty, value);
-        }
-    }
-}
diff --git a/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs b/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
index 69df01576f..7981d52f3b 100644
--- a/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -130,37 +129,6 @@ public static void SetHeaderMargin(UIElement element, Thickness value)
             element.SetValue(HeaderMarginProperty, value);
         }
 
-        /// <summary>
-        /// This property can be used to set the button width (PART_ClearText) of TextBox, PasswordBox, ComboBox, NumericUpDown
-        /// </summary>
-        [Obsolete(@"This property will be deleted in the next release. You should use TextBoxHelper.ButtonWidth instead.")]
-        public static readonly DependencyProperty ButtonWidthProperty =
-            DependencyProperty.RegisterAttached("ButtonWidth", typeof(double), typeof(ControlsHelper),
-                                                new FrameworkPropertyMetadata(
-                                                    22d,
-                                                    FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.Inherits,
-                                                    (o, e) =>
-                                                        {
-                                                            var element = o as UIElement;
-                                                            if (element != null && e.OldValue != e.NewValue && e.NewValue is double)
-                                                            {
-                                                                TextBoxHelper.SetButtonWidth(element, (double)e.NewValue);
-                                                            }
-                                                        }));
-
-        [Category(AppName.MahApps)]
-        [Obsolete(@"This property will be deleted in the next release. You should use TextBoxHelper.ButtonWidth instead.")]
-        public static double GetButtonWidth(DependencyObject obj)
-        {
-            return (double)obj.GetValue(ButtonWidthProperty);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release. You should use TextBoxHelper.ButtonWidth instead.")]
-        public static void SetButtonWidth(DependencyObject obj, double value)
-        {
-            obj.SetValue(ButtonWidthProperty, value);
-        }
-
         public static readonly DependencyProperty FocusBorderBrushProperty = DependencyProperty.RegisterAttached("FocusBorderBrush", typeof(Brush), typeof(ControlsHelper), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.Inherits));
         public static readonly DependencyProperty MouseOverBorderBrushProperty = DependencyProperty.RegisterAttached("MouseOverBorderBrush", typeof(Brush), typeof(ControlsHelper), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.Inherits));
 
diff --git a/src/MahApps.Metro/Controls/Helper/DataGridCellHelper.cs b/src/MahApps.Metro/Controls/Helper/DataGridCellHelper.cs
index 4b83932274..d17312f64c 100644
--- a/src/MahApps.Metro/Controls/Helper/DataGridCellHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/DataGridCellHelper.cs
@@ -1,98 +1,11 @@
-using System.Windows;
+using System.ComponentModel;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace MahApps.Metro.Controls
 {
-    using System;
-    using System.ComponentModel;
-
     public class DataGridCellHelper
     {
-        [Obsolete(@"This property will be deleted in the next release.")]
-        public static readonly DependencyProperty SaveDataGridProperty
-            = DependencyProperty.RegisterAttached("SaveDataGrid",
-                                                  typeof(bool),
-                                                  typeof(DataGridCellHelper),
-                                                  new FrameworkPropertyMetadata(default(bool), CellPropertyChangedCallback));
-
-        private static void CellPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-        {
-            var cell = dependencyObject as DataGridCell;
-            if (cell != null && e.NewValue != e.OldValue && e.NewValue is bool)
-            {
-                cell.Loaded -= DataGridCellLoaded;
-                cell.Unloaded -= DataGridCellUnloaded;
-                DataGrid dataGrid = null;
-                if ((bool)e.NewValue)
-                {
-                    dataGrid = cell.TryFindParent<DataGrid>();
-                    cell.Loaded += DataGridCellLoaded;
-                    cell.Unloaded += DataGridCellUnloaded;
-                }
-#pragma warning disable 618
-                SetDataGrid(cell, dataGrid);
-#pragma warning restore 618
-            }
-        }
-
-        static void DataGridCellLoaded(object sender, RoutedEventArgs e)
-        {
-            var cell = (DataGridCell)sender;
-#pragma warning disable 618
-            if (GetDataGrid(cell) == null)
-            {
-                var dataGrid = cell.TryFindParent<DataGrid>();
-                SetDataGrid(cell, dataGrid);
-            }
-#pragma warning restore 618
-        }
-
-        static void DataGridCellUnloaded(object sender, RoutedEventArgs e)
-        {
-#pragma warning disable 618
-            SetDataGrid((DataGridCell)sender, null);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Save the DataGrid.
-        /// </summary>
-        [AttachedPropertyBrowsableForType(typeof(DataGridCell))]
-        [Obsolete(@"This property will be deleted in the next release.")]
-        public static bool GetSaveDataGrid(UIElement element)
-        {
-            return (bool)element.GetValue(SaveDataGridProperty);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release.")]
-        public static void SetSaveDataGrid(UIElement element, bool value)
-        {
-            element.SetValue(SaveDataGridProperty, value);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release.")]
-        public static readonly DependencyProperty DataGridProperty
-            = DependencyProperty.RegisterAttached("DataGrid",
-                                                  typeof(DataGrid),
-                                                  typeof(DataGridCellHelper),
-                                                  new FrameworkPropertyMetadata(default(DataGrid)));
-
-        /// <summary>
-        /// Get the DataGrid.
-        /// </summary>
-        [AttachedPropertyBrowsableForType(typeof(DataGridCell))]
-        [Obsolete(@"This property will be deleted in the next release.")]
-        public static DataGrid GetDataGrid(UIElement element)
-        {
-            return (DataGrid)element.GetValue(DataGridProperty);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release.")]
-        public static void SetDataGrid(UIElement element, DataGrid value)
-        {
-            element.SetValue(DataGridProperty, value);
-        }
-
         public static readonly DependencyProperty SelectionUnitProperty
             = DependencyProperty.RegisterAttached("SelectionUnit",
                                                   typeof(DataGridSelectionUnit),
diff --git a/src/MahApps.Metro/Controls/Helper/ScrollBarHelper.cs b/src/MahApps.Metro/Controls/Helper/ScrollBarHelper.cs
deleted file mode 100644
index 97c31d9cf0..0000000000
--- a/src/MahApps.Metro/Controls/Helper/ScrollBarHelper.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace MahApps.Metro.Controls
-{
-    [Obsolete("This helper class will be deleted in the next release. Instead use the ScrollViewerHelper.")]
-    public static class ScrollBarHelper
-    {
-        /// <summary>
-        /// This property can be used to set vertical scrollbar left side from the tabpanel (look at MetroAnimatedSingleRowTabControl)
-        /// </summary>
-        [Obsolete("This attached property will be deleted in the next release. Instead use ScrollViewerHelper.VerticalScrollBarOnLeftSide attached property.")]
-        public static readonly DependencyProperty VerticalScrollBarOnLeftSideProperty =
-            DependencyProperty.RegisterAttached("VerticalScrollBarOnLeftSide",
-                                                typeof(bool),
-                                                typeof(ScrollBarHelper),
-                                                new FrameworkPropertyMetadata(false,
-                                                                              FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.Inherits,
-                                                                              (o, e) =>
-                                                                                  {
-                                                                                      var element = o as ScrollViewer;
-                                                                                      if (element != null && e.OldValue != e.NewValue && e.NewValue is bool)
-                                                                                      {
-                                                                                          ScrollViewerHelper.SetVerticalScrollBarOnLeftSide(element, (bool)e.NewValue);
-                                                                                      }
-                                                                                  }));
-
-        [Obsolete("This attached property will be deleted in the next release. Instead use ScrollViewerHelper.VerticalScrollBarOnLeftSide attached property.")]
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(ScrollViewer))]
-        public static bool GetVerticalScrollBarOnLeftSide(ScrollViewer obj)
-        {
-            return (bool)obj.GetValue(VerticalScrollBarOnLeftSideProperty);
-        }
-
-        [Obsolete("This attached property will be deleted in the next release. Instead use ScrollViewerHelper.VerticalScrollBarOnLeftSide attached property.")]
-        public static void SetVerticalScrollBarOnLeftSide(ScrollViewer obj, bool value)
-        {
-            obj.SetValue(VerticalScrollBarOnLeftSideProperty, value);
-        }
-    }
-}
diff --git a/src/MahApps.Metro/Controls/Helper/TabControlHelper.cs b/src/MahApps.Metro/Controls/Helper/TabControlHelper.cs
index 48fc303b51..f5050507ad 100644
--- a/src/MahApps.Metro/Controls/Helper/TabControlHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/TabControlHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -129,38 +128,6 @@ public static void SetCloseTabCommandParameter(UIElement element, object value)
             element.SetValue(CloseTabCommandParameterProperty, value);
         }
 
-        /// <summary>
-        /// Defines whether the underline below the <see cref="TabItem"/> is shown or not.
-        /// </summary>
-        [Obsolete(@"This property will be deleted in the next release. You should now use the Underlined attached property.")]
-        public static readonly DependencyProperty IsUnderlinedProperty =
-            DependencyProperty.RegisterAttached("IsUnderlined",
-                                                typeof(bool),
-                                                typeof(TabControlHelper),
-                                                new PropertyMetadata(false,
-                                                                     (o, e) =>
-                                                                         {
-                                                                             var element = o as UIElement;
-                                                                             if (element != null && e.OldValue != e.NewValue && e.NewValue is bool)
-                                                                             {
-                                                                                 TabControlHelper.SetUnderlined(element, (bool)e.NewValue ? UnderlinedType.TabItems : UnderlinedType.None);
-                                                                             }
-                                                                         }));
-
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(TabControl))]
-        [Obsolete(@"This property will be deleted in the next release. You should now use the Underlined attached property.")]
-        public static bool GetIsUnderlined(UIElement element)
-        {
-            return (bool)element.GetValue(IsUnderlinedProperty);
-        }
-
-        [Obsolete(@"This property will be deleted in the next release. You should now use the Underlined attached property.")]
-        public static void SetIsUnderlined(UIElement element, bool value)
-        {
-            element.SetValue(IsUnderlinedProperty, value);
-        }
-
         /// <summary>
         /// Defines whether the underline below the <see cref="TabItem"/> or <see cref="TabPanel"/> is shown or not.
         /// </summary>
diff --git a/src/MahApps.Metro/Controls/HotKeyBox.cs b/src/MahApps.Metro/Controls/HotKeyBox.cs
index a57db62a1a..b0f48aba9a 100644
--- a/src/MahApps.Metro/Controls/HotKeyBox.cs
+++ b/src/MahApps.Metro/Controls/HotKeyBox.cs
@@ -38,17 +38,6 @@ public bool AreModifierKeysRequired
             set { SetValue(AreModifierKeysRequiredProperty, value); }
         }
 
-        [Obsolete("This property will be deleted in the next release. Instead use TextBoxHelper.Watermark attached property.")]
-        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(
-            "Watermark", typeof(string), typeof(HotKeyBox), new PropertyMetadata(default(string)));
-
-        [Obsolete("This property will be deleted in the next release. Instead use TextBoxHelper.Watermark attached property.")]
-        public string Watermark
-        {
-            get { return (string) GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
-
         private static readonly DependencyPropertyKey TextPropertyKey = DependencyProperty.RegisterReadOnly(
             "Text", typeof(string), typeof(HotKeyBox), new PropertyMetadata(default(string)));
 
diff --git a/src/MahApps.Metro/Controls/MetroWindow.cs b/src/MahApps.Metro/Controls/MetroWindow.cs
index 019a2c8f47..7c78f77698 100644
--- a/src/MahApps.Metro/Controls/MetroWindow.cs
+++ b/src/MahApps.Metro/Controls/MetroWindow.cs
@@ -85,8 +85,6 @@ public class MetroWindow : Window
         public static readonly DependencyProperty ShowSystemMenuOnRightClickProperty = DependencyProperty.Register("ShowSystemMenuOnRightClick", typeof(bool), typeof(MetroWindow), new PropertyMetadata(true));
 
         public static readonly DependencyProperty TitlebarHeightProperty = DependencyProperty.Register("TitlebarHeight", typeof(int), typeof(MetroWindow), new PropertyMetadata(30, TitlebarHeightPropertyChangedCallback));
-        [Obsolete(@"This property will be deleted in the next release. You should use the new TitleCharacterCasing dependency property.")]
-        public static readonly DependencyProperty TitleCapsProperty = DependencyProperty.Register("TitleCaps", typeof(bool), typeof(MetroWindow), new PropertyMetadata(true, (o, e) => ((MetroWindow)o).SetCurrentValue(TitleCharacterCasingProperty, (bool)e.NewValue ? CharacterCasing.Upper : CharacterCasing.Normal)));
         public static readonly DependencyProperty TitleCharacterCasingProperty = DependencyProperty.Register("TitleCharacterCasing", typeof(CharacterCasing), typeof(MetroWindow), new FrameworkPropertyMetadata(CharacterCasing.Upper, FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsMeasure), value => CharacterCasing.Normal <= (CharacterCasing)value && (CharacterCasing)value <= CharacterCasing.Upper);
         public static readonly DependencyProperty TitleAlignmentProperty = DependencyProperty.Register("TitleAlignment", typeof(HorizontalAlignment), typeof(MetroWindow), new PropertyMetadata(HorizontalAlignment.Stretch, OnTitleAlignmentChanged));
 
@@ -129,18 +127,9 @@ public class MetroWindow : Window
         public static readonly DependencyProperty WindowButtonCommandsOverlayBehaviorProperty = DependencyProperty.Register("WindowButtonCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Always, OnShowTitleBarPropertyChangedCallback));
         public static readonly DependencyProperty IconOverlayBehaviorProperty = DependencyProperty.Register("IconOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Never, OnShowTitleBarPropertyChangedCallback));
 
-        [Obsolete(@"This property will be deleted in the next release. You should use LightMinButtonStyle or DarkMinButtonStyle in WindowButtonCommands to override the style.")]
-        public static readonly DependencyProperty WindowMinButtonStyleProperty = DependencyProperty.Register("WindowMinButtonStyle", typeof(Style), typeof(MetroWindow), new PropertyMetadata(null, OnWindowButtonStyleChanged));
-        [Obsolete(@"This property will be deleted in the next release. You should use LightMaxButtonStyle or DarkMaxButtonStyle in WindowButtonCommands to override the style.")]
-        public static readonly DependencyProperty WindowMaxButtonStyleProperty = DependencyProperty.Register("WindowMaxButtonStyle", typeof(Style), typeof(MetroWindow), new PropertyMetadata(null, OnWindowButtonStyleChanged));
-        [Obsolete(@"This property will be deleted in the next release. You should use LightCloseButtonStyle or DarkCloseButtonStyle in WindowButtonCommands to override the style.")]
-        public static readonly DependencyProperty WindowCloseButtonStyleProperty = DependencyProperty.Register("WindowCloseButtonStyle", typeof(Style), typeof(MetroWindow), new PropertyMetadata(null, OnWindowButtonStyleChanged));
-
         public static readonly DependencyProperty UseNoneWindowStyleProperty = DependencyProperty.Register("UseNoneWindowStyle", typeof(bool), typeof(MetroWindow), new PropertyMetadata(false, OnUseNoneWindowStylePropertyChangedCallback));
         public static readonly DependencyProperty OverrideDefaultWindowCommandsBrushProperty = DependencyProperty.Register("OverrideDefaultWindowCommandsBrush", typeof(SolidColorBrush), typeof(MetroWindow));
 
-        [Obsolete(@"This property will be deleted in the next release. You should use BorderThickness=""0"" and a GlowBrush=""Black"" to get a drop shadow around the Window.")]
-        public static readonly DependencyProperty EnableDWMDropShadowProperty = DependencyProperty.Register("EnableDWMDropShadow", typeof(bool), typeof(MetroWindow), new PropertyMetadata(false, OnEnableDWMDropShadowPropertyChangedCallback));
         public static readonly DependencyProperty IsWindowDraggableProperty = DependencyProperty.Register("IsWindowDraggable", typeof(bool), typeof(MetroWindow), new PropertyMetadata(true));
 
         FrameworkElement icon;
@@ -192,29 +181,6 @@ public MetroDialogSettings MetroDialogOptions
             set { SetValue(MetroDialogOptionsProperty, value); }
         }
 
-        [Obsolete(@"This property will be deleted in the next release. You should use BorderThickness=""0"" and a GlowBrush=""Black"" to get a drop shadow around the Window.")]
-        public bool EnableDWMDropShadow
-        {
-            get { return (bool)GetValue(EnableDWMDropShadowProperty); }
-            set { SetValue(EnableDWMDropShadowProperty, value); }
-        }
-
-        private static void OnEnableDWMDropShadowPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != e.OldValue && (bool)e.NewValue)
-            {
-                var window = (MetroWindow)d;
-                window.UseDropShadow();
-            }
-        }
-
-        private void UseDropShadow()
-        {
-            this.SetCurrentValue(BorderThicknessProperty, new Thickness(0));
-            this.SetCurrentValue(BorderBrushProperty, null);
-            this.SetCurrentValue(GlowBrushProperty, Brushes.Black);
-        }
-
         public bool IsWindowDraggable
         {
             get { return (bool)GetValue(IsWindowDraggableProperty); }
@@ -245,39 +211,6 @@ public WindowCommandsOverlayBehavior IconOverlayBehavior
             set { SetValue(IconOverlayBehaviorProperty, value); }
         }
 
-        [Obsolete(@"This property will be deleted in the next release. You should use LightMinButtonStyle or DarkMinButtonStyle in WindowButtonCommands to override the style.")]
-        public Style WindowMinButtonStyle
-        {
-            get { return (Style)this.GetValue(WindowMinButtonStyleProperty); }
-            set { SetValue(WindowMinButtonStyleProperty, value); }
-        }
-
-        [Obsolete(@"This property will be deleted in the next release. You should use LightMaxButtonStyle or DarkMaxButtonStyle in WindowButtonCommands to override the style.")]
-        public Style WindowMaxButtonStyle
-        {
-            get { return (Style)this.GetValue(WindowMaxButtonStyleProperty); }
-            set { SetValue(WindowMaxButtonStyleProperty, value); }
-        }
-
-        [Obsolete(@"This property will be deleted in the next release. You should use LightCloseButtonStyle or DarkCloseButtonStyle in WindowButtonCommands to override the style.")]
-        public Style WindowCloseButtonStyle
-        {
-            get { return (Style)this.GetValue(WindowCloseButtonStyleProperty); }
-            set { SetValue(WindowCloseButtonStyleProperty, value); }
-        }
-
-        public static void OnWindowButtonStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue == e.OldValue)
-            {
-                return;
-            }
-
-            var window = (MetroWindow) d;
-            if (window.WindowButtonCommands != null)
-                window.WindowButtonCommands.ApplyTheme();
-        }
-
         /// <summary>
         /// Gets/sets whether the window's entrance transition animation is enabled.
         /// </summary>
@@ -633,16 +566,6 @@ private void SetVisibiltyForAllTitleElements()
             this.SetWindowEvents();
         }
 
-        /// <summary>
-        /// Gets/sets if the TitleBar's text is automatically capitalized.
-        /// </summary>
-        [Obsolete(@"This property will be deleted in the next release. You should use the new TitleCharacterCasing dependency property.")]
-        public bool TitleCaps
-        {
-            get { return (bool)GetValue(TitleCapsProperty); }
-            set { SetValue(TitleCapsProperty, value); }
-        }
-
         /// <summary>
         /// Character casing of the title
         /// </summary>
@@ -755,12 +678,6 @@ public Storyboard OverlayFadeOut
             set { SetValue(OverlayFadeOutProperty, value); }
         }
 
-        [Obsolete("This property will be deleted in the next release.")]
-        public string WindowTitle
-        {
-            get { return TitleCaps ? Title.ToUpper() : Title; }
-        }
-
         private bool CanUseOverlayFadingStoryboard(Storyboard sb, out DoubleAnimation animation)
         {
             animation = null;
@@ -1015,13 +932,6 @@ private void MetroWindow_DataContextChanged(object sender, DependencyPropertyCha
 
         private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
         {
-#pragma warning disable 618
-            if (EnableDWMDropShadow)
-            {
-                this.UseDropShadow();
-            }
-#pragma warning restore 618
-
             if (this.WindowTransitionsEnabled)
             {
                 VisualStateManager.GoToState(this, "AfterLoaded", true);
diff --git a/src/MahApps.Metro/Controls/NumericUpDown.cs b/src/MahApps.Metro/Controls/NumericUpDown.cs
index 47352ebe60..07c832948c 100644
--- a/src/MahApps.Metro/Controls/NumericUpDown.cs
+++ b/src/MahApps.Metro/Controls/NumericUpDown.cs
@@ -129,20 +129,6 @@ public class NumericUpDown : Control
                                             }
                                         }));
 
-        [Obsolete("This property will be deleted in the next release. You should use TextBoxHelper.SelectAllOnFocus instead.")]
-        public static readonly DependencyProperty SelectAllOnFocusProperty = DependencyProperty.Register(
-            "SelectAllOnFocus",
-            typeof(bool),
-            typeof(NumericUpDown),
-            new PropertyMetadata(true, (o, e) => TextBoxHelper.SetSelectAllOnFocus(o, (bool)e.NewValue)));
-
-        [Obsolete("This property will be deleted in the next release. Please use the new NumericInputMode property instead.")]
-        public static readonly DependencyProperty HasDecimalsProperty = DependencyProperty.Register(
-            "HasDecimals",
-            typeof(bool), 
-            typeof(NumericUpDown),
-            new FrameworkPropertyMetadata(true, OnHasDecimalsChanged));
-
         public static readonly DependencyProperty NumericInputModeProperty = DependencyProperty.Register(
             "NumericInputMode",
             typeof(NumericInput),
@@ -375,20 +361,9 @@ public double Interval
             set { SetValue(IntervalProperty, value); }
         }
 
-        [Obsolete(@"This property will be deleted in the next release. You should use Controls:TextBoxHelper.SelectAllOnFocus instead.")]
-        [Bindable(true)]
-        [Category("Behavior")]
-        [DefaultValue(true)]
-        public bool SelectAllOnFocus
-        {
-            get { return (bool)GetValue(SelectAllOnFocusProperty); }
-            set { SetValue(SelectAllOnFocusProperty, value); }
-        }
-
         /// <summary>
         ///     Gets or sets a value indicating whether the text can be changed by the use of the up or down buttons only.
         /// </summary>
-
         [Bindable(true)]
         [Category("Appearance")]
         [DefaultValue(false)]
@@ -468,19 +443,6 @@ private CultureInfo SpecificCultureInfo
             get { return Culture ?? Language.GetSpecificCulture(); }
         }
 
-        /// <summary>
-        ///     Indicates if the NumericUpDown should show the decimal separator or not.
-        /// </summary>
-        [Obsolete("This property will be deleted in the next release. Please use the new NumericInputMode property instead.")]
-        [Bindable(true)]
-        [Category("Common")]
-        [DefaultValue(true)]
-        public bool HasDecimals
-        {
-            get { return (bool)GetValue(HasDecimalsProperty); }
-            set { SetValue(HasDecimalsProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets which numeric input for the NumericUpDown is allowed.
         /// </summary>
diff --git a/src/MahApps.Metro/Controls/ProgressRing.cs b/src/MahApps.Metro/Controls/ProgressRing.cs
index c316d2ced2..6e28ee0f29 100644
--- a/src/MahApps.Metro/Controls/ProgressRing.cs
+++ b/src/MahApps.Metro/Controls/ProgressRing.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 
 namespace MahApps.Metro.Controls
 {
@@ -199,24 +197,4 @@ public override void OnApplyTemplate()
             _deferredActions = null;
         }
     }
-
-    [Obsolete("This class will be deleted in the next release.")]
-    internal class WidthToMaxSideLengthConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is double)
-            {
-                var width = (double)value;
-                return width <= 20 ? 20 : width;
-            }
-
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
 }
diff --git a/src/MahApps.Metro/Controls/ToggleSwitch.cs b/src/MahApps.Metro/Controls/ToggleSwitch.cs
index 9102a44f79..ba31c90971 100644
--- a/src/MahApps.Metro/Controls/ToggleSwitch.cs
+++ b/src/MahApps.Metro/Controls/ToggleSwitch.cs
@@ -35,8 +35,6 @@ public class ToggleSwitch : HeaderedContentControl
         public static readonly DependencyProperty OnLabelProperty = DependencyProperty.Register("OnLabel", typeof(string), typeof(ToggleSwitch), new PropertyMetadata("On"));
         public static readonly DependencyProperty OffLabelProperty = DependencyProperty.Register("OffLabel", typeof(string), typeof(ToggleSwitch), new PropertyMetadata("Off"));
 
-        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
-        public static readonly DependencyProperty SwitchForegroundProperty = DependencyProperty.Register("SwitchForeground", typeof(Brush), typeof(ToggleSwitch), new PropertyMetadata(null, (o, e) => ((ToggleSwitch)o).OnSwitchBrush = e.NewValue as Brush));
         public static readonly DependencyProperty OnSwitchBrushProperty = DependencyProperty.Register("OnSwitchBrush", typeof(Brush), typeof(ToggleSwitch), null);
         public static readonly DependencyProperty OffSwitchBrushProperty = DependencyProperty.Register("OffSwitchBrush", typeof(Brush), typeof(ToggleSwitch), null);
 
@@ -95,16 +93,6 @@ public string OffLabel
             set { SetValue(OffLabelProperty, value); }
         }
 
-        /// <summary>
-        /// Gets/sets the brush used for the switch's foreground.
-        /// </summary>
-        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
-        public Brush SwitchForeground
-        {
-            get { return (Brush)GetValue(SwitchForegroundProperty); }
-            set { SetValue(SwitchForegroundProperty, value); }
-        }
-
         /// <summary>
         /// Gets/sets the brush used for the on-switch's foreground.
         /// </summary>
diff --git a/src/MahApps.Metro/Controls/ToggleSwitchButton.cs b/src/MahApps.Metro/Controls/ToggleSwitchButton.cs
index 3c9e082eb5..36be27bf16 100644
--- a/src/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ b/src/MahApps.Metro/Controls/ToggleSwitchButton.cs
@@ -34,8 +34,6 @@ public class ToggleSwitchButton : ToggleButton
         private TranslateTransform _ThumbTranslate;
         private readonly PropertyChangeNotifier isCheckedPropertyChangeNotifier;
 
-        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
-        public static readonly DependencyProperty SwitchForegroundProperty = DependencyProperty.Register("SwitchForeground", typeof(Brush), typeof(ToggleSwitchButton), new PropertyMetadata(null, (o, e) => ((ToggleSwitchButton)o).SetCurrentValue(OnSwitchBrushProperty, e.NewValue as Brush)));
         public static readonly DependencyProperty OnSwitchBrushProperty = DependencyProperty.Register("OnSwitchBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
         public static readonly DependencyProperty OffSwitchBrushProperty = DependencyProperty.Register("OffSwitchBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
 
@@ -43,16 +41,6 @@ public class ToggleSwitchButton : ToggleButton
         public static readonly DependencyProperty ThumbIndicatorDisabledBrushProperty = DependencyProperty.Register("ThumbIndicatorDisabledBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
         public static readonly DependencyProperty ThumbIndicatorWidthProperty = DependencyProperty.Register("ThumbIndicatorWidth", typeof(double), typeof(ToggleSwitchButton), new PropertyMetadata(13d));
 
-        /// <summary>
-        /// Gets/sets the brush used for the control's foreground.
-        /// </summary>
-        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
-        public Brush SwitchForeground
-        {
-            get { return (Brush)GetValue(SwitchForegroundProperty); }
-            set { SetValue(SwitchForegroundProperty, value); }
-        }
-
         /// <summary>
         /// Gets/sets the brush used for the on-switch's foreground.
         /// </summary>
diff --git a/src/MahApps.Metro/Controls/WindowButtonCommands.cs b/src/MahApps.Metro/Controls/WindowButtonCommands.cs
index e8b7cc499d..38567298c9 100644
--- a/src/MahApps.Metro/Controls/WindowButtonCommands.cs
+++ b/src/MahApps.Metro/Controls/WindowButtonCommands.cs
@@ -18,7 +18,7 @@ public class WindowButtonCommands : ContentControl, INotifyPropertyChanged
 
         public static readonly DependencyProperty LightMinButtonStyleProperty =
             DependencyProperty.Register("LightMinButtonStyle", typeof(Style), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(null, OnThemeChanged));
+                                        new PropertyMetadata(null));
 
         /// <summary>
         /// Gets or sets the value indicating current light style for the minimize button.
@@ -31,7 +31,7 @@ public Style LightMinButtonStyle
 
         public static readonly DependencyProperty LightMaxButtonStyleProperty =
             DependencyProperty.Register("LightMaxButtonStyle", typeof(Style), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(null, OnThemeChanged));
+                                        new PropertyMetadata(null));
 
         /// <summary>
         /// Gets or sets the value indicating current light style for the maximize button.
@@ -44,7 +44,7 @@ public Style LightMaxButtonStyle
 
         public static readonly DependencyProperty LightCloseButtonStyleProperty =
             DependencyProperty.Register("LightCloseButtonStyle", typeof(Style), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(null, OnThemeChanged));
+                                        new PropertyMetadata(null));
 
         /// <summary>
         /// Gets or sets the value indicating current light style for the close button.
@@ -57,7 +57,7 @@ public Style LightCloseButtonStyle
 
         public static readonly DependencyProperty DarkMinButtonStyleProperty =
             DependencyProperty.Register("DarkMinButtonStyle", typeof(Style), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(null, OnThemeChanged));
+                                        new PropertyMetadata(null));
 
         /// <summary>
         /// Gets or sets the value indicating current dark style for the minimize button.
@@ -70,7 +70,7 @@ public Style DarkMinButtonStyle
 
         public static readonly DependencyProperty DarkMaxButtonStyleProperty =
             DependencyProperty.Register("DarkMaxButtonStyle", typeof(Style), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(null, OnThemeChanged));
+                                        new PropertyMetadata(null));
 
         /// <summary>
         /// Gets or sets the value indicating current dark style for the maximize button.
@@ -83,7 +83,7 @@ public Style DarkMaxButtonStyle
 
         public static readonly DependencyProperty DarkCloseButtonStyleProperty =
             DependencyProperty.Register("DarkCloseButtonStyle", typeof(Style), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(null, OnThemeChanged));
+                                        new PropertyMetadata(null));
         
         /// <summary>
         /// Gets or sets the value indicating current dark style for the close button.
@@ -96,7 +96,7 @@ public Style DarkCloseButtonStyle
 
         public static readonly DependencyProperty ThemeProperty =
             DependencyProperty.Register("Theme", typeof(Theme), typeof(WindowButtonCommands),
-                                        new PropertyMetadata(Theme.Light, OnThemeChanged));
+                                        new PropertyMetadata(Theme.Light));
 
         /// <summary>
         /// Gets or sets the value indicating current theme.
@@ -107,16 +107,6 @@ public Theme Theme
             set { SetValue(ThemeProperty, value); }
         }
 
-        private static void OnThemeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue == e.OldValue)
-            {
-                return;
-            }
-
-            ((WindowButtonCommands)d).ApplyTheme();
-        }
-
         public static readonly DependencyProperty MinimizeProperty =
             DependencyProperty.Register("Minimize", typeof(string), typeof(WindowButtonCommands),
                                         new PropertyMetadata(null));
@@ -218,53 +208,6 @@ private string GetCaption(int id)
         }
 #pragma warning restore 618
 
-        // TODO: Change back to private once Window(Min/Max/Close)ButtonStyle properties are deleted from MetroWindow!
-        public void ApplyTheme()
-        {
-            if (close != null)
-            {
-                // TODO: Delete this if statement once WindowCloseButtonStyle property is deleted from MetroWindow!
-#pragma warning disable 618
-                if (ParentWindow?.WindowCloseButtonStyle != null)
-                {
-                    close.Style = ParentWindow.WindowCloseButtonStyle;
-                }
-#pragma warning restore 618
-                else
-                {
-                    close.Style = (Theme == Theme.Light) ? LightCloseButtonStyle : DarkCloseButtonStyle;
-                }
-            }
-            if (max != null)
-            {
-                // TODO: Delete this if statement once WindowMaxButtonStyle property is deleted from MetroWindow!
-#pragma warning disable 618
-                if (ParentWindow?.WindowMaxButtonStyle != null)
-                {
-                    max.Style = ParentWindow.WindowMaxButtonStyle;
-                }
-#pragma warning restore 618
-                else
-                {
-                    max.Style = (Theme == Theme.Light) ? LightMaxButtonStyle : DarkMaxButtonStyle;
-                }
-            }
-            if (min != null)
-            {
-                // TODO: Delete this if statement once WindowMinButtonStyle property is deleted from MetroWindow!
-#pragma warning disable 618
-                if (ParentWindow?.WindowMinButtonStyle != null)
-                {
-                    min.Style = ParentWindow.WindowMinButtonStyle;
-                }
-#pragma warning restore 618
-                else
-                {
-                    min.Style = (Theme == Theme.Light) ? LightMinButtonStyle : DarkMinButtonStyle;
-                }
-            }
-        }
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
@@ -286,8 +229,6 @@ public override void OnApplyTemplate()
             {
                 min.Click += MinimizeClick;
             }
-
-            ApplyTheme();
         }
 
         protected void OnClosingWindow(ClosingWindowEventHandlerArgs args)
diff --git a/src/MahApps.Metro/Controls/WindowSettings.cs b/src/MahApps.Metro/Controls/WindowSettings.cs
index 617a229454..61c24c3412 100644
--- a/src/MahApps.Metro/Controls/WindowSettings.cs
+++ b/src/MahApps.Metro/Controls/WindowSettings.cs
@@ -1,10 +1,6 @@
-using ControlzEx.Native;
-using ControlzEx.Standard;
-using System;
-using System.ComponentModel;
+using ControlzEx.Standard;
 using System.Configuration;
 using System.Windows;
-using System.Windows.Interop;
 
 namespace MahApps.Metro.Controls
 {
@@ -90,137 +86,4 @@ public bool UpgradeSettings
             set { this["UpgradeSettings"] = value; }
         }
     }
-
-    [Obsolete("This class is obsolete and will be deleted at the next major release.")]
-    public class WindowSettings
-    {
-        public static readonly DependencyProperty WindowPlacementSettingsProperty = DependencyProperty.RegisterAttached("WindowPlacementSettings", typeof(IWindowPlacementSettings), typeof(WindowSettings), new FrameworkPropertyMetadata(OnWindowPlacementSettingsInvalidated));
-
-        public static void SetSave(DependencyObject dependencyObject, IWindowPlacementSettings windowPlacementSettings)
-        {
-            SetWindowPlacementSettings(dependencyObject, windowPlacementSettings);
-        }
-
-        public static void SetWindowPlacementSettings(DependencyObject dependencyObject, IWindowPlacementSettings windowPlacementSettings)
-        {
-            dependencyObject.SetValue(WindowPlacementSettingsProperty, windowPlacementSettings);
-        }
-
-        private static void OnWindowPlacementSettingsInvalidated(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-        {
-            var window = dependencyObject as Window;
-            if (window == null || !(e.NewValue is IWindowPlacementSettings))
-            {
-                return;
-            }
-
-            var windowSettings = new WindowSettings(window, (IWindowPlacementSettings)e.NewValue);
-            windowSettings.Attach();
-        }
-
-        private Window _window;
-        private IWindowPlacementSettings _settings;
-
-        public WindowSettings(Window window, IWindowPlacementSettings windowPlacementSettings)
-        {
-            _window = window;
-            _settings = windowPlacementSettings;
-        }
-
-#pragma warning disable 618
-        protected virtual void LoadWindowState()
-        {
-            if (_settings == null)
-            {
-                return;
-            }
-            _settings.Reload();
-
-            // check for existing placement and prevent empty bounds
-            if (_settings.Placement == null || _settings.Placement.normalPosition.IsEmpty) return;
-
-            try
-            {
-                var wp = _settings.Placement;
-                wp.flags = 0;
-                wp.showCmd = (wp.showCmd == SW.SHOWMINIMIZED ? SW.SHOWNORMAL : wp.showCmd);
-                var hwnd = new WindowInteropHelper(_window).Handle;
-                NativeMethods.SetWindowPlacement(hwnd, wp);
-            }
-            catch (Exception ex)
-            {
-                throw new MahAppsException("Failed to set the window state from the settings file", ex);
-            }
-        }
-
-        protected virtual void SaveWindowState()
-        {
-            if (_settings == null)
-            {
-                return;
-            }
-            var hwnd = new WindowInteropHelper(_window).Handle;
-            var wp = NativeMethods.GetWindowPlacement(hwnd);
-            // check for saveable values
-            if (wp.showCmd != SW.HIDE && wp.length > 0)
-            {
-                if (wp.showCmd == SW.NORMAL)
-                {
-                    RECT rect;
-                    if (UnsafeNativeMethods.GetWindowRect(hwnd, out rect))
-                    {
-                        wp.normalPosition = rect;
-                    }
-                }
-                if (!wp.normalPosition.IsEmpty)
-                {
-                    _settings.Placement = wp;
-                }
-            }
-            _settings.Save();
-        }
-#pragma warning restore 618
-
-        private void Attach()
-        {
-            if (_window != null)
-            {
-                _window.SourceInitialized += WindowSourceInitialized;
-                _window.Closed += WindowClosed;
-            }
-        }
-
-        void WindowSourceInitialized(object sender, EventArgs e)
-        {
-            LoadWindowState();
-            _window.StateChanged += WindowStateChanged;
-            _window.Closing += WindowClosing;
-        }
-
-        private void WindowStateChanged(object sender, EventArgs e)
-        {
-            // save the settings on this state change, because hidden windows gets no window placements
-            // all the saving stuff could be so much easier with ReactiveUI :-D 
-            if (_window.WindowState == WindowState.Minimized)
-            {
-                SaveWindowState();
-            }
-        }
-
-        private void WindowClosing(object sender, CancelEventArgs e)
-        {
-            SaveWindowState();
-        }
-
-        private void WindowClosed(object sender, EventArgs e)
-        {
-            SaveWindowState();
-            _window.StateChanged -= WindowStateChanged;
-            _window.Closing -= WindowClosing;
-            _window.Closed -= WindowClosed;
-            _window.SourceInitialized -= WindowSourceInitialized;
-            _window = null;
-            _settings = null;
-        }
-    }
 }
diff --git a/src/MahApps.Metro/Converters/OffOnConverter.cs b/src/MahApps.Metro/Converters/OffOnConverter.cs
deleted file mode 100644
index fa5eb77456..0000000000
--- a/src/MahApps.Metro/Converters/OffOnConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-using MahApps.Metro.Controls;
-
-namespace MahApps.Metro.Converters
-{
-    [Obsolete(@"This converter will be deleted in the next release.")]
-    public class OffOnConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var t = (ToggleSwitch)parameter;
-
-            return t.IsChecked == true ? t.OnLabel : t.OffLabel;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return DependencyProperty.UnsetValue;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 881af35fc9..f98439ee80 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -86,6 +86,16 @@
                 <Setter TargetName="PART_Max" Property="ToolTip" Value="{Binding Restore, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Setter TargetName="PART_MaxPath" Property="Data" Value="F1M0,10L0,3 3,3 3,0 10,0 10,2 4,2 4,3 7,3 7,6 6,6 6,5 1,5 1,10z M1,10L7,10 7,7 10,7 10,2 9,2 9,6 6,6 6,9 1,9z" />
             </DataTrigger>
+            <Trigger Property="Theme" Value="Light">
+                <Setter TargetName="PART_Min" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LightMinButtonStyle}" />
+                <Setter TargetName="PART_Max" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LightMaxButtonStyle}" />
+                <Setter TargetName="PART_Close" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LightCloseButtonStyle}" />
+            </Trigger>
+            <Trigger Property="Theme" Value="Dark">
+                <Setter TargetName="PART_Min" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DarkMinButtonStyle}" />
+                <Setter TargetName="PART_Max" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DarkMaxButtonStyle}" />
+                <Setter TargetName="PART_Close" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DarkCloseButtonStyle}" />
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -200,6 +210,16 @@
                 <Setter TargetName="PART_Max" Property="ToolTip" Value="{Binding Restore, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Setter TargetName="PART_MaxPath" Property="Data" Value="M10,9 9,9 9,3 3,3 3,2 10,2 10,9Z M8,11 1,11 1,4 8,4 8,11Z M2,1 2,3 0,3 0,12 9,12 9,10 11,10 11,1 2,1Z" />
             </DataTrigger>
+            <Trigger Property="Theme" Value="Light">
+                <Setter TargetName="PART_Min" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LightMinButtonStyle}" />
+                <Setter TargetName="PART_Max" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LightMaxButtonStyle}" />
+                <Setter TargetName="PART_Close" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LightCloseButtonStyle}" />
+            </Trigger>
+            <Trigger Property="Theme" Value="Dark">
+                <Setter TargetName="PART_Min" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DarkMinButtonStyle}" />
+                <Setter TargetName="PART_Max" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DarkMaxButtonStyle}" />
+                <Setter TargetName="PART_Close" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=DarkCloseButtonStyle}" />
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/src/Mahapps.Metro.Tests/Tests/ButtonTest.cs b/src/Mahapps.Metro.Tests/Tests/ButtonTest.cs
index 075670dd6e..d342afbc36 100644
--- a/src/Mahapps.Metro.Tests/Tests/ButtonTest.cs
+++ b/src/Mahapps.Metro.Tests/Tests/ButtonTest.cs
@@ -20,21 +20,6 @@ public async Task DefaultButtonTextIsUpperCase()
             Assert.Equal("SOMETEXT", presenter.Content);
         }
 
-        [Fact]
-        [DisplayTestMethodName]
-        public async Task DefaultButtonRespectsButtonHelperPreserveTextCase()
-        {
-            await TestHost.SwitchToAppThread();
-
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<ButtonWindow>();
-
-            Button defaultButton = window.DefaultButton;
-            ButtonHelper.SetPreserveTextCase(defaultButton, true);
-            var presenter = defaultButton.FindChild<ContentPresenter>("PART_ContentPresenter");
-
-            Assert.Equal("SomeText", presenter.Content); 
-        }
-
         [Fact]
         [DisplayTestMethodName]
         public async Task DefaultButtonRespectsControlsHelperContentCharacterCasing()
diff --git a/src/Mahapps.Metro.Tests/Tests/MetroWindowTest.cs b/src/Mahapps.Metro.Tests/Tests/MetroWindowTest.cs
index 1f54ac378b..3e19f56cdc 100644
--- a/src/Mahapps.Metro.Tests/Tests/MetroWindowTest.cs
+++ b/src/Mahapps.Metro.Tests/Tests/MetroWindowTest.cs
@@ -301,29 +301,6 @@ public async Task WindowSettingsUpgradeSettingsShouldBeTrueByDefault()
             Assert.Equal(true, settings.UpgradeSettings);
         }
 
-        [Fact]
-        [DisplayTestMethodName]
-        public async Task TestTitleCapsProperty()
-        {
-            await TestHost.SwitchToAppThread();
-
-            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>(w => w.Title = "Test");
-            var titleBar = window.FindChild<ContentControl>("PART_TitleBar");
-            var titleBarContent = titleBar.FindChild<ContentPresenter>("PART_ContentPresenter");
-
-            var be = BindingOperations.GetBindingExpression(titleBarContent, ContentControl.ContentProperty);
-            Assert.NotNull(be);
-            be.UpdateTarget();
-
-            // default should be UPPER
-            Assert.Equal(true, window.TitleCaps);
-            Assert.Equal("TEST", titleBarContent.Content);
-
-            window.TitleCaps = false;
-            be.UpdateTarget();
-            Assert.Equal("Test", titleBarContent.Content);
-        }
-
         [Fact]
         [DisplayTestMethodName]
         public async Task TestTitleCharacterCasingProperty()