diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/TextExamples.xaml
index 95b856f723..4b197876cd 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/TextExamples.xaml
@@ -1,14 +1,15 @@
-<UserControl x:Class="MetroDemo.ExampleViews.TextExamples"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             d:DesignHeight="600"
-             d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}">
+<UserControl
+    x:Class="MetroDemo.ExampleViews.TextExamples"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
+    xmlns:MetroDemo="clr-namespace:MetroDemo"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
 
     <UserControl.Resources>
         <Thickness x:Key="ColumnMargin">10 5 10 5</Thickness>
@@ -28,23 +29,28 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <StackPanel Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="0"
-                        Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="TextBox" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
-                         Text="Enabled" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ClearTextButton="True"
-                         Controls:TextBoxHelper.IsWaitingForData="True"
-                         Controls:TextBoxHelper.UseFloatingWatermark="True"
-                         Controls:TextBoxHelper.Watermark="Watermark"
-                         ToolTip="Default alignment" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                         Text="Clear button">
+            <StackPanel
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                Grid.Column="0"
+                Margin="{StaticResource ColumnMargin}">
+                <Label Content="TextBox" Style="{DynamicResource DescriptionHeaderStyle}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.AutoWatermark="True"
+                    Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                    Text="{Binding Path=Error, Mode=OneWay}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ClearTextButton="True"
+                    Controls:TextBoxHelper.IsWaitingForData="True"
+                    Controls:TextBoxHelper.UseFloatingWatermark="True"
+                    Controls:TextBoxHelper.Watermark="Watermark"
+                    ToolTip="Default alignment" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                    Text="Clear button">
                     <TextBox.Style>
                         <Style BasedOn="{StaticResource MetroTextBox}" TargetType="{x:Type TextBox}">
                             <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="True" />
@@ -60,15 +66,17 @@
                         </Style>
                     </TextBox.Style>
                 </TextBox>
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                         Controls:TextBoxHelper.ClearTextButton="True"
-                         Controls:TextBoxHelper.UseFloatingWatermark="True"
-                         Controls:TextBoxHelper.Watermark="Search...">
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                    Controls:TextBoxHelper.ClearTextButton="True"
+                    Controls:TextBoxHelper.UseFloatingWatermark="True"
+                    Controls:TextBoxHelper.Watermark="Search...">
                     <TextBox.InputBindings>
-                        <KeyBinding Key="Return"
-                                    Command="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TextBox}, Path=Text, Mode=OneWay}" />
+                        <KeyBinding
+                            Key="Return"
+                            Command="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TextBox}, Path=Text, Mode=OneWay}" />
                     </TextBox.InputBindings>
                     <TextBox.Style>
                         <Style BasedOn="{StaticResource SearchMetroTextBox}" TargetType="{x:Type TextBox}">
@@ -81,52 +89,63 @@
                         </Style>
                     </TextBox.Style>
                 </TextBox>
-                <TextBox Name="test2"
-                         Margin="{StaticResource ControlMargin}"
-                         Style="{DynamicResource SearchMetroTextBox}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
-                         Controls:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
-                         Controls:TextBoxHelper.Watermark="Enter parameter" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Style="{DynamicResource MetroButtonTextBox}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                         Controls:TextBoxHelper.ButtonContent="s"
-                         Controls:TextBoxHelper.Watermark="Custom icon style" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.Watermark="Number smaller than 10"
-                         Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         IsEnabled="False"
-                         Text="Disabled" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.Watermark="Watermark"
-                         IsEnabled="False" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ClearTextButton="True"
-                         Controls:TextBoxHelper.Watermark="Watermark"
-                         IsEnabled="False"
-                         Text="Clear button" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Style="{DynamicResource SearchMetroTextBox}"
-                         Controls:TextBoxHelper.Watermark="Search style"
-                         IsEnabled="False" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.Watermark="Number smaller than 10"
-                         IsEnabled="False"
-                         Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
-                <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.SelectAllOnFocus="True"
-                         Text="Select all on focus" />
+                <TextBox
+                    Name="test2"
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
+                    Controls:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
+                    Controls:TextBoxHelper.Watermark="Enter parameter"
+                    Style="{DynamicResource SearchMetroTextBox}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                    Controls:TextBoxHelper.ButtonContent="s"
+                    Controls:TextBoxHelper.Watermark="Custom icon style"
+                    Style="{DynamicResource MetroButtonTextBox}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.Watermark="Number smaller than 10"
+                    Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    IsEnabled="False"
+                    Text="Disabled" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.Watermark="Watermark"
+                    IsEnabled="False" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ClearTextButton="True"
+                    Controls:TextBoxHelper.Watermark="Watermark"
+                    IsEnabled="False"
+                    Text="Clear button" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.Watermark="Search style"
+                    IsEnabled="False"
+                    Style="{DynamicResource SearchMetroTextBox}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.Watermark="Number smaller than 10"
+                    IsEnabled="False"
+                    Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
+                <TextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.SelectAllOnFocus="True"
+                    Text="Select all on focus" />
             </StackPanel>
 
-            <StackPanel Grid.Row="0"
-                        Grid.Column="1"
-                        Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="RichTextBox" />
-                <RichTextBox Margin="{StaticResource ControlMargin}"
-                             Padding="5"
-                             Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
-                             IsDocumentEnabled="True">
+            <StackPanel
+                Grid.Row="0"
+                Grid.Column="1"
+                Margin="{StaticResource ColumnMargin}">
+                <Label Content="RichTextBox" Style="{DynamicResource DescriptionHeaderStyle}" />
+                <RichTextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Padding="5"
+                    Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                    IsDocumentEnabled="True">
                     <FlowDocument>
                         <Paragraph>
                             <Hyperlink NavigateUri="https://github.com/MahApps/MahApps.Metro">
@@ -137,10 +156,11 @@
                         </Paragraph>
                     </FlowDocument>
                 </RichTextBox>
-                <RichTextBox Margin="{StaticResource ControlMargin}"
-                             Padding="5"
-                             IsDocumentEnabled="True"
-                             IsReadOnly="True">
+                <RichTextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Padding="5"
+                    IsDocumentEnabled="True"
+                    IsReadOnly="True">
                     <FlowDocument>
                         <Paragraph>
                             <Hyperlink NavigateUri="https://github.com/MahApps/MahApps.Metro">
@@ -151,10 +171,11 @@
                         </Paragraph>
                     </FlowDocument>
                 </RichTextBox>
-                <RichTextBox Margin="{StaticResource ControlMargin}"
-                             Padding="5"
-                             IsDocumentEnabled="True"
-                             IsEnabled="False">
+                <RichTextBox
+                    Margin="{StaticResource ControlMargin}"
+                    Padding="5"
+                    IsDocumentEnabled="True"
+                    IsEnabled="False">
                     <FlowDocument>
                         <Paragraph>
                             <Hyperlink NavigateUri="https://github.com/MahApps/MahApps.Metro">
@@ -167,131 +188,151 @@
                 </RichTextBox>
             </StackPanel>
 
-            <StackPanel Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="2"
-                        Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="PasswordBox" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.Watermark="Password"
-                             Password="Password" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Style="{StaticResource Win8MetroPasswordBox}"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Win8"
-                             Password="Win8" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Style="{StaticResource MetroButtonRevealedPasswordBox}"
-                             Controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.HasText), Mode=OneWay}"
-                             Controls:TextBoxHelper.IsWaitingForData="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Revealed PasswordBox" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Password"
-                             Password="Password" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Style="{DynamicResource MetroButtonPasswordBox}"
-                             Controls:PasswordBoxHelper.CapsLockIcon="!"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                             Controls:TextBoxHelper.ButtonContent="4"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Custom icon style">
+            <StackPanel
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                Grid.Column="2"
+                Margin="{StaticResource ColumnMargin}">
+                <Label Content="PasswordBox" Style="{DynamicResource DescriptionHeaderStyle}" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.Watermark="Password"
+                    Password="Password" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.UseFloatingWatermark="True"
+                    Controls:TextBoxHelper.Watermark="Win8"
+                    Password="Win8"
+                    Style="{StaticResource Win8MetroPasswordBox}" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.HasText), Mode=OneWay}"
+                    Controls:TextBoxHelper.IsWaitingForData="True"
+                    Controls:TextBoxHelper.UseFloatingWatermark="True"
+                    Controls:TextBoxHelper.Watermark="Revealed PasswordBox"
+                    Style="{StaticResource MetroButtonRevealedPasswordBox}" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                    Controls:TextBoxHelper.ClearTextButton="True"
+                    Controls:TextBoxHelper.UseFloatingWatermark="True"
+                    Controls:TextBoxHelper.Watermark="Password"
+                    Password="Password" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:PasswordBoxHelper.CapsLockIcon="!"
+                    Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                    Controls:TextBoxHelper.ButtonContent="4"
+                    Controls:TextBoxHelper.UseFloatingWatermark="True"
+                    Controls:TextBoxHelper.Watermark="Custom icon style"
+                    Style="{DynamicResource MetroButtonPasswordBox}">
                     <Controls:PasswordBoxHelper.CapsLockWarningToolTip>
                         <TextBlock>
                             <Run Text="This is a custom Warning to show you that" />
-                            <Run Foreground="Red"
-                                 Text="CAPS LOCK"
-                                 TextDecorations="Underline" />
+                            <Run
+                                Foreground="Red"
+                                Text="CAPS LOCK"
+                                TextDecorations="Underline" />
                             <Run Text=" is on" />
                         </TextBlock>
                     </Controls:PasswordBoxHelper.CapsLockWarningToolTip>
                 </PasswordBox>
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             IsEnabled="False"
-                             Password="Password" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             IsEnabled="False"
-                             Password="Password" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    IsEnabled="False"
+                    Password="Password" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.ClearTextButton="True"
+                    IsEnabled="False"
+                    Password="Password" />
 
                 <Label Content="Select all on focus" />
-                <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.SelectAllOnFocus="True"
-                             Password="Password"
-                             ToolTip="Select all on focus" />
+                <PasswordBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:TextBoxHelper.SelectAllOnFocus="True"
+                    Password="Password"
+                    ToolTip="Select all on focus" />
             </StackPanel>
 
-            <StackPanel Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="3"
-                        Margin="{StaticResource ColumnMargin}"
-                        Grid.IsSharedSizeScope="True">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="NumericUpDown" />
+            <StackPanel
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                Grid.Column="3"
+                Margin="{StaticResource ColumnMargin}"
+                Grid.IsSharedSizeScope="True">
+                <Label Content="NumericUpDown" Style="{DynamicResource DescriptionHeaderStyle}" />
 
                 <UniformGrid Columns="2">
-                    <CheckBox x:Name="ReadOnlyCheck"
-                              Margin="1"
-                              Content="IsReadOnly" />
-                    <CheckBox x:Name="HasDecimalsCheckBox"
-                              Margin="1"
-                              Content="HasDecimals"
-                              IsChecked="True" />
+                    <CheckBox
+                        x:Name="ReadOnlyCheck"
+                        Margin="1"
+                        Content="IsReadOnly" />
+                    <CheckBox
+                        x:Name="HasDecimalsCheckBox"
+                        Margin="1"
+                        Content="HasDecimals"
+                        IsChecked="True" />
                 </UniformGrid>
 
                 <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"
-                                        TextAlignment="Left"
-                                        Value="5" />
+                <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"
+                    TextAlignment="Left"
+                    Value="5" />
 
                 <Label Content="Interval=&quot;5&quot; IsTabStop=&quot;False&quot;" />
-                <Controls:NumericUpDown Controls:TextBoxHelper.ClearTextButton="True"
-                                        ButtonsAlignment="Left"
-                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
-                                        Interval="5"
-                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
-                                        IsTabStop="False"
-                                        Value="5" />
+                <Controls:NumericUpDown
+                    Controls:TextBoxHelper.ClearTextButton="True"
+                    ButtonsAlignment="Left"
+                    HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
+                    Interval="5"
+                    IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                    IsTabStop="False"
+                    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}"
-                                        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}"
-                                        Speedup="true" />
+                <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}"
+                    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}"
+                    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"
-                                        StringFormat="pcs. {0:N2} pcs."
-                                        Value="5" />
+                <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"
+                    StringFormat="pcs. {0:N2} pcs."
+                    Value="5" />
                 <Grid Margin="{StaticResource ControlMargin}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol" />
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <Label Grid.Column="0" Content="StringFormat" />
-                    <TextBox Grid.Column="1"
-                             VerticalAlignment="Center"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Text="{Binding ElementName=StringFormatNumUpDown, Path=StringFormat, Mode=TwoWay, UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" />
+                    <TextBox
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Controls:TextBoxHelper.ClearTextButton="True"
+                        Text="{Binding ElementName=StringFormatNumUpDown, Path=StringFormat, Mode=TwoWay, UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" />
                 </Grid>
                 <Grid Margin="{StaticResource ControlMargin}">
                     <Grid.ColumnDefinitions>
@@ -299,45 +340,52 @@
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <Label Grid.Column="0" Content="CultureInfo" />
-                    <ComboBox Grid.Column="1"
-                              VerticalAlignment="Center"
-                              Controls:TextBoxHelper.ClearTextButton="True"
-                              DisplayMemberPath="DisplayName"
-                              ItemsSource="{Binding CultureInfos, Mode=OneWay}"
-                              SelectedItem="{Binding ElementName=StringFormatNumUpDown, Path=Culture, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
+                    <ComboBox
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Controls:TextBoxHelper.ClearTextButton="True"
+                        DisplayMemberPath="DisplayName"
+                        ItemsSource="{Binding CultureInfos, Mode=OneWay}"
+                        SelectedItem="{Binding ElementName=StringFormatNumUpDown, Path=Culture, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
                 </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}"
-                                        StringFormat="0,000.00"
-                                        Value="{Binding ElementName=test, Path=Value, Mode=TwoWay}" />
+                <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}"
+                    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}"
-                                        Value="500" />
+                <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}"
+                    Value="500" />
             </StackPanel>
 
-            <StackPanel Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="HotKeyBox" />
-                <Controls:HotKeyBox Margin="{StaticResource ControlMargin}"
-                                    Controls:ControlsHelper.ContentCharacterCasing="Upper"
-                                    AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
-                                    HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}"
-                                    Watermark="Enter hot key" />
-                <TextBlock Margin="{StaticResource ControlMargin}"
-                           Foreground="{DynamicResource DarkIdealForegroundDisabledBrush}"
-                           Text="Try SHIFT+D to demonstrate validation" />
-                <CheckBox x:Name="ModifierKeysRequired"
-                          Margin="{StaticResource ControlMargin}"
-                          Content="Require modifier keys" />
+            <StackPanel
+                Grid.Row="1"
+                Grid.Column="1"
+                Margin="{StaticResource ColumnMargin}">
+                <Label Content="HotKeyBox" Style="{DynamicResource DescriptionHeaderStyle}" />
+                <Controls:HotKeyBox
+                    Margin="{StaticResource ControlMargin}"
+                    Controls:ControlsHelper.ContentCharacterCasing="Upper"
+                    AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
+                    HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}"
+                    Watermark="Enter hot key" />
+                <TextBlock
+                    Margin="{StaticResource ControlMargin}"
+                    Foreground="{DynamicResource DarkIdealForegroundDisabledBrush}"
+                    Text="Try SHIFT+D to demonstrate validation" />
+                <CheckBox
+                    x:Name="ModifierKeysRequired"
+                    Margin="{StaticResource ControlMargin}"
+                    Content="Require modifier keys" />
             </StackPanel>
         </Grid>
     </AdornerDecorator>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/MainWindowViewModel.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/MainWindowViewModel.cs
index 221334df8b..2ca5394f7d 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/MainWindowViewModel.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/MainWindowViewModel.cs
@@ -254,6 +254,7 @@ protected virtual void RaisePropertyChanged(string propertyName)
             }
         }
 
+        [Description("Test-Property")]
         public string Error { get { return string.Empty; } }
 
         private ICommand singleCloseTabCommand;
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/TextBoxHelper.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/TextBoxHelper.cs
index 7f61fe491f..e79530c6e4 100644
--- a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/TextBoxHelper.cs
+++ b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/TextBoxHelper.cs
@@ -10,6 +10,8 @@
 namespace MahApps.Metro.Controls
 {
     using System.ComponentModel;
+    using System.Reflection;
+    using System.Windows.Data;
 
     /// <summary>
     /// A helper class that provides various attached properties for the TextBox control.
@@ -66,6 +68,50 @@ public static void SetIsSpellCheckContextMenuEnabled(UIElement element, bool val
             element.SetValue(IsSpellCheckContextMenuEnabledProperty, value);
         }
 
+        public static readonly DependencyProperty AutoWatermarkProperty = DependencyProperty.RegisterAttached(
+            "AutoWatermark", typeof(bool), typeof(TextBoxHelper), new PropertyMetadata(default(bool), OnAutoWatermarkChanged));
+
+        public static void SetAutoWatermark(DependencyObject element, bool value)
+        {
+            element.SetValue(AutoWatermarkProperty, value);
+        }
+
+        public static bool GetAutoWatermark(DependencyObject element)
+        {
+            return (bool)element.GetValue(AutoWatermarkProperty);
+        }
+
+        private static void OnAutoWatermarkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            FrameworkElement element = d as FrameworkElement;
+            if (element != null)
+            {
+                element.Loaded += OnLoaded;
+            }
+        }
+
+        private static void OnLoaded(object o, RoutedEventArgs routedEventArgs)
+        {
+            FrameworkElement obj = (FrameworkElement)o;
+            obj.Loaded -= OnLoaded;
+
+            var binding = obj.GetBindingExpression(TextBox.TextProperty);
+
+            if (binding != null)
+            {
+                var dataItem = binding.DataItem.GetType();
+                var property = dataItem.GetProperty(binding.ResolvedSourcePropertyName, BindingFlags.GetProperty | BindingFlags.Public| BindingFlags.Instance);
+                if (property != null)
+                {
+                    var attribute = property.GetCustomAttribute<DescriptionAttribute>();
+                    if (attribute != null)
+                    {
+                        obj.SetValue(WatermarkProperty, attribute.Description);
+                    }
+                }
+            }
+        }
+
         private static void UseSpellCheckContextMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var tb = d as TextBoxBase;