diff --git a/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs b/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
index 6ef7d93ca6..0eb25e7df0 100644
--- a/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
@@ -221,6 +221,43 @@ public static void SetMouseOverBorderBrush(DependencyObject obj, Brush value)
             obj.SetValue(MouseOverBorderBrushProperty, value);
         }
 
+        public static readonly DependencyProperty DisabledBorderBrushProperty
+            = DependencyProperty.RegisterAttached(
+                "DisabledBorderBrush",
+                typeof(Brush),
+                typeof(ControlsHelper),
+                new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Gets the brush used to draw the disabled border brush.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(TextBox))]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        [AttachedPropertyBrowsableForType(typeof(RadioButton))]
+        [AttachedPropertyBrowsableForType(typeof(DatePicker))]
+        [AttachedPropertyBrowsableForType(typeof(ComboBox))]
+        [AttachedPropertyBrowsableForType(typeof(Tile))]
+        public static Brush GetDisabledBorderBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(DisabledBorderBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the brush used to draw the disabled border brush.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(TextBox))]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        [AttachedPropertyBrowsableForType(typeof(RadioButton))]
+        [AttachedPropertyBrowsableForType(typeof(DatePicker))]
+        [AttachedPropertyBrowsableForType(typeof(ComboBox))]
+        [AttachedPropertyBrowsableForType(typeof(Tile))]
+        public static void SetDisabledBorderBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(DisabledBorderBrushProperty, value);
+        }
+
         /// <summary>
         /// DependencyProperty for <see cref="CornerRadius" /> property.
         /// </summary>
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 9e32884da8..8cf2565c4c 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls"
                     xmlns:mahConverters="clr-namespace:MahApps.Metro.Converters">
@@ -7,18 +7,23 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+    <Thickness x:Key="TextControlBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="TextControlThemePadding">4,4,4,4</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,1</Thickness>
+    <Thickness x:Key="TextControlPlaceholderMargin">4,0,4,0</Thickness>
+
     <!--  TextBox Style  -->
     <Style x:Key="MahApps.Styles.TextBox" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
         <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
-        <Setter Property="Padding" Value="4" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
         <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -26,7 +31,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Grid>
-                        <Border x:Name="Base"
+                        <Border x:Name="BorderElement"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
@@ -58,7 +63,7 @@
                             <TextBlock x:Name="PART_Message"
                                        Grid.Row="1"
                                        Grid.Column="0"
-                                       Margin="4 0"
+                                       Margin="{DynamicResource TextControlPlaceholderMargin}"
                                        Padding="{TemplateBinding Padding}"
                                        HorizontalAlignment="Stretch"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -73,7 +78,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Margin="4 0"
+                                            Margin="{DynamicResource TextControlPlaceholderMargin}"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{mahConverters:MathMultiplyConverter}" FallbackValue="0">
@@ -130,8 +135,8 @@
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
-                                BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                Background="{TemplateBinding mah:ControlsHelper.DisabledBorderBrush}"
+                                BorderBrush="{TemplateBinding mah:ControlsHelper.DisabledBorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
@@ -160,9 +165,9 @@
                             <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
                         </DataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Value="">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="False">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
-                        </DataTrigger>
+                        </Trigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
@@ -180,13 +185,14 @@
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -227,6 +233,7 @@
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
 
+        <Setter Property="mah:ControlsHelper.DisabledBorderBrush" Value="{DynamicResource MahApps.Brushes.Control.Disabled}" />
         <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
         <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
 
@@ -258,4 +265,285 @@
         </Setter>
     </Style>
 
+    <Style x:Key="MahApps.Styles.TextBox.Win10"
+           BasedOn="{StaticResource MahApps.Styles.TextBox}"
+           TargetType="{x:Type TextBox}">
+        <Style.Resources>
+            <Thickness x:Key="TextControlBorderThemeThickness">2,2,2,2</Thickness>
+            <Thickness x:Key="TextControlBorderThemeThicknessFocused">2,2,2,2</Thickness>
+            <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
+            <Thickness x:Key="TextControlPlaceholderMargin">0,0,0,0</Thickness>
+        </Style.Resources>
+
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextControl.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextControl.BorderBrush}" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.Foreground}" />
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.TextControl.SelectionHighlightColor}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <Grid>
+                        <Grid.Resources>
+                            <Style x:Key="MahApps.Styles.Button.TextControl.Delete" TargetType="{x:Type Button}">
+                                <Setter Property="FontStyle" Value="Normal" />
+                                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonForeground}" />
+                                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                                <Setter Property="Padding" Value="0" />
+                                <Setter Property="VerticalContentAlignment" Value="Center" />
+                            </Style>
+                        </Grid.Resources>
+
+                        <Border x:Name="BorderElement"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition x:Name="TextColumn" Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                            </Grid.RowDefinitions>
+
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Grid.Row="1"
+                                          Grid.Column="0"
+                                          Margin="0"
+                                          Padding="{TemplateBinding Padding}"
+                                          VerticalAlignment="Stretch"
+                                          Background="{x:Null}"
+                                          BorderThickness="0"
+                                          IsTabStop="False"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                          Style="{DynamicResource MahApps.Styles.ScrollViewer.TextControlContentHost}" />
+
+                            <TextBlock x:Name="PART_Message"
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Margin="{DynamicResource TextControlPlaceholderMargin}"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="Stretch"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{DynamicResource MahApps.Brushes.TextControl.PlaceholderForeground}"
+                                       Opacity="1"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                       TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}"
+                                       Visibility="Collapsed" />
+
+                            <ContentControl x:Name="PART_FloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Margin="{DynamicResource TextControlPlaceholderMargin}"
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
+                                <ContentControl.Height>
+                                    <MultiBinding Converter="{mahConverters:MathMultiplyConverter}" FallbackValue="0">
+                                        <Binding ElementName="PART_FloatingMessage"
+                                                 Mode="OneWay"
+                                                 Path="ActualHeight" />
+                                        <Binding ElementName="PART_FloatingMessageContainer"
+                                                 Mode="OneWay"
+                                                 Path="Opacity" />
+                                    </MultiBinding>
+                                </ContentControl.Height>
+                                <TextBlock x:Name="PART_FloatingMessage"
+                                           HorizontalAlignment="Stretch"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
+                                    <TextBlock.RenderTransform>
+                                        <TranslateTransform x:Name="FloatingMessageTransform">
+                                            <TranslateTransform.Y>
+                                                <MultiBinding Converter="{mahConverters:MathSubtractConverter}" FallbackValue="0">
+                                                    <Binding ElementName="PART_FloatingMessage"
+                                                             Mode="OneWay"
+                                                             Path="ActualHeight" />
+                                                    <Binding ElementName="PART_FloatingMessageContainer"
+                                                             Mode="OneWay"
+                                                             Path="ActualHeight" />
+                                                </MultiBinding>
+                                            </TranslateTransform.Y>
+                                        </TranslateTransform>
+                                    </TextBlock.RenderTransform>
+                                </TextBlock>
+                            </ContentControl>
+
+                            <Button x:Name="PART_ClearText"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="1"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    BorderThickness="0"
+                                    Command="{TemplateBinding mah:TextBoxHelper.ButtonCommand}"
+                                    CommandParameter="{TemplateBinding mah:TextBoxHelper.ButtonCommandParameter}"
+                                    CommandTarget="{TemplateBinding mah:TextBoxHelper.ButtonCommandTarget}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
+                                    Focusable="False"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource MahApps.Styles.Button.TextControl.Delete}"
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
+                                    Visibility="Visible" />
+                        </Grid>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="mah:TextBoxHelper.ClearTextButton" Value="True">
+                            <Setter TargetName="PART_ClearText" Property="Command" Value="{x:Static mah:MahAppsCommands.ClearControlCommand}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="mah:TextBoxHelper.ClearTextButton" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_ClearText" Property="Visibility" Value="Collapsed" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="mah:TextBoxHelper.ClearTextButton" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_ClearText" Property="Visibility" Value="Collapsed" />
+                        </MultiTrigger>
+                        <Trigger Property="IsKeyboardFocused" Value="False">
+                            <Setter TargetName="PART_ClearText" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                            <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
+                            <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="PART_FloatingMessageContainer" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="PART_Message" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
+                        </DataTrigger>
+
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="False">
+                            <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
+                        </Trigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.Watermark), RelativeSource={RelativeSource Self}, Converter={x:Static mahConverters:StringIsNullOrEmptyConverter.Default}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextControl.BackgroundPointerOver}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.ForegroundPointerOver}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="PART_Message" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.PlaceholderForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextControl.BackgroundDisabled}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.ForegroundDisabled}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledBorderBrush)}" />
+                            <Setter TargetName="PART_Message" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.PlaceholderForegroundDisabled}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextControl.BackgroundFocused}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.ForegroundFocused}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_Message" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.PlaceholderForegroundFocused}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="mah:ControlsHelper.DisabledBorderBrush" Value="{DynamicResource MahApps.Brushes.TextControl.BorderBrushDisabled}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextControl.BorderBrushFocused}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextControl.BorderBrushPointerOver}" />
+
+        <Setter Property="mah:TextBoxHelper.ButtonContent" Value="&#xE10A;" />
+        <Setter Property="mah:TextBoxHelper.ButtonContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <mah:FontIcon FontFamily="{DynamicResource MahApps.Fonts.Family.SymbolTheme}"
+                                  FontSize="12"
+                                  Glyph="{Binding}"
+                                  UseLayoutRounding="False" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="ButtonLayoutGrid"
+                            Background="{DynamicResource MahApps.Brushes.TextControl.ButtonBackground}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.TextControl.ButtonBorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <ContentPresenter x:Name="PART_ContentPresenter"
+                                          Margin="{TemplateBinding Padding}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonBackgroundPointerOver}" />
+                            <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonBorderBrushPointerOver}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonBackgroundPressed}" />
+                            <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonBorderBrushPressed}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.TextControl.ButtonForegroundPressed}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="ButtonLayoutGrid" Property="Opacity" Value="0" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="34" />
+    </Style>
+
+    <Style x:Key="MahApps.Styles.TextBox.Fluent"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Win10}"
+           TargetType="{x:Type TextBox}">
+        <Style.Resources>
+            <Thickness x:Key="TextControlBorderThemeThickness">1,1,1,1</Thickness>
+            <Thickness x:Key="TextControlBorderThemeThicknessFocused">2,2,2,2</Thickness>
+            <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
+            <Thickness x:Key="TextControlPlaceholderMargin">0,0,0,0</Thickness>
+        </Style.Resources>
+
+        <Setter Property="mah:ControlsHelper.CornerRadius" Value="3" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
index 8769954c75..89a85aef0c 100644
--- a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
+++ b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
@@ -9,8 +9,8 @@
       "Values": {
         "MahApps.Colors.ThemeForeground": "#FFFFFFFF",
         "MahApps.Colors.ThemeForeground20": "#51FFFFFF",
-        "MahApps.Colors.ThemeBackground": "#FF252525",
-        "MahApps.Colors.ThemeBackground20": "#51252525",
+        "MahApps.Colors.ThemeBackground": "#FF141414",
+        "MahApps.Colors.ThemeBackground20": "#51141414",
         "MahApps.Colors.Gray1": "#FFF9F9F9",
         "MahApps.Colors.Gray2": "#FF7F7F7F",
         "MahApps.Colors.Gray3": "#FF9D9D9D",
diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index cce0cb79f0..92bbb99ec0 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -383,6 +383,36 @@
 
     <markup:StaticResource x:Key="MahApps.Brushes.SystemControlDescriptionTextForeground" ResourceKey="MahApps.Brushes.SystemControlPageTextBaseMedium" />
 
+    <!--  Resources for MahApps.Styles.TextBox.Win10  -->
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.Background" ResourceKey="MahApps.Brushes.SystemControlBackgroundAltMediumLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BackgroundPointerOver" ResourceKey="MahApps.Brushes.SystemControlBackgroundAltMedium" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BackgroundFocused" ResourceKey="MahApps.Brushes.SystemControlBackgroundChromeWhite" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BackgroundDisabled" ResourceKey="MahApps.Brushes.SystemControlBackgroundBaseLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BorderBrush" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseMediumLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BorderBrushPointerOver" ResourceKey="MahApps.Brushes.SystemControlHighlightBaseMedium" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BorderBrushFocused" ResourceKey="MahApps.Brushes.SystemControlHighlightAccent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.BorderBrushDisabled" ResourceKey="MahApps.Brushes.SystemControlDisabledBaseLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.Foreground" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ForegroundPointerOver" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ForegroundFocused" ResourceKey="MahApps.Brushes.SystemControlForegroundChromeBlackHigh" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ForegroundDisabled" ResourceKey="MahApps.Brushes.SystemControlDisabledChromeDisabledLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.PlaceholderForeground" ResourceKey="MahApps.Brushes.SystemControlPageTextBaseMedium" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.PlaceholderForegroundPointerOver" ResourceKey="MahApps.Brushes.SystemControlPageTextBaseMedium" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.PlaceholderForegroundFocused" ResourceKey="MahApps.Brushes.SystemControlPageTextChromeBlackMediumLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.PlaceholderForegroundDisabled" ResourceKey="MahApps.Brushes.SystemControlDisabledChromeDisabledLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.HeaderForeground" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.HeaderForegroundDisabled" ResourceKey="MahApps.Brushes.SystemControlDisabledBaseMediumLow" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.SelectionHighlightColor" ResourceKey="MahApps.Brushes.SystemControlHighlightAccent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonBackground" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonBackgroundPointerOver" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonBackgroundPressed" ResourceKey="MahApps.Brushes.SystemControlHighlightAccent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonBorderBrush" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonBorderBrushPointerOver" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonBorderBrushPressed" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonForeground" ResourceKey="MahApps.Brushes.SystemControlForegroundChromeBlackMedium" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonForegroundPointerOver" ResourceKey="MahApps.Brushes.SystemControlHighlightAccent" />
+    <markup:StaticResource x:Key="MahApps.Brushes.TextControl.ButtonForegroundPressed" ResourceKey="MahApps.Brushes.SystemControlHighlightAltChromeWhite" />
+
     <!--  Resources for MahApps.Styles.Button.Win10  -->
     <markup:StaticResource x:Key="MahApps.Brushes.Button.Background" ResourceKey="MahApps.Brushes.SystemControlBackgroundBaseLow" />
     <markup:StaticResource x:Key="MahApps.Brushes.Button.BackgroundPointerOver" ResourceKey="MahApps.Brushes.SystemControlBackgroundBaseLow" />