diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml
index aafb4e5640..add25a8630 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml
@@ -31,6 +31,12 @@
                             HorizontalAlignment="Center"
                             Controls:TextBoxHelper.UseFloatingWatermark="True"
                             Controls:TextBoxHelper.Watermark="Select a date" />
+                <DatePicker Width="200"
+                            Margin="0, 10, 0, 0"
+                            HorizontalAlignment="Center"
+                            Controls:TextBoxHelper.UseFloatingWatermark="True"
+                            Controls:TextBoxHelper.Watermark="Exterior Floating Watermark"
+                            Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"/>
                 <DatePicker Width="200"
                             Margin="0, 10, 0, 0"
                             HorizontalAlignment="Center"
@@ -169,6 +175,15 @@
                                                  Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
                                                  PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}" 
                                                  Controls:TextBoxHelper.UseFloatingWatermark="True"/>
+                        <Controls:DateTimePicker Margin="0,5" Culture="{Binding Path=SelectedItem, ElementName=DateTimePickerCulture, TargetNullValue={x:Static globalization:CultureInfo.CurrentCulture}}"
+                                                 HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
+                                                 IsClockVisible="{Binding Path=IsChecked, ElementName=DateTimePickerIsClockVisible, Mode=TwoWay}"
+                                                 IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
+                                                 IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
+                                                 Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
+                                                 PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
+                                                 Controls:TextBoxHelper.UseFloatingWatermark="True"
+                                                 Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"/>
                         <GroupBox Header="Current time">
                             <StackPanel>
                                 <Controls:DateTimePicker x:Name="DateTimePicker"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
index f31b5faaf7..266cdaeb1c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
@@ -5,14 +5,16 @@
              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:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}">
+             mc:Ignorable="d">
 
-    <TabControl Margin="10" TabStripPlacement="Left">
+    <TabControl Margin="10"
+                TabStripPlacement="Left">
         <TabItem Header="List/GridView">
-            <UniformGrid Rows="2" Columns="2">
+            <UniformGrid Columns="2"
+                         Rows="2">
                 <ListView Margin="5"
                           BorderThickness="0"
                           SelectedIndex="0"
@@ -39,8 +41,10 @@
                           Style="{StaticResource VirtualisedMetroListView}">
                     <ListView.View>
                         <GridView>
-                            <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
-                            <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="artist" />
+                            <GridViewColumn DisplayMemberBinding="{Binding ArtistId}"
+                                            Header="ID" />
+                            <GridViewColumn DisplayMemberBinding="{Binding Name}"
+                                            Header="artist" />
                         </GridView>
                     </ListView.View>
                 </ListView>
@@ -52,8 +56,10 @@
                           Style="{StaticResource VirtualisedMetroListView}">
                     <ListView.View>
                         <GridView>
-                            <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
-                            <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="artist" />
+                            <GridViewColumn DisplayMemberBinding="{Binding ArtistId}"
+                                            Header="ID" />
+                            <GridViewColumn DisplayMemberBinding="{Binding Name}"
+                                            Header="artist" />
                         </GridView>
                     </ListView.View>
                 </ListView>
@@ -61,7 +67,8 @@
         </TabItem>
         <TabItem Header="TreeView">
             <UniformGrid Rows="2">
-                <TreeView ItemsSource="{Binding Artists}" Style="{StaticResource VirtualisedMetroTreeView}">
+                <TreeView ItemsSource="{Binding Artists}"
+                          Style="{StaticResource VirtualisedMetroTreeView}">
                     <TreeView.ItemTemplate>
                         <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                             <TextBlock Text="{Binding Name}" />
@@ -86,8 +93,10 @@
                     <TreeViewItem Header="Item 3"
                                   IsExpanded="True"
                                   IsSelected="True">
-                        <TreeViewItem Header="Item 3.1" IsExpanded="True">
-                            <TreeViewItem Header="Item 3.1.1" IsExpanded="True" />
+                        <TreeViewItem Header="Item 3.1"
+                                      IsExpanded="True">
+                            <TreeViewItem Header="Item 3.1.1"
+                                          IsExpanded="True" />
                             <TreeViewItem Header="Item 3.1.2" />
                         </TreeViewItem>
                         <TreeViewItem Header="Item 3.2" />
@@ -97,7 +106,8 @@
             </UniformGrid>
         </TabItem>
         <TabItem Header="ListBox">
-            <UniformGrid Columns="2" Rows="2">
+            <UniformGrid Columns="2"
+                         Rows="2">
                 <ListBox Margin="1"
                          DisplayMemberPath="Name"
                          ItemsSource="{Binding Artists}"
@@ -127,9 +137,10 @@
             </UniformGrid>
         </TabItem>
         <TabItem Header="ComboBox">
-            <StackPanel HorizontalAlignment="Left" Orientation="Vertical">
+            <StackPanel HorizontalAlignment="Left"
+                        Orientation="Vertical">
                 <ComboBox Width="200"
-                          Margin="0, 10, 0, 0"
+                          Margin="0,10,0,0"
                           Controls:TextBoxHelper.ClearTextButton="True"
                           Controls:TextBoxHelper.Watermark="Please select an item..."
                           SelectedIndex="0">
@@ -144,10 +155,44 @@
                     <ComboBoxItem Content="Item 4" />
                 </ComboBox>
                 <ComboBox Width="200"
-                          Margin="0, 10, 0, 0"
+                          Margin="0,10,0,0"
                           Controls:TextBoxHelper.ClearTextButton="True"
+                          Controls:TextBoxHelper.UseFloatingWatermark="True"
+                          Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"
+                          Controls:TextBoxHelper.Watermark="Exterior Floating..."
+                          SelectedIndex="0">
+                    <ComboBox.ContextMenu>
+                        <ContextMenu>
+                            <MenuItem Header="Test" />
+                        </ContextMenu>
+                    </ComboBox.ContextMenu>
+                    <ComboBoxItem Content="Item 1" />
+                    <ComboBoxItem Content="Item 2" />
+                    <ComboBoxItem Content="Very long Item 3 for MahApps.Metro" />
+                    <ComboBoxItem Content="Item 4" />
+                </ComboBox>
+                <ComboBox Width="200"
+                          Margin="0,10,0,0"
+                          Controls:TextBoxHelper.ClearTextButton="True"
+                          Controls:TextBoxHelper.UseFloatingWatermark="True"
                           Controls:TextBoxHelper.Watermark="Editable..."
+                          IsEditable="True"
+                          SelectedIndex="0">
+                    <ComboBox.ContextMenu>
+                        <ContextMenu IsEnabled="False"
+                                     Visibility="Collapsed" />
+                    </ComboBox.ContextMenu>
+                    <ComboBoxItem Content="Item 1" />
+                    <ComboBoxItem Content="Item 2" />
+                    <ComboBoxItem Content="Very long Item 3 for MahApps.Metro" />
+                    <ComboBoxItem Content="Item 4" />
+                </ComboBox>
+                <ComboBox Width="200"
+                          Margin="0,10,0,0"
+                          Controls:TextBoxHelper.ClearTextButton="True"
+                          Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"
                           Controls:TextBoxHelper.UseFloatingWatermark="True"
+                          Controls:TextBoxHelper.Watermark="Editable (Exterior Watermark)..."
                           IsEditable="True"
                           SelectedIndex="0">
                     <ComboBox.ContextMenu>
@@ -160,7 +205,7 @@
                     <ComboBoxItem Content="Item 4" />
                 </ComboBox>
                 <ComboBox Width="200"
-                          Margin="0, 10, 0, 0"
+                          Margin="0,10,0,0"
                           Controls:TextBoxHelper.UseFloatingWatermark="True"
                           Controls:TextBoxHelper.Watermark="Autocompletion"
                           DisplayMemberPath="Title"
@@ -171,7 +216,7 @@
                           Text="{Binding Path=Title}" />
                 <ComboBox x:Name="groupingComboBox"
                           Width="200"
-                          Margin="0, 10, 0, 0"
+                          Margin="0,10,0,0"
                           Controls:ComboBoxHelper.EnableVirtualizationWithGrouping="True"
                           Controls:TextBoxHelper.Watermark="Autocompletion with grouping/virtualization"
                           DisplayMemberPath="Title"
@@ -191,7 +236,7 @@
                     </ComboBox.GroupStyle>
                 </ComboBox>
                 <ComboBox Width="200"
-                          Margin="0, 10, 0, 0"
+                          Margin="0,10,0,0"
                           IsEnabled="False"
                           SelectedIndex="0">
                     <ComboBoxItem Content="Item 1" />
@@ -200,13 +245,14 @@
                     <ComboBoxItem Content="Item 4" />
                 </ComboBox>
                 <ComboBox Width="200"
-                          Margin="0, 10, 0, 0"
+                          Margin="0,10,0,0"
                           Controls:TextBoxHelper.Watermark="Autocompletion"
                           DisplayMemberPath="Title"
                           IsEditable="True"
                           IsEnabled="False"
                           ItemsSource="{Binding Albums}"
-                          Text="{Binding Path=Title, Mode=TwoWay}" />
+                          Text="{Binding Path=Title,
+                                         Mode=TwoWay}" />
             </StackPanel>
         </TabItem>
     </TabControl>
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 bc293de113..819ef00a7d 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
@@ -5,14 +5,18 @@
              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:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}">
+             mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Thickness x:Key="ColumnMargin">10 5 10 5</Thickness>
-        <Thickness x:Key="ControlMargin">0 5 0 0</Thickness>
+        <Thickness x:Key="ColumnMargin">
+            10 5 10 5
+        </Thickness>
+        <Thickness x:Key="ControlMargin">
+            0 5 0 0
+        </Thickness>
     </UserControl.Resources>
 
     <AdornerDecorator>
@@ -32,7 +36,8 @@
                         Grid.RowSpan="2"
                         Grid.Column="0"
                         Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="TextBox" />
+                <Label Content="TextBox"
+                       Style="{DynamicResource DescriptionHeaderStyle}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                          Text="Enabled">
@@ -44,27 +49,54 @@
                 </TextBox>
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.ClearTextButton="True"
+                         Controls:TextBoxHelper.FloatingWatermarkLocation="Interior"
+                         Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                          Controls:TextBoxHelper.IsWaitingForData="True"
                          Controls:TextBoxHelper.UseFloatingWatermark="True"
-                         Controls:TextBoxHelper.Watermark="Watermark"
+                         Controls:TextBoxHelper.Watermark="Interior Floating Watermark"
+                         ToolTip="Default alignment">
+                    <TextBox.ContextMenu>
+                        <ContextMenu>
+                            <MenuItem Header="Custom Item" />
+                            <Separator />
+                            <MenuItem Command="ApplicationCommands.Cut"
+                                      Style="{DynamicResource MetroMenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Copy"
+                                      Style="{DynamicResource MetroMenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Paste"
+                                      Style="{DynamicResource MetroMenuItem}" />
+                        </ContextMenu>
+                    </TextBox.ContextMenu>
+                </TextBox>
+                <TextBox Margin="{StaticResource ControlMargin}"
+                         Controls:TextBoxHelper.ClearTextButton="True"
+                         Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"
                          Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                         Controls:TextBoxHelper.IsWaitingForData="True"
+                         Controls:TextBoxHelper.UseFloatingWatermark="True"
+                         Controls:TextBoxHelper.Watermark="Exterior Floating Watermark"
                          ToolTip="Default alignment">
                     <TextBox.ContextMenu>
                         <ContextMenu>
                             <MenuItem Header="Custom Item" />
                             <Separator />
-                            <MenuItem Style="{DynamicResource MetroMenuItem}" Command="ApplicationCommands.Cut" />
-                            <MenuItem Style="{DynamicResource MetroMenuItem}" Command="ApplicationCommands.Copy" />
-                            <MenuItem Style="{DynamicResource MetroMenuItem}" Command="ApplicationCommands.Paste" />
+                            <MenuItem Command="ApplicationCommands.Cut"
+                                      Style="{DynamicResource MetroMenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Copy"
+                                      Style="{DynamicResource MetroMenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Paste"
+                                      Style="{DynamicResource MetroMenuItem}" />
                         </ContextMenu>
                     </TextBox.ContextMenu>
                 </TextBox>
                 <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd,
+                                                                        Mode=OneWay}"
                          ContextMenu="{x:Null}"
                          Text="Clear button and no ContextMenu">
                     <TextBox.Style>
-                        <Style BasedOn="{StaticResource MetroTextBox}" TargetType="{x:Type TextBox}">
+                        <Style BasedOn="{StaticResource MetroTextBox}"
+                               TargetType="{x:Type TextBox}">
                             <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="True" />
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="False">
@@ -79,17 +111,23 @@
                     </TextBox.Style>
                 </TextBox>
                 <TextBox Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                         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}" />
+                                    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}">
+                        <Style BasedOn="{StaticResource SearchMetroTextBox}"
+                               TargetType="{x:Type TextBox}">
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
                                     <Setter Property="Controls:TextBoxHelper.ButtonContent" Value="r" />
@@ -101,18 +139,24 @@
                 </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" />
+                         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}"
-                         Style="{DynamicResource MetroButtonTextBox}"
-                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                         Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd,
+                                                                        Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonContent="s"
-                         Controls:TextBoxHelper.Watermark="Custom icon style" />
+                         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}" />
+                         Text="{Binding IntegerGreater10Property,
+                                        ValidatesOnDataErrors=True,
+                                        UpdateSourceTrigger=PropertyChanged,
+                                        NotifyOnValidationError=True}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.SelectAllOnFocus="True"
                          Text="Select all on focus" />
@@ -128,19 +172,23 @@
                          IsEnabled="False"
                          Text="Clear button" />
                 <TextBox Margin="{StaticResource ControlMargin}"
-                         Style="{DynamicResource SearchMetroTextBox}"
                          Controls:TextBoxHelper.Watermark="Search style"
-                         IsEnabled="False" />
+                         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}" />
+                         Text="{Binding IntegerGreater10Property,
+                                        ValidatesOnDataErrors=True,
+                                        UpdateSourceTrigger=PropertyChanged,
+                                        NotifyOnValidationError=True}" />
             </StackPanel>
 
             <StackPanel Grid.Row="0"
                         Grid.Column="1"
                         Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="RichTextBox" />
+                <Label Content="RichTextBox"
+                       Style="{DynamicResource DescriptionHeaderStyle}" />
                 <RichTextBox Margin="{StaticResource ControlMargin}"
                              Padding="5"
                              Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
@@ -189,34 +237,46 @@
                         Grid.RowSpan="2"
                         Grid.Column="2"
                         Margin="{StaticResource ColumnMargin}">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="PasswordBox" />
+                <Label Content="PasswordBox"
+                       Style="{DynamicResource DescriptionHeaderStyle}" />
                 <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" />
+                             Password="Win8"
+                             Style="{StaticResource Win8MetroPasswordBox}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Style="{StaticResource MetroButtonRevealedPasswordBox}"
-                             Controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.HasText), Mode=OneWay}"
+                             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" />
+                             Controls:TextBoxHelper.Watermark="Revealed PasswordBox"
+                             Style="{StaticResource MetroButtonRevealedPasswordBox}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             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:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd,
+                                                                            Mode=OneWay}"
+                             Controls:TextBoxHelper.ClearTextButton="True"
+                             Controls:TextBoxHelper.UseFloatingWatermark="True"
+                             Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"
+                             Controls:TextBoxHelper.Watermark="Exterior Floating Watermark" />
+                <PasswordBox Margin="{StaticResource ControlMargin}"
                              Controls:PasswordBoxHelper.CapsLockIcon="!"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd,
+                                                                            Mode=OneWay}"
                              Controls:TextBoxHelper.ButtonContent="4"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Custom icon style">
+                             Controls:TextBoxHelper.Watermark="Custom icon style"
+                             Style="{DynamicResource MetroButtonPasswordBox}">
                     <Controls:PasswordBoxHelper.CapsLockWarningToolTip>
                         <TextBlock>
                             <Run Text="This is a custom Warning to show you that" />
@@ -247,7 +307,8 @@
                         Grid.Column="3"
                         Margin="{StaticResource ColumnMargin}"
                         Grid.IsSharedSizeScope="True">
-                <Label Style="{DynamicResource DescriptionHeaderStyle}" Content="NumericUpDown" />
+                <Label Content="NumericUpDown"
+                       Style="{DynamicResource DescriptionHeaderStyle}" />
 
                 <UniformGrid Columns="2">
                     <CheckBox x:Name="ReadOnlyCheck"
@@ -261,9 +322,13 @@
 
                 <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}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox,
+                                                              Path=IsChecked,
+                                                              Mode=TwoWay}"
                                         IsEnabled="False"
-                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck,
+                                                             Path=IsChecked,
+                                                             Mode=TwoWay}"
                                         Maximum="10"
                                         Minimum="0"
                                         TextAlignment="Left"
@@ -272,82 +337,139 @@
                 <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}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox,
+                                                              Path=IsChecked,
+                                                              Mode=TwoWay}"
                                         Interval="5"
-                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        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}"
+                                        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}"
+                                        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.UseFloatingWatermark="True"
+                                        Controls:TextBoxHelper.Watermark="Exterior Floating Watermark"
+                                        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}"
+                       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}"
+                                        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="Auto"
+                                          SharedSizeGroup="LabelCol" />
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-                    <Label Grid.Column="0" Content="StringFormat" />
+                    <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}" />
+                             Text="{Binding ElementName=StringFormatNumUpDown,
+                                            Path=StringFormat,
+                                            Mode=TwoWay,
+                                            UpdateSourceTrigger=LostFocus,
+                                            NotifyOnValidationError=True}" />
                 </Grid>
                 <Grid Margin="{StaticResource ControlMargin}">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol" />
+                        <ColumnDefinition Width="Auto"
+                                          SharedSizeGroup="LabelCol" />
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-                    <Label Grid.Column="0" Content="CultureInfo" />
+                    <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}" />
+                              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}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox,
+                                                              Path=IsChecked,
+                                                              Mode=TwoWay}"
                                         Interval=".1"
-                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck,
+                                                             Path=IsChecked,
+                                                             Mode=TwoWay}"
                                         StringFormat="0,000.00"
-                                        Value="{Binding ElementName=test, Path=Value, Mode=TwoWay}" />
+                                        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}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox,
+                                                              Path=IsChecked,
+                                                              Mode=TwoWay}"
                                         Interval="5"
-                                        IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
+                                        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" />
+                <Label Content="HotKeyBox"
+                       Style="{DynamicResource DescriptionHeaderStyle}" />
                 <Controls:HotKeyBox Margin="{StaticResource ControlMargin}"
-                                    AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
-                                    HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}"
+                                    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}"
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 8de192718a..07db28ed8c 100644
--- a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/TextBoxHelper.cs
+++ b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/TextBoxHelper.cs
@@ -31,6 +31,8 @@ public class SpellCheckSeparator : Separator, ISpellCheckMenuItem
     {
     }
 
+    public enum FloatingWatermarkLocations { Interior, Exterior };
+
     /// <summary>
     /// A helper class that provides various attached properties for the TextBox control.
     /// </summary>
@@ -42,6 +44,7 @@ public class TextBoxHelper
         public static readonly DependencyProperty IsMonitoringProperty = DependencyProperty.RegisterAttached("IsMonitoring", typeof(bool), typeof(TextBoxHelper), new UIPropertyMetadata(false, OnIsMonitoringChanged));
         public static readonly DependencyProperty WatermarkProperty = DependencyProperty.RegisterAttached("Watermark", typeof(string), typeof(TextBoxHelper), new UIPropertyMetadata(string.Empty));
         public static readonly DependencyProperty UseFloatingWatermarkProperty = DependencyProperty.RegisterAttached("UseFloatingWatermark", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
+        public static readonly DependencyProperty FloatingWatermarkLocation = DependencyProperty.RegisterAttached("FloatingWatermarkLocation", typeof(FloatingWatermarkLocations), typeof(TextBoxHelper), new FrameworkPropertyMetadata(FloatingWatermarkLocations.Interior, ButtonCommandOrClearTextChanged));
         public static readonly DependencyProperty TextLengthProperty = DependencyProperty.RegisterAttached("TextLength", typeof(int), typeof(TextBoxHelper), new UIPropertyMetadata(0));
         public static readonly DependencyProperty ClearTextButtonProperty = DependencyProperty.RegisterAttached("ClearTextButton", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
         public static readonly DependencyProperty TextButtonProperty = DependencyProperty.RegisterAttached("TextButton", typeof(bool), typeof(TextBoxHelper), new FrameworkPropertyMetadata(false, ButtonCommandOrClearTextChanged));
@@ -415,6 +418,8 @@ public static void SetWatermark(DependencyObject obj, string value)
         [AttachedPropertyBrowsableForType(typeof(PasswordBox))]
         [AttachedPropertyBrowsableForType(typeof(ComboBox))]
         [AttachedPropertyBrowsableForType(typeof(NumericUpDown))]
+        [AttachedPropertyBrowsableForType(typeof(DatePicker))]
+        [AttachedPropertyBrowsableForType(typeof(TimePickerBase))]
         public static bool GetUseFloatingWatermark(DependencyObject obj)
         {
             return (bool)obj.GetValue(UseFloatingWatermarkProperty);
@@ -424,7 +429,24 @@ public static void SetUseFloatingWatermark(DependencyObject obj, bool value)
         {
             obj.SetValue(UseFloatingWatermarkProperty, value);
         }
-        
+
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(TextBoxBase))]
+        [AttachedPropertyBrowsableForType(typeof(PasswordBox))]
+        [AttachedPropertyBrowsableForType(typeof(ComboBox))]
+        [AttachedPropertyBrowsableForType(typeof(NumericUpDown))]
+        [AttachedPropertyBrowsableForType(typeof(DatePicker))]
+        [AttachedPropertyBrowsableForType(typeof(TimePickerBase))]
+        public static string GetFloatingWatermarkLocation(DependencyObject obj)
+        {
+            return obj.GetValue(FloatingWatermarkLocation).ToString();
+        }
+
+        public static void SetFloatingWatermarkLocation(DependencyObject obj, FloatingWatermarkLocations value)
+        {
+            obj.SetValue(FloatingWatermarkLocation, value);
+        }
+
         /// <summary>
         /// Gets if the attached TextBox has text.
         /// </summary>
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
index d382a94757..95f2892f2a 100644
--- a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -18,28 +18,28 @@
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
@@ -48,15 +48,51 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_InnerGrid"
+                              Margin="{TemplateBinding Padding}">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
+                            <!--<ContentControl x:Name="PART_InteriorFloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>-->
+                            <Button x:Name="PART_ClearText"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="1"
+                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                                      Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                                                                      Mode=OneWay}"
+                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Focusable="False"
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                         Mode=OneWay,
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                             <ScrollViewer x:Name="PART_ContentHost"
                                           Grid.Row="1"
@@ -69,64 +105,56 @@
                             <TextBlock x:Name="PART_Message"
                                        Grid.Row="1"
                                        Grid.Column="0"
-                                       Margin="4 0 4 0"
+                                       Margin="4,0,4,0"
                                        Padding="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
                                        IsHitTestVisible="False"
+                                       Opacity="0.6"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="2"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
-                                           Foreground="{TemplateBinding Foreground}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
-                            </ContentControl>
-                            <Button x:Name="PART_ClearText"
-                                    Grid.Row="0"
-                                    Grid.RowSpan="2"
-                                    Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
-                                    Focusable="False"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=Text}"
+                                     Value="">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
-                        <MultiDataTrigger>
+                        <!--<MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>-->
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=(Controls:TextBoxHelper.ClearTextButton)}"
+                                     Value="False">
                             <Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
                         </DataTrigger>
@@ -136,11 +164,11 @@
                         <Trigger Property="IsReadOnly" Value="True">
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
+                        <!--<Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
-                        </Trigger>
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
+                        </Trigger>-->
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
                             <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
@@ -178,11 +206,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroComboBoxDropDownToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="MetroComboBoxDropDownToggleButtonStyle"
+           TargetType="{x:Type ToggleButton}">
         <Setter Property="ClickMode" Value="Press" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Padding" Value="3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -191,29 +220,38 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                       Path=(Controls:ControlsHelper.CornerRadius),
+                                                       Mode=OneWay}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid Margin="1">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
-                                <ColumnDefinition x:Name="ToggleButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
+                                <ColumnDefinition x:Name="ToggleButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
 
                             <Button x:Name="PART_ClearText"
                                     Grid.Column="1"
                                     Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}},
+                                                                                                      Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                                                                      Mode=OneWay}"
                                     Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                     ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
                                     Focusable="False"
-                                    Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(Controls:TextBoxHelper.ClearTextButton), Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}},
+                                                         Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
                             <Grid x:Name="BtnArrowBackground"
                                   Grid.Column="2"
                                   Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
@@ -222,8 +260,8 @@
                                       Width="8"
                                       Height="4"
                                       HorizontalAlignment="Center"
-                                      Fill="{DynamicResource GrayBrush1}"
                                       Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z "
+                                      Fill="{DynamicResource GrayBrush1}"
                                       IsHitTestVisible="false"
                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                       Stretch="Uniform" />
@@ -238,14 +276,16 @@
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
                             <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                         </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsPressed}" Value="True">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=IsPressed}"
+                                     Value="True">
                             <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource GrayBrush3}" />
                             <Setter TargetName="PART_Background" Property="Background" Value="{DynamicResource GrayBrush7}" />
                         </DataTrigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
+                            <Setter TargetName="PART_Background" Property="Background" Value="{DynamicResource GrayBrush7}" />
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
                             <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
-                            <Setter TargetName="PART_Background" Property="Background" Value="{DynamicResource GrayBrush7}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -253,19 +293,19 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroComboBox" TargetType="{x:Type ComboBox}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+    <Style x:Key="MetroComboBox"
+           TargetType="{x:Type ComboBox}">
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="24" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource ComboBoxMouseOverInnerBorderBrush}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="24" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="ItemContainerStyle" Value="{DynamicResource MetroComboBoxItem}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="2" />
@@ -274,46 +314,131 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <!--  change SnapsToDevicePixels to true to view a better border and validation error  -->
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_WatermarkMessage"
+                            <DoubleAnimation Storyboard.TargetName="PART_WatermarkMessage"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_WatermarkMessage"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_WatermarkMessage"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_WatermarkMessage"
+                            <DoubleAnimation Storyboard.TargetName="PART_WatermarkMessage"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_WatermarkMessage"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_WatermarkMessage"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
-                        <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
+
+                        <Border x:Name="FocusBorder"
+                                Grid.Row="1"
+                                Grid.ColumnSpan="3"
+                                Background="{x:Null}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                       Path=(Controls:ControlsHelper.CornerRadius),
+                                                       Mode=OneWay}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="Collapsed" />
+                        <Border x:Name="DisabledVisualElement"
+                                Grid.Row="1"
+                                Grid.ColumnSpan="3"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                       Path=(Controls:ControlsHelper.CornerRadius),
+                                                       Mode=OneWay}"
+                                IsHitTestVisible="False"
+                                Opacity="0.6"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="Collapsed" />
+
+                        <!--  AllowsTransparency="true" fixes the redraw problem under windows vista/7 with a selected non aero theme  -->
+                        <Popup x:Name="PART_Popup"
+                               Grid.Row="1"
+                               AllowsTransparency="True"
+                               Focusable="False"
+                               IsOpen="{Binding IsDropDownOpen,
+                                                RelativeSource={RelativeSource TemplatedParent}}"
+                               Placement="Bottom"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Grid MinWidth="{Binding ActualWidth,
+                                                     RelativeSource={RelativeSource TemplatedParent}}"
+                                  MaxHeight="{Binding MaxDropDownHeight,
+                                                      RelativeSource={RelativeSource TemplatedParent}}">
+                                <Border x:Name="PopupBorder"
+                                        Height="Auto"
+                                        HorizontalAlignment="Stretch"
+                                        Background="{DynamicResource WhiteBrush}"
+                                        BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        Effect="{DynamicResource DropShadowBrush}" />
+                                <ScrollViewer x:Name="DropDownScrollViewer"
+                                              Margin="2"
+                                              Padding="1"
+                                              Background="{DynamicResource WhiteBrush}"
+                                              BorderThickness="0">
+                                    <Grid Background="{DynamicResource WhiteBrush}"
+                                          RenderOptions.ClearTypeHint="{Binding RelativeSource={RelativeSource FindAncestor,
+                                                                                                               AncestorType={x:Type ComboBox}},
+                                                                                Path=(RenderOptions.ClearTypeHint),
+                                                                                Mode=OneWay}">
+                                        <ItemsPresenter x:Name="ItemsPresenter"
+                                                        KeyboardNavigation.DirectionalNavigation="Contained" />
+                                    </Grid>
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                        <Grid x:Name="PART_InnerGrid"
+                              Grid.Row="1">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
-                                <ColumnDefinition x:Name="ToggleButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                  Path=(Controls:TextBoxHelper.ButtonWidth),
+                                                                  Mode=OneWay}" />
+                                <ColumnDefinition x:Name="ToggleButtonColumn"
+                                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                  Path=(Controls:TextBoxHelper.ButtonWidth),
+                                                                  Mode=OneWay}" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
 
                             <ToggleButton x:Name="PART_DropDownToggle"
@@ -321,80 +446,88 @@
                                           Grid.ColumnSpan="3"
                                           Margin="0"
                                           VerticalAlignment="Stretch"
-                                          Style="{DynamicResource MetroComboBoxDropDownToggleButtonStyle}"
-                                          Background="{TemplateBinding Background}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          BorderBrush="{TemplateBinding BorderBrush}"
-                                          BorderThickness="{TemplateBinding BorderThickness}"
-                                          Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                          Controls:ControlsHelper.CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
+                                          Controls:ControlsHelper.CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                         Path=(Controls:ControlsHelper.CornerRadius),
+                                                                                         Mode=OneWay}"
                                           Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                           Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
                                           Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
                                           Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                          Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                           Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
-                                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          IsChecked="{Binding IsDropDownOpen,
+                                                              Mode=TwoWay,
+                                                              RelativeSource={RelativeSource TemplatedParent}}"
                                           KeyboardNavigation.IsTabStop="False"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                          Style="{DynamicResource MetroComboBoxDropDownToggleButtonStyle}" />
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
+                                           Margin="2,2,0,0"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>
 
                             <TextBox x:Name="PART_EditableTextBox"
-                                     Grid.Column="0"
                                      Grid.Row="1"
+                                     Grid.Column="0"
                                      Margin="1"
                                      Padding="{TemplateBinding Padding}"
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     Style="{StaticResource EditableTextBoxStyle}"
-                                     Background="{x:Null}"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     BorderThickness="0"
-                                     FontFamily="{TemplateBinding FontFamily}"
-                                     FontSize="{TemplateBinding FontSize}"
-                                     Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                      Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                      Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                     Controls:TextBoxHelper.HasText="{TemplateBinding Controls:TextBoxHelper.HasText}"
                                      Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
                                      Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                     Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                     Controls:TextBoxHelper.HasText="{TemplateBinding Controls:TextBoxHelper.HasText}"
                                      Controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding Controls:TextBoxHelper.UseFloatingWatermark}"
                                      Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                     CharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ComboBoxHelper.CharacterCasing), Mode=OneWay}"
+                                     Background="{x:Null}"
+                                     BorderThickness="0"
+                                     CharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                               Path=(Controls:ComboBoxHelper.CharacterCasing),
+                                                               Mode=OneWay}"
                                      Focusable="True"
+                                     FontFamily="{TemplateBinding FontFamily}"
+                                     FontSize="{TemplateBinding FontSize}"
+                                     Foreground="{TemplateBinding Foreground}"
                                      IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ComboBoxHelper.MaxLength), Mode=OneWay}"
+                                     MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:ComboBoxHelper.MaxLength),
+                                                         Mode=OneWay}"
                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                     Style="{StaticResource EditableTextBoxStyle}"
                                      Visibility="Collapsed" />
                             <TextBlock x:Name="PART_WatermarkMessage"
-                                       Grid.Column="0"
                                        Grid.Row="1"
-                                       Margin="6 2"
+                                       Grid.Column="0"
+                                       Margin="6,2"
                                        Padding="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
                                        FontFamily="{TemplateBinding FontFamily}"
                                        FontSize="{TemplateBinding FontSize}"
+                                       Foreground="{TemplateBinding Foreground}"
                                        IsHitTestVisible="False"
+                                       Opacity="0.6"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
-                                            Grid.Column="0"
-                                            Grid.Row="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
-                                           Margin="2 2 0 0"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
-                                           Foreground="{TemplateBinding Foreground}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
-                            </ContentControl>
                             <Grid x:Name="ContentSite"
-                                  Grid.Column="0"
                                   Grid.Row="1"
-                                  Margin="4 0 4 0">
+                                  Grid.Column="0"
+                                  Margin="4">
                                 <ContentPresenter Margin="{TemplateBinding Padding}"
                                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -406,62 +539,15 @@
                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </Grid>
                         </Grid>
-
-                        <Border x:Name="FocusBorder"
-                                Grid.ColumnSpan="3"
-                                Background="{x:Null}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="Collapsed" />
-                        <Border x:Name="DisabledVisualElement"
-                                Grid.ColumnSpan="3"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0.6"
-                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="Collapsed" />
-
-                        <!--  AllowsTransparency="true" fixes the redraw problem under windows vista/7 with a selected non aero theme  -->
-                        <Popup x:Name="PART_Popup"
-                               AllowsTransparency="True"
-                               Focusable="False"
-                               IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                               Placement="Bottom"
-                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
-                            <Grid MinWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}}" MaxHeight="{Binding MaxDropDownHeight, RelativeSource={RelativeSource TemplatedParent}}">
-                                <Border x:Name="PopupBorder"
-                                        Height="Auto"
-                                        HorizontalAlignment="Stretch"
-                                        Background="{DynamicResource WhiteBrush}"
-                                        BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        Effect="{DynamicResource DropShadowBrush}" />
-                                <ScrollViewer x:Name="DropDownScrollViewer"
-                                              Background="{DynamicResource WhiteBrush}"
-                                              Margin="2"
-                                              Padding="1"
-                                              BorderThickness="0">
-                                    <Grid Background="{DynamicResource WhiteBrush}"
-                                          RenderOptions.ClearTypeHint="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}, Path=(RenderOptions.ClearTypeHint), Mode=OneWay}">
-                                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" />
-                                    </Grid>
-                                </ScrollViewer>
-                            </Grid>
-                        </Popup>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="FocusStates">
                                 <VisualState x:Name="Focused" />
                                 <VisualState x:Name="Unfocused" />
                                 <VisualState x:Name="FocusedDropDown">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Duration="00:00:00"
-                                                                       Storyboard.TargetName="PopupBorder"
-                                                                       Storyboard.TargetProperty="(UIElement.Visibility)">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PopupBorder"
+                                                                       Storyboard.TargetProperty="(UIElement.Visibility)"
+                                                                       Duration="00:00:00">
                                             <DiscreteObjectKeyFrame KeyTime="00:00:00">
                                                 <DiscreteObjectKeyFrame.Value>
                                                     <Visibility>Visible</Visibility>
@@ -520,16 +606,79 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False">
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), ElementName=PART_EditableTextBox}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}"
+                                           Value="Interior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), ElementName=PART_EditableTextBox}"
+                                           Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}"
+                                           Value="False" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}"
+                                           Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=(Controls:TextBoxHelper.ClearTextButton)}"
+                                     Value="False">
                             <Setter TargetName="ContentSite" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_EditableTextBox" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_WatermarkMessage" Property="Grid.ColumnSpan" Value="2" />
@@ -560,8 +709,10 @@
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="FocusBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="FocusBorder" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
                             <Setter TargetName="FocusBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
@@ -575,6 +726,8 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="VirtualisedMetroComboBox"
@@ -598,18 +751,19 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MetroComboBoxItem" TargetType="ComboBoxItem">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+    <Style x:Key="MetroComboBoxItem"
+           TargetType="ComboBoxItem">
         <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
         <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBoxItem">
-                    <Grid Margin="0 0.5" Background="{TemplateBinding Background}">
+                    <Grid Margin="0,0.5"
+                          Background="{TemplateBinding Background}">
                         <Border x:Name="ItemBackground"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
@@ -627,8 +781,10 @@
                                 <VisualState x:Name="MouseOver" />
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity">
-                                            <SplineDoubleKeyFrame KeyTime="0" Value=".55" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="contentPresenter"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <SplineDoubleKeyFrame KeyTime="0"
+                                                                  Value=".55" />
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -647,6 +803,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="VerticalContentAlignment" Value="Top" />
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 77ad35bd4d..3671563f81 100644
--- a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -3,19 +3,19 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-                    xmlns:behaviours="clr-namespace:MahApps.Metro.Behaviours">
+                    xmlns:behaviours="clr-namespace:MahApps.Metro.Behaviours"
+                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    
-    
+
+
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <Converters:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter" />
 
-    <Style x:Key="MetroDatePicker" TargetType="{x:Type DatePicker}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+    <Style x:Key="MetroDatePicker"
+           TargetType="{x:Type DatePicker}">
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -26,99 +26,123 @@
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="SelectedDateFormat" Value="Short" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePicker}">
                     <Grid x:Name="PART_Root">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="DisabledVisualElement"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsHitTestVisible="False"
+                                Opacity="0"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
                         <Border x:Name="Base"
+                                Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="2">
+                        <Grid x:Name="PART_InnerGrid"
+                              Grid.Row="1"
+                              Margin="2">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
 
                             <Button x:Name="PART_Button"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
                                     Foreground="{TemplateBinding Foreground}"
-                                    IsTabStop="False">
-                                <!-- PackIconModern - Calendar14 -->
-                                <ContentControl Style="{DynamicResource PathIconContentControlStyle}"
-                                                Content="M34,52H31V38.5C29.66,39.9 28.16,40.78 26.34,41.45V37.76C27.3,37.45 28.34,36.86 29.46,36C30.59,35.15 31.36,34.15 31.78,33H34V52M45,52V48H37V45L45,33H48V45H50V48H48V52H45M45,45V38.26L40.26,45H45M18,57V23H23V20A2,2 0 0,1 25,18H29C30.11,18 31,18.9 31,20V23H45V20A2,2 0 0,1 47,18H51C52.11,18 53,18.9 53,20V23H58V57H18M21,54H55V31H21V54M48.5,20A1.5,1.5 0 0,0 47,21.5V24.5A1.5,1.5 0 0,0 48.5,26H49.5C50.34,26 51,25.33 51,24.5V21.5A1.5,1.5 0 0,0 49.5,20H48.5M26.5,20A1.5,1.5 0 0,0 25,21.5V24.5A1.5,1.5 0 0,0 26.5,26H27.5A1.5,1.5 0 0,0 29,24.5V21.5A1.5,1.5 0 0,0 27.5,20H26.5Z"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}">
+                                <!--  PackIconModern - Calendar14  -->
+                                <ContentControl Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                                Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                                 Padding="2"
-                                                Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                                Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}" />
+                                                Content="M34,52H31V38.5C29.66,39.9 28.16,40.78 26.34,41.45V37.76C27.3,37.45 28.34,36.86 29.46,36C30.59,35.15 31.36,34.15 31.78,33H34V52M45,52V48H37V45L45,33H48V45H50V48H48V52H45M45,45V38.26L40.26,45H45M18,57V23H23V20A2,2 0 0,1 25,18H29C30.11,18 31,18.9 31,20V23H45V20A2,2 0 0,1 47,18H51C52.11,18 53,18.9 53,20V23H58V57H18M21,54H55V31H21V54M48.5,20A1.5,1.5 0 0,0 47,21.5V24.5A1.5,1.5 0 0,0 48.5,26H49.5C50.34,26 51,25.33 51,24.5V21.5A1.5,1.5 0 0,0 49.5,20H48.5M26.5,20A1.5,1.5 0 0,0 25,21.5V24.5A1.5,1.5 0 0,0 26.5,26H27.5A1.5,1.5 0 0,0 29,24.5V21.5A1.5,1.5 0 0,0 27.5,20H26.5Z"
+                                                Style="{DynamicResource PathIconContentControlStyle}" />
                             </Button>
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>
 
                             <DatePickerTextBox x:Name="PART_TextBox"
                                                Grid.Row="1"
                                                Grid.Column="0"
                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                               Foreground="{TemplateBinding Foreground}"
-                                               FontSize="{TemplateBinding FontSize}"
-                                               Controls:TextBoxHelper.Watermark="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.Watermark), Mode=OneWay}"
+                                               Controls:TextBoxHelper.Watermark="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                          Path=(Controls:TextBoxHelper.Watermark),
+                                                                                          Mode=OneWay}"
                                                CaretBrush="{DynamicResource BlackBrush}"
-                                               SelectionBrush="{DynamicResource HighlightBrush}"
                                                ContextMenu="{DynamicResource TextBoxMetroContextMenu}"
-                                               Focusable="{TemplateBinding Focusable}">
+                                               Focusable="{TemplateBinding Focusable}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               SelectionBrush="{DynamicResource HighlightBrush}">
                                 <i:Interaction.Behaviors>
                                     <behaviours:DatePickerTextBoxBehavior />
                                 </i:Interaction.Behaviors>
                             </DatePickerTextBox>
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
-                                            Grid.Column="0"
-                                            Grid.Row="0"
-                                            Grid.ColumnSpan="2"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
-                                           Foreground="{TemplateBinding Foreground}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
-                            </ContentControl>
 
                             <Popup x:Name="PART_Popup"
-                                   Grid.Column="0"
                                    Grid.Row="1"
+                                   Grid.Column="0"
                                    AllowsTransparency="True"
                                    Placement="Bottom"
                                    PlacementTarget="{Binding ElementName=PART_Root}"
                                    StaysOpen="False" />
                         </Grid>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
-                        <Trigger Property="IsFocused" Value="True" SourceName="PART_TextBox">
+                        <Trigger SourceName="PART_TextBox" Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
@@ -134,31 +158,51 @@
                             <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource BlackBrush}" />
                             <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
                         </Trigger>
+
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
     </Style>
 
-    <Style x:Key="MetroDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+    <Style x:Key="MetroDatePickerTextBox"
+           TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
@@ -166,73 +210,73 @@
                 <ControlTemplate TargetType="{x:Type DatePickerTextBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="EnterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Watermark"
+                            <DoubleAnimation Storyboard.TargetName="PART_Watermark"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                                             To=".2"
+                                             Duration="0:0:0.2" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="ExitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Watermark"
-                                             Storyboard.TargetProperty="Opacity" />
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Watermark"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="EnterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Watermark"
+                            <DoubleAnimation Storyboard.TargetName="PART_Watermark"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
-                            <DoubleAnimation Duration="0:0:0.2"
                                              From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                                             To="0"
+                                             Duration="0:0:0.2" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="ExitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Watermark"
-                                             Storyboard.TargetProperty="Opacity" />
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Watermark"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
 
                         <ScrollViewer x:Name="PART_ContentHost"
-                                      Margin="2 2 20 2"
+                                      Margin="2,2,20,2"
                                       VerticalAlignment="Stretch"
                                       Background="{x:Null}"
                                       BorderThickness="0"
                                       FocusVisualStyle="{x:Null}"
                                       IsTabStop="False" />
                         <ContentControl x:Name="PART_Watermark"
-                                        Margin="6 0 0 0"
+                                        Margin="6,0,0,0"
                                         Padding="2"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
                                         VerticalContentAlignment="Center"
-                                        Foreground="{TemplateBinding Foreground}"
-                                        Opacity="0.6"
                                         Focusable="False"
+                                        Foreground="{TemplateBinding Foreground}"
                                         IsHitTestVisible="False"
+                                        Opacity="0.6"
                                         Visibility="Hidden" />
                         <TextBlock x:Name="PART_Message"
-                                   Margin="4 0 0 0"
+                                   Margin="4,0,0,0"
                                    Padding="2"
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                    Foreground="{TemplateBinding Foreground}"
-                                   Opacity="0.6"
                                    IsHitTestVisible="False"
+                                   Opacity="0.6"
                                    Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -249,7 +293,9 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.Watermark)}" Value="{x:Static System:String.Empty}">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=(Controls:TextBoxHelper.Watermark)}"
+                                     Value="{x:Static System:String.Empty}">
                             <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index d6e443438a..07d403e99c 100644
--- a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -12,23 +12,25 @@
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <Converters:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter" />
     <Converters:StringToVisibilityConverter x:Key="StringToVisibilityConverter" />
-    <Converters:StringToVisibilityConverter x:Key="StringToOppositeVisibilityConverter" OppositeStringValue="True" />
+    <Converters:StringToVisibilityConverter x:Key="StringToOppositeVisibilityConverter"
+                                            OppositeStringValue="True" />
 
     <!--  obsolete  -->
     <Grid x:Key="RevealButtonIcon"
           Width="16"
           Height="16"
+          x:Shared="False"
           Background="{DynamicResource BlackBrush}"
-          Opacity="0.8"
-          x:Shared="False">
+          Opacity="0.8">
         <Grid.OpacityMask>
             <VisualBrush>
                 <VisualBrush.Visual>
-                    <Canvas Width="42" Height="25.8461">
+                    <Canvas Width="42"
+                            Height="25.8461">
                         <Path Canvas.Left="17"
                               Canvas.Top="25.0769"
-                              Fill="Black"
                               Data="F1 M 38,33.1538C 40.6765,33.1538 42.8462,35.3235 42.8462,38C 42.8462,40.6765 40.6765,42.8461 38,42.8461C 35.3235,42.8461 33.1539,40.6765 33.1539,38C 33.1539,35.3235 35.3236,33.1538 38,33.1538 Z M 38,25.0769C 49.3077,25.0769 59,33.1538 59,38C 59,42.8461 49.3077,50.9231 38,50.9231C 26.6923,50.9231 17,42.8461 17,38C 17,33.1538 26.6923,25.0769 38,25.0769 Z M 38,29.1154C 33.0932,29.1154 29.1154,33.0932 29.1154,38C 29.1154,42.9068 33.0932,46.8846 38,46.8846C 42.9068,46.8846 46.8846,42.9068 46.8846,38C 46.8846,33.0932 42.9068,29.1154 38,29.1154 Z "
+                              Fill="Black"
                               Stretch="Fill" />
                     </Canvas>
                 </VisualBrush.Visual>
@@ -38,22 +40,22 @@
 
     <!--  Button Style for Win8MetroPasswordBox  -->
     <Style x:Key="RevealButtonStyle"
-           TargetType="{x:Type ButtonBase}"
-           BasedOn="{StaticResource ChromelessButtonStyle}">
+           BasedOn="{StaticResource ChromelessButtonStyle}"
+           TargetType="{x:Type ButtonBase}">
         <Setter Property="Margin" Value="1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid Background="{TemplateBinding Background}">
-                        <!-- Material - Eye -->
+                        <!--  Material - Eye  -->
                         <ContentControl x:Name="PART_PackIcon"
-                                        Style="{DynamicResource PathIconContentControlStyle}"
-                                        Content="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z"
+                                        Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                        Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                        Padding="2"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Padding="2"
-                                        Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                        Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}" />
+                                        Content="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z"
+                                        Style="{DynamicResource PathIconContentControlStyle}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
@@ -71,14 +73,16 @@
     <Grid x:Key="DefaultCapsLockIcon"
           Width="16"
           Height="16"
+          x:Shared="False"
           Background="{DynamicResource BlackBrush}"
-          Opacity="0.8"
-          x:Shared="False">
+          Opacity="0.8">
         <Grid.OpacityMask>
             <VisualBrush>
                 <VisualBrush.Visual>
-                    <Canvas Width="24" Height="24">
-                        <Path Fill="Black" Data="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z" />
+                    <Canvas Width="24"
+                            Height="24">
+                        <Path Data="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"
+                              Fill="Black" />
                     </Canvas>
                 </VisualBrush.Visual>
             </VisualBrush>
@@ -86,65 +90,91 @@
     </Grid>
 
     <!--  PasswordBox Style  -->
-    <Style x:Key="MetroPasswordBox" TargetType="{x:Type PasswordBox}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+    <Style x:Key="MetroPasswordBox"
+           TargetType="{x:Type PasswordBox}">
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="Behaviors:StylizedBehaviors.Behaviors">
+            <Setter.Value>
+                <Behaviors:StylizedBehaviorCollection>
+                    <Behaviors:PasswordBoxBindingBehavior />
+                </Behaviors:StylizedBehaviorCollection>
+            </Setter.Value>
+        </Setter>
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
         <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource DefaultCapsLockIcon}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
         <!--  change SnapsToDevicePixels to true to view a better border and validation error  -->
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
-        <Setter Property="Behaviors:StylizedBehaviors.Behaviors">
-            <Setter.Value>
-                <Behaviors:StylizedBehaviorCollection>
-                    <Behaviors:PasswordBoxBindingBehavior />
-                </Behaviors:StylizedBehaviorCollection>
-            </Setter.Value>
-        </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="DisabledVisualElement"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsHitTestVisible="False"
+                                Opacity="0"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
                         <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator"
+                                          Grid.Row="1"
                                           Visibility="Collapsed">
                             <AdornerDecorator.CacheMode>
                                 <BitmapCache EnableClearType="True"
@@ -157,51 +187,34 @@
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
+                                Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid Margin="2">
+                        <Grid Grid.Row="1"
+                              Margin="2">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
-
-                            <ScrollViewer x:Name="PART_ContentHost"
-                                          Grid.Row="1"
-                                          Grid.Column="0"
-                                          Margin="2"
-                                          VerticalAlignment="Stretch"
-                                          Background="{x:Null}"
-                                          BorderThickness="0"
-                                          IsTabStop="False" />
-                            <TextBlock x:Name="PART_Message"
-                                       Grid.Row="1"
-                                       Grid.Column="0"
-                                       Margin="6 2 6 2"
-                                       Padding="{TemplateBinding Padding}"
-                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
-                                       IsHitTestVisible="False"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
-                                            Grid.Column="0"
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
                                             Grid.Row="0"
+                                            Grid.Column="0"
                                             Grid.ColumnSpan="2"
                                             Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
                                            Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
                             </ContentControl>
                             <ContentPresenter x:Name="PART_CapsLockIndicator"
@@ -211,37 +224,62 @@
                                               Margin="1"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
-                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
+                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                Path=(Controls:PasswordBoxHelper.CapsLockIcon),
+                                                                Mode=TwoWay}"
                                               TextBlock.Foreground="{DynamicResource ControlsValidationBrush}"
-                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
+                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip),
+                                                                Mode=OneWay}"
                                               Visibility="Collapsed" />
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
                                     Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                                      Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                                                                      Mode=OneWay}"
                                     Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                     ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
                                     Focusable="False"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                         Mode=OneWay,
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Grid.Row="1"
+                                          Grid.Column="0"
+                                          Margin="2"
+                                          VerticalAlignment="Stretch"
+                                          Background="{x:Null}"
+                                          BorderThickness="0"
+                                          IsTabStop="False" />
+                            <TextBlock x:Name="PART_Message"
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Margin="6,2,6,2"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       IsHitTestVisible="False"
+                                       Opacity="0.6"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
+                                       Visibility="Collapsed" />
                         </Grid>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Password, Mode=OneWay}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=Password,
+                                                       Mode=OneWay}"
+                                     Value="">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
@@ -250,12 +288,28 @@
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -267,8 +321,10 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
@@ -301,65 +357,92 @@
                                 <BeginStoryboard Storyboard="{StaticResource exitHasText}" />
                             </Trigger.ExitActions>
                         </Trigger>
-                        
+
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsVisible" Value="True" />
                                 <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
     </Style>
 
     <!--  Button Command PasswordBox Style  -->
     <Style x:Key="MetroButtonPasswordBox"
            BasedOn="{StaticResource MetroPasswordBox}"
            TargetType="{x:Type PasswordBox}">
-        <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}" />
+        <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="DisabledVisualElement"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsHitTestVisible="False"
+                                Opacity="0"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
                         <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator"
+                                          Grid.Row="1"
                                           Visibility="Collapsed">
                             <AdornerDecorator.CacheMode>
                                 <BitmapCache EnableClearType="True"
@@ -372,51 +455,35 @@
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
+                                Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="2">
+                        <Grid x:Name="PART_InnerGrid"
+                              Grid.Row="1"
+                              Margin="2">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
-
-                            <ScrollViewer x:Name="PART_ContentHost"
-                                          Grid.Row="1"
-                                          Grid.Column="0"
-                                          Margin="2"
-                                          VerticalAlignment="Stretch"
-                                          Background="{x:Null}"
-                                          BorderThickness="0"
-                                          IsTabStop="False" />
-                            <TextBlock x:Name="PART_Message"
-                                       Grid.Row="1"
-                                       Grid.Column="0"
-                                       Margin="6 2 6 2"
-                                       Padding="{TemplateBinding Padding}"
-                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
-                                       IsHitTestVisible="False"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
                                             Grid.ColumnSpan="2"
                                             Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
                                            Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
                             </ContentControl>
                             <ContentPresenter x:Name="PART_CapsLockIndicator"
@@ -426,38 +493,61 @@
                                               Margin="1"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
-                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
+                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                Path=(Controls:PasswordBoxHelper.CapsLockIcon),
+                                                                Mode=TwoWay}"
                                               TextBlock.Foreground="{DynamicResource ControlsValidationBrush}"
-                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
+                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip),
+                                                                Mode=OneWay}"
                                               Visibility="Collapsed" />
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
                                     Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
                                     Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                     ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
                                     Focusable="False"
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:TextBoxHelper.TextButton),
+                                                         Mode=OneWay,
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Grid.Row="1"
+                                          Grid.Column="0"
+                                          Margin="2"
+                                          VerticalAlignment="Stretch"
+                                          Background="{x:Null}"
+                                          BorderThickness="0"
+                                          IsTabStop="False" />
+                            <TextBlock x:Name="PART_Message"
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Margin="6,2,6,2"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       IsHitTestVisible="False"
+                                       Opacity="0.6"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
+                                       Visibility="Collapsed" />
                         </Grid>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Password, Mode=OneWay}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=Password,
+                                                       Mode=OneWay}"
+                                     Value="">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
@@ -466,12 +556,28 @@
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -483,8 +589,10 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
@@ -522,15 +630,15 @@
                                 <Condition Property="IsVisible" Value="True" />
                                 <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -548,32 +656,58 @@
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="DisabledVisualElement"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsHitTestVisible="False"
+                                Opacity="0"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
                         <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator"
+                                          Grid.Row="1"
                                           Visibility="Collapsed">
                             <AdornerDecorator.CacheMode>
                                 <BitmapCache EnableClearType="True"
@@ -586,64 +720,37 @@
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
+                                Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="2">
+                        <Grid x:Name="PART_InnerGrid"
+                              Grid.Row="1"
+                              Margin="2">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition x:Name="RevealButtonColumn" Width="Auto" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="RevealButtonColumn"
+                                                  Width="Auto" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
-
-                            <ScrollViewer x:Name="PART_ContentHost"
-                                          Grid.Row="1"
-                                          Grid.Column="0"
-                                          Margin="2"
-                                          VerticalAlignment="Stretch"
-                                          Background="{x:Null}"
-                                          BorderThickness="0"
-                                          IsTabStop="False" />
-                            <TextBlock x:Name="RevealedPassword"
-                                       Grid.Row="1"
-                                       Grid.Column="0"
-                                       Margin="4 2 4 2"
-                                       Padding="{TemplateBinding Padding}"
-                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       FontSize="{TemplateBinding FontSize}"
-                                       IsHitTestVisible="False"
-                                       Text="{TemplateBinding Behaviors:PasswordBoxBindingBehavior.Password}"
-                                       Visibility="Collapsed" />
-                            <TextBlock x:Name="PART_Message"
-                                       Grid.Row="1"
-                                       Grid.Column="0"
-                                       Margin="6 2 6 2"
-                                       Padding="{TemplateBinding Padding}"
-                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
-                                       IsHitTestVisible="False"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
                                             Grid.ColumnSpan="2"
                                             Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
                                            Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
                             </ContentControl>
                             <ContentPresenter x:Name="PART_CapsLockIndicator"
@@ -653,49 +760,88 @@
                                               Margin="1"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
-                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
+                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                Path=(Controls:PasswordBoxHelper.CapsLockIcon),
+                                                                Mode=TwoWay}"
                                               TextBlock.Foreground="{DynamicResource ControlsValidationBrush}"
-                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
+                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip),
+                                                                Mode=OneWay}"
                                               Visibility="Collapsed" />
                             <Button x:Name="PART_RevealButton"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
-                                    Margin="0"
                                     Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{StaticResource RevealButtonStyle}"
+                                    Margin="0"
+                                    Focusable="False"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Focusable="False"
-                                    Visibility="{Binding ElementName=RevealedPassword, Path=Text, Converter={StaticResource StringToVisibilityConverter}}" />
+                                    Style="{StaticResource RevealButtonStyle}"
+                                    Visibility="{Binding ElementName=RevealedPassword,
+                                                         Path=Text,
+                                                         Converter={StaticResource StringToVisibilityConverter}}" />
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="3"
                                     Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                                      Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                                                                      Mode=OneWay}"
                                     Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                     ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
                                     Focusable="False"
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                         Mode=OneWay,
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Grid.Row="1"
+                                          Grid.Column="0"
+                                          Margin="2"
+                                          VerticalAlignment="Stretch"
+                                          Background="{x:Null}"
+                                          BorderThickness="0"
+                                          IsTabStop="False" />
+                            <TextBlock x:Name="RevealedPassword"
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Margin="4,2,4,2"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       FontSize="{TemplateBinding FontSize}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       IsHitTestVisible="False"
+                                       Text="{TemplateBinding Behaviors:PasswordBoxBindingBehavior.Password}"
+                                       Visibility="Collapsed" />
+                            <TextBlock x:Name="PART_Message"
+                                       Grid.Row="1"
+                                       Grid.Column="0"
+                                       Margin="6,2,6,2"
+                                       Padding="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       IsHitTestVisible="False"
+                                       Opacity="0.6"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
+                                       Visibility="Collapsed" />
                         </Grid>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Password, Mode=OneWay}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=Password,
+                                                       Mode=OneWay}"
+                                     Value="">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
@@ -704,12 +850,28 @@
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -721,19 +883,21 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_RevealButton" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_RevealButton" Property="Background" Value="{DynamicResource GrayBrush8}" />
                             <Setter TargetName="PART_RevealButton" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                         </Trigger>
                         <Trigger SourceName="PART_RevealButton" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ContentHost" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                             <Setter Property="PasswordChar" Value=" " />
-                            <Setter TargetName="RevealedPassword" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_ContentHost" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                             <Setter TargetName="PART_RevealButton" Property="Background" Value="{DynamicResource BlackBrush}" />
                             <Setter TargetName="PART_RevealButton" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="RevealedPassword" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
@@ -771,29 +935,29 @@
                                 <Condition Property="IsVisible" Value="True" />
                                 <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <!--  Win8MetroPasswordBox Style  -->
     <Style x:Key="Win8MetroPasswordBox"
-           TargetType="{x:Type PasswordBox}"
-           BasedOn="{StaticResource MetroButtonRevealedPasswordBox}">
+           BasedOn="{StaticResource MetroButtonRevealedPasswordBox}"
+           TargetType="{x:Type PasswordBox}">
         <Setter Property="AllowDrop" Value="true" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontSize" Value="15" />
     </Style>
-    
+
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.TextBox.xaml
index 485f780c30..d31a66b51a 100644
--- a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -11,57 +11,74 @@
     <Converters:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter" />
 
     <!--  TextBox Style  -->
-    <Style x:Key="MetroTextBox" TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+    <Style x:Key="MetroTextBox"
+           TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
-                        <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
+                        <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator"
+                                          Grid.Row="1"
+                                          Visibility="Collapsed">
                             <AdornerDecorator.CacheMode>
                                 <BitmapCache EnableClearType="True"
                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
@@ -73,19 +90,68 @@
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
+                                Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="2">
+                        <Border x:Name="DisabledVisualElement"
+                                Grid.Row="1"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsHitTestVisible="False"
+                                Opacity="0"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
+                        <Grid x:Name="PART_InnerGrid"
+                              Grid.Row="1"
+                              Margin="2">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>
+                            <Button x:Name="PART_ClearText"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="1"
+                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                                      Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                                                                      Mode=OneWay}"
+                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Focusable="False"
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:TextBoxHelper.ClearTextButton),
+                                                         Mode=OneWay,
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                             <ScrollViewer x:Name="PART_ContentHost"
                                           Grid.Row="1"
@@ -98,54 +164,21 @@
                             <TextBlock x:Name="PART_Message"
                                        Grid.Row="1"
                                        Grid.Column="0"
-                                       Margin="6 2 6 2"
+                                       Margin="6,2,6,2"
                                        Padding="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
                                        IsHitTestVisible="False"
+                                       Opacity="0.6"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
-                                            Grid.Column="0"
-                                            Grid.Row="0"
-                                            Grid.ColumnSpan="2"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
-                                           Foreground="{TemplateBinding Foreground}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
-                            </ContentControl>
-                            <Button x:Name="PART_ClearText"
-                                    Grid.Row="0"
-                                    Grid.RowSpan="2"
-                                    Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
-                                    Focusable="False"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=(Controls: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" />
@@ -153,7 +186,9 @@
                             <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
                         </DataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=Text}"
+                                     Value="">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
@@ -162,12 +197,28 @@
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -191,8 +242,10 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
@@ -230,59 +283,86 @@
                                 <Condition Property="IsVisible" Value="True" />
                                 <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
     </Style>
 
     <Style x:Key="MetroButtonTextBox"
            BasedOn="{StaticResource MetroTextBox}"
            TargetType="{x:Type TextBox}">
-        <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}" />
+        <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To=".2" />
+                                             To=".2"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
 
                         <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             From=".2"
-                                             Storyboard.TargetName="PART_Message"
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
                                              Storyboard.TargetProperty="Opacity"
-                                             To="0" />
+                                             From=".2"
+                                             To="0"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2"
-                                             Storyboard.TargetName="PART_Message"
-                                             Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Message"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="DisabledVisualElement"
+                                Background="{DynamicResource ControlsDisabledBrush}"
+                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                IsHitTestVisible="False"
+                                Opacity="0"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
                         <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator"
+                                          Grid.Row="1"
                                           Visibility="Collapsed">
                             <AdornerDecorator.CacheMode>
                                 <BitmapCache EnableClearType="True"
@@ -295,19 +375,56 @@
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
+                                Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Grid x:Name="PART_InnerGrid" Margin="2">
+                        <Grid x:Name="PART_InnerGrid"
+                              Grid.Row="1"
+                              Margin="2">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="TextColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="ButtonColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="ButtonRow" Height="*" />
+                                <RowDefinition x:Name="ButtonRow"
+                                               Height="*" />
                             </Grid.RowDefinitions>
+                            <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                <TextBlock x:Name="PART_InteriorFloatingMessage"
+                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
+                            </ContentControl>
+                            <Button x:Name="PART_ClearText"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="1"
+                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
+                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Focusable="False"
+                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False"
+                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                         Path=(Controls:TextBoxHelper.TextButton),
+                                                         Mode=OneWay,
+                                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                             <ScrollViewer x:Name="PART_ContentHost"
                                           Grid.Row="1"
@@ -320,55 +437,21 @@
                             <TextBlock x:Name="PART_Message"
                                        Grid.Row="1"
                                        Grid.Column="0"
-                                       Margin="6 2 6 2"
+                                       Margin="6,2,6,2"
                                        Padding="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Opacity="0.6"
                                        IsHitTestVisible="False"
+                                       Opacity="0.6"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        Visibility="Collapsed" />
-                            <ContentControl x:Name="PART_FloatingMessageContainer"
-                                            Grid.Column="0"
-                                            Grid.Row="0"
-                                            Grid.ColumnSpan="2"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <TextBlock x:Name="PART_FloatingMessage"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
-                                           Foreground="{TemplateBinding Foreground}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" />
-                            </ContentControl>
-                            <Button x:Name="PART_ClearText"
-                                    Grid.Row="0"
-                                    Grid.RowSpan="2"
-                                    Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                    IsTabStop="False"
-                                    Focusable="False"
-                                    Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
-                                IsHitTestVisible="False"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=(Controls: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" />
@@ -376,7 +459,9 @@
                             <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
                         </DataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},
+                                                       Path=Text}"
+                                     Value="">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
@@ -385,12 +470,28 @@
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}" Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -418,8 +519,10 @@
                         </MultiTrigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
@@ -435,15 +538,15 @@
                                 <Condition Property="IsVisible" Value="True" />
                                 <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{DynamicResource WaitingForDataEffect}" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_WaitingForDataEffectGrid" Property="Effect" Value="{x:Null}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -462,23 +565,29 @@
         <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <!-- Modern - Magnify -->
+                    <!--  Modern - Magnify  -->
                     <ContentControl x:Name="PART_PackIcon"
-                                    Style="{DynamicResource PathIconContentControlStyle}"
-                                    Content="M42.5,22A12.5,12.5 0 0,1 55,34.5A12.5,12.5 0 0,1 42.5,47C40.14,47 37.92,46.34 36,45.24L26.97,54.27C25.8,55.44 23.9,55.44 22.73,54.27C21.56,53.1 21.56,51.2 22.73,50.03L31.8,40.96C30.66,39.08 30,36.86 30,34.5A12.5,12.5 0 0,1 42.5,22M42.5,26A8.5,8.5 0 0,0 34,34.5A8.5,8.5 0 0,0 42.5,43A8.5,8.5 0 0,0 51,34.5A8.5,8.5 0 0,0 42.5,26Z"
+                                    Width="{Binding RelativeSource={RelativeSource AncestorType=TextBox},
+                                                    Path=(Controls:TextBoxHelper.ButtonWidth),
+                                                    Mode=OneWay}"
+                                    Height="{Binding RelativeSource={RelativeSource AncestorType=TextBox},
+                                                     Path=(Controls:TextBoxHelper.ButtonWidth),
+                                                     Mode=OneWay}"
                                     Padding="3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Width="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
-                                    Height="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
+                                    Content="M42.5,22A12.5,12.5 0 0,1 55,34.5A12.5,12.5 0 0,1 42.5,47C40.14,47 37.92,46.34 36,45.24L26.97,54.27C25.8,55.44 23.9,55.44 22.73,54.27C21.56,53.1 21.56,51.2 22.73,50.03L31.8,40.96C30.66,39.08 30,36.86 30,34.5A12.5,12.5 0 0,1 42.5,22M42.5,26A8.5,8.5 0 0,0 34,34.5A8.5,8.5 0 0,0 42.5,43A8.5,8.5 0 0,0 51,34.5A8.5,8.5 0 0,0 42.5,26Z"
+                                    Style="{DynamicResource PathIconContentControlStyle}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="MetroRichTextBox" TargetType="{x:Type RichTextBox}">
+    <Style x:Key="MetroRichTextBox"
+           TargetType="{x:Type RichTextBox}">
         <Style.Resources>
-            <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="{x:Type Hyperlink}">
+            <Style BasedOn="{StaticResource {x:Type Hyperlink}}"
+                   TargetType="{x:Type Hyperlink}">
                 <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                 <Setter Property="TextDecorations" Value="Underline" />
                 <Style.Triggers>
@@ -496,21 +605,21 @@
         </Style.Resources>
         <Setter Property="AllowDrop" Value="True" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="MinWidth" Value="10" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
@@ -522,16 +631,19 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                            <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource ControlsDisabledBrush}"
                                 BorderBrush="{DynamicResource ControlsDisabledBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
                                 IsHitTestVisible="False"
+                                Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Shared.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Shared.xaml
index 8d78aea58a..fc59c5bb05 100644
--- a/src/MahApps.Metro/MahApps.Metro/Styles/Shared.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Styles/Shared.xaml
@@ -13,55 +13,126 @@
                      Exponent="2" />
 
     <DropShadowEffect x:Key="WaitingForDataEffect"
-                      Opacity="0"
                       BlurRadius="10"
+                      Opacity="0"
                       ShadowDepth="0"
                       Color="{DynamicResource BlackColor}" />
 
-    <Storyboard x:Key="WaitingForDataStoryboard" po:Freeze="True">
+    <Storyboard x:Key="WaitingForDataStoryboard"
+                po:Freeze="True">
         <DoubleAnimation AutoReverse="True"
-                         Duration="00:00:02"
-                         From="0"
                          RepeatBehavior="Forever"
+                         Timeline.DesiredFrameRate="30"
                          Storyboard.TargetName="PART_WaitingForDataEffectGrid"
                          Storyboard.TargetProperty="(Effect).Opacity"
-                         Timeline.DesiredFrameRate="30"
-                         To="1" />
+                         From="0"
+                         To="1"
+                         Duration="00:00:02" />
     </Storyboard>
 
-    <Storyboard x:Key="HideFloatingMessageStoryboard">
-        <DoubleAnimation Duration="0:0:.2"
+    <Storyboard x:Key="HideExteriorFloatingMessageStoryboard">
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
+                         Storyboard.TargetName="PART_ExteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="MaxHeight"
                          From="15"
-                         EasingFunction="{StaticResource ExpoEaseInOut}"
-                         Storyboard.TargetName="PART_FloatingMessageContainer"
+                         To="0"
+                         Duration="0:0:.2" />
+        <DoubleAnimation Storyboard.TargetName="PART_ExteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="Opacity"
+                         To="0"
+                         Duration="0:0:.2" />
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseIn}"
+                         Storyboard.TargetName="PART_ExteriorFloatingMessage"
+                         Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
+                         To="20"
+                         Duration="0:0:.2" />
+    </Storyboard>
+
+    <Storyboard x:Key="ShowExteriorFloatingMessageStoryboard">
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
+                         Storyboard.TargetName="PART_ExteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="MaxHeight"
+                         From="0"
+                         To="15"
+                         Duration="0:0:.2" />
+        <DoubleAnimation Storyboard.TargetName="PART_ExteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="Opacity"
+                         Duration="0:0:.2" />
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseOut}"
+                         Storyboard.TargetName="PART_ExteriorFloatingMessage"
+                         Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
+                         To="0"
+                         Duration="0:0:.2" />
+    </Storyboard>
+
+    <Storyboard x:Key="HideInteriorFloatingMessageStoryboard">
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
+                         Storyboard.TargetName="PART_InteriorFloatingMessageContainer"
                          Storyboard.TargetProperty="MaxHeight"
-                         To="0" />
-        <DoubleAnimation Duration="0:0:.2"
+                         From="15"
+                         To="0"
+                         Duration="0:0:.2" />
+        <DoubleAnimation Storyboard.TargetName="PART_InteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="Opacity"
+                         To="0"
+                         Duration="0:0:.2" />
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseIn}"
+                         Storyboard.TargetName="PART_InteriorFloatingMessage"
+                         Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
+                         To="20"
+                         Duration="0:0:.2" />
+    </Storyboard>
+
+    <Storyboard x:Key="ShowInteriorFloatingMessageStoryboard">
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
+                         Storyboard.TargetName="PART_InteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="MaxHeight"
+                         From="0"
+                         To="15"
+                         Duration="0:0:.2" />
+        <DoubleAnimation Storyboard.TargetName="PART_InteriorFloatingMessageContainer"
+                         Storyboard.TargetProperty="Opacity"
+                         Duration="0:0:.2" />
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseOut}"
+                         Storyboard.TargetName="PART_InteriorFloatingMessage"
+                         Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
+                         To="0"
+                         Duration="0:0:.2" />
+    </Storyboard>
+
+    <Storyboard x:Key="HideFloatingMessageStoryboard">
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
                          Storyboard.TargetName="PART_FloatingMessageContainer"
+                         Storyboard.TargetProperty="MaxHeight"
+                         From="15"
+                         To="0"
+                         Duration="0:0:.2" />
+        <DoubleAnimation Storyboard.TargetName="PART_FloatingMessageContainer"
                          Storyboard.TargetProperty="Opacity"
-                         To="0" />
-        <DoubleAnimation Duration="0:0:.2"
-                         EasingFunction="{StaticResource ExpoEaseIn}"
+                         To="0"
+                         Duration="0:0:.2" />
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseIn}"
                          Storyboard.TargetName="PART_FloatingMessage"
                          Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                         To="20" />
+                         To="20"
+                         Duration="0:0:.2" />
     </Storyboard>
 
     <Storyboard x:Key="ShowFloatingMessageStoryboard">
-        <DoubleAnimation Duration="0:0:.2"
-                         From="0"
-                         EasingFunction="{StaticResource ExpoEaseInOut}"
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
                          Storyboard.TargetName="PART_FloatingMessageContainer"
                          Storyboard.TargetProperty="MaxHeight"
-                         To="15" />
-        <DoubleAnimation Duration="0:0:.2"
-                         Storyboard.TargetName="PART_FloatingMessageContainer"
-                         Storyboard.TargetProperty="Opacity" />
-        <DoubleAnimation Duration="0:0:.2"
-                         EasingFunction="{StaticResource ExpoEaseOut}"
+                         From="0"
+                         To="15"
+                         Duration="0:0:.2" />
+        <DoubleAnimation Storyboard.TargetName="PART_FloatingMessageContainer"
+                         Storyboard.TargetProperty="Opacity"
+                         Duration="0:0:.2" />
+        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseOut}"
                          Storyboard.TargetName="PART_FloatingMessage"
                          Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                         To="0" />
+                         To="0"
+                         Duration="0:0:.2" />
     </Storyboard>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/DateTimePicker.xaml
index 14011f8be4..73d7a780c5 100644
--- a/src/MahApps.Metro/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -131,7 +131,22 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:TimePickerBase}">
                     <Grid Background="{TemplateBinding Background}">
-                        <Border x:Name="Base"
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <ContentControl x:Name="PART_ExteriorFloatingMessageContainer"
+                                        Grid.Row="0"
+                                        Margin="0,0,0,1"
+                                        Style="{DynamicResource FloatingMessageContainerStyle}">
+                            <TextBlock x:Name="PART_ExteriorFloatingMessage"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                       Text="{TemplateBinding controls:TextBoxHelper.Watermark}" />
+                        </ContentControl>
+                        <Border x:Name="Base" Grid.Row="1"
                                 BorderBrush="{DynamicResource ControlBorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
@@ -161,12 +176,12 @@
                                         <behaviours:DatePickerTextBoxBehavior />
                                     </i:Interaction.Behaviors>
                                 </DatePickerTextBox>
-                                <ContentControl x:Name="PART_FloatingMessageContainer"
+                                <ContentControl x:Name="PART_InteriorFloatingMessageContainer"
                                             Grid.Column="0"
                                             Grid.Row="0"
                                             Grid.ColumnSpan="2"
                                             Style="{DynamicResource FloatingMessageContainerStyle}">
-                                    <TextBlock x:Name="PART_FloatingMessage"
+                                    <TextBlock x:Name="PART_InteriorFloatingMessage"
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Style="{DynamicResource MetroAutoCollapsingTextBlock}"
@@ -335,8 +350,18 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True" SourceName="PART_TextBox">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ExteriorFloatingMessage"
+                                    Property="Opacity"
+                                    Value="1" />
+                            <Setter TargetName="PART_InteriorFloatingMessage"
+                                    Property="Foreground"
+                                    Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_InteriorFloatingMessage"
+                                    Property="Opacity"
+                                    Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.FocusBorderBrush)}" />
@@ -376,12 +401,33 @@
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding Path=(controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}"
+                                           Value="Exterior" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ShowExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.EnterActions>
+                            <MultiDataTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource HideExteriorFloatingMessageStoryboard}" />
+                            </MultiDataTrigger.ExitActions>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}"
+                                           Value="True" />
+                                <Condition Binding="{Binding Path=(controls:TextBoxHelper.FloatingWatermarkLocation), RelativeSource={RelativeSource Self}}"
+                                           Value="Interior" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource ShowInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource HideInteriorFloatingMessageStoryboard}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/HamburgerMenu.xaml
index d5a7b73ada..ca69e0f4bc 100644
--- a/src/MahApps.Metro/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -18,7 +18,9 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid Background="Transparent">
-                        <Grid x:Name="PART_Background" Background="{TemplateBinding Background}" Opacity="0" />
+                        <Grid x:Name="PART_Background"
+                              Background="{TemplateBinding Background}"
+                              Opacity="0" />
                         <ContentPresenter x:Name="PART_ContentPresenter"
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -54,17 +56,18 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="ItemContainerStyle">
             <Setter.Value>
-                <Style BasedOn="{StaticResource MetroListBoxItem}" TargetType="{x:Type ListBoxItem}">
+                <Style BasedOn="{StaticResource MetroListBoxItem}"
+                       TargetType="{x:Type ListBoxItem}">
                     <Setter Property="Background" Value="Transparent" />
-                    <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ItemsControl}}, Path=Foreground, Mode=OneWay}" />
                     <Setter Property="BorderThickness" Value="0" />
                     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                    <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ItemsControl}}, Path=Foreground, Mode=OneWay}" />
                     <Setter Property="Margin" Value="0" />
                     <Setter Property="Padding" Value="0" />
                     <Style.Triggers>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource AccentSelectedColorBrush}" />
                             <Setter Property="Background" Value="{DynamicResource AccentColorBrush4}" />
+                            <Setter Property="Foreground" Value="{DynamicResource AccentSelectedColorBrush}" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>
@@ -74,8 +77,6 @@
     </Style>
 
     <Style TargetType="{x:Type controls:HamburgerMenu}">
-        <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneBackgroundBrush}" />
-        <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneForegroundBrush}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HamburgerMenuTemplate">
             <Setter.Value>
@@ -90,6 +91,8 @@
         </Setter>
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneBackgroundBrush}" />
+        <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneForegroundBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:HamburgerMenu}">
@@ -97,8 +100,10 @@
                         <controls:SplitView x:Name="MainSplitView"
                                             CompactPaneLength="{TemplateBinding CompactPaneLength}"
                                             DisplayMode="{TemplateBinding DisplayMode}"
+                                            IsPaneOpen="{Binding IsPaneOpen,
+                                                                 Mode=TwoWay,
+                                                                 RelativeSource={RelativeSource TemplatedParent}}"
                                             IsTabStop="False"
-                                            IsPaneOpen="{Binding IsPaneOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                             OpenPaneLength="{TemplateBinding OpenPaneLength}"
                                             PaneBackground="{TemplateBinding PaneBackground}"
                                             PaneForeground="{TemplateBinding PaneForeground}"
@@ -108,66 +113,104 @@
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition />
-                                        <RowDefinition Height="Auto" />
                                     </Grid.RowDefinitions>
-                                    <Grid Grid.Row="0" Height="{TemplateBinding HamburgerHeight}" />
-                                    <ListBox Name="ButtonsListView"
-                                             Grid.Row="1"
-                                             Foreground="{TemplateBinding PaneForeground}"
-                                             Width="{TemplateBinding OpenPaneLength}"
-                                             AutomationProperties.Name="Menu items"
-                                             ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                             ItemTemplate="{TemplateBinding ItemTemplate}"
-                                             ItemsSource="{TemplateBinding ItemsSource}"
-                                             SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedIndex, Mode=TwoWay}"
-                                             SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem, Mode=TwoWay}"
-                                             SelectionMode="Single"
-                                             Style="{StaticResource HamburgerListBoxStyle}"
-                                             TabIndex="1">
-                                    </ListBox>
-
-                                    <Grid Grid.Row="2" Visibility="{TemplateBinding OptionsVisibility}">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition />
-                                        </Grid.RowDefinitions>
-
-                                        <ListBox Name="OptionsListView"
-                                                 Grid.Row="1"
-                                                 Foreground="{TemplateBinding PaneForeground}"
-                                                 Width="{TemplateBinding OpenPaneLength}"
-                                                 VerticalAlignment="Bottom"
-                                                 AutomationProperties.Name="Option items"
-                                                 ItemTemplateSelector="{TemplateBinding OptionsItemTemplateSelector}"
-                                                 ItemTemplate="{TemplateBinding OptionsItemTemplate}"
-                                                 ItemsSource="{TemplateBinding OptionsItemsSource}"
-                                                 SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsIndex, Mode=TwoWay}"
-                                                 SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsItem, Mode=TwoWay}"
-                                                 Style="{StaticResource HamburgerListBoxStyle}"
-                                                 TabIndex="2" />
-                                    </Grid>
+                                    <Grid Grid.Row="0"
+                                          Height="{TemplateBinding HamburgerHeight}" />
+                                    <ScrollViewer x:Name="HamburgerMenuScrollViewer"
+                                                  Grid.Row="1"
+                                                  HorizontalAlignment="Stretch"
+                                                  VerticalAlignment="Stretch"
+                                                  FlowDirection="RightToLeft">
+                                        <ScrollViewer.Style>
+                                            <Style>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding IsMouseOver,
+                                                                                   ElementName=HamburgerMenuScrollViewer}"
+                                                                 Value="True">
+                                                        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+                                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding IsMouseOver,
+                                                                                   ElementName=HamburgerMenuScrollViewer}"
+                                                                 Value="False">
+                                                        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ScrollViewer.Style>
+                                        <Grid x:Name="HamburgerMenuInnerPaneGrid"
+                                              FlowDirection="LeftToRight">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <ListBox Name="ButtonsListView"
+                                                     Grid.Row="0"
+                                                     Width="{TemplateBinding OpenPaneLength}"
+                                                     AutomationProperties.Name="Menu items"
+                                                     Foreground="{TemplateBinding PaneForeground}"
+                                                     ItemTemplate="{TemplateBinding ItemTemplate}"
+                                                     ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                     ItemsSource="{TemplateBinding ItemsSource}"
+                                                     SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                             Path=SelectedIndex,
+                                                                             Mode=TwoWay}"
+                                                     SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                            Path=SelectedItem,
+                                                                            Mode=TwoWay}"
+                                                     SelectionMode="Single"
+                                                     Style="{StaticResource HamburgerListBoxStyle}"
+                                                     TabIndex="1" />
+                                            <Grid Grid.Row="2"
+                                                  Visibility="{TemplateBinding OptionsVisibility}">
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition />
+                                                </Grid.RowDefinitions>
 
+                                                <ListBox Name="OptionsListView"
+                                                         Grid.Row="1"
+                                                         Width="{TemplateBinding OpenPaneLength}"
+                                                         VerticalAlignment="Bottom"
+                                                         AutomationProperties.Name="Option items"
+                                                         Foreground="{TemplateBinding PaneForeground}"
+                                                         ItemTemplate="{TemplateBinding OptionsItemTemplate}"
+                                                         ItemTemplateSelector="{TemplateBinding OptionsItemTemplateSelector}"
+                                                         ItemsSource="{TemplateBinding OptionsItemsSource}"
+                                                         SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                 Path=SelectedOptionsIndex,
+                                                                                 Mode=TwoWay}"
+                                                         SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                                                Path=SelectedOptionsItem,
+                                                                                Mode=TwoWay}"
+                                                         Style="{StaticResource HamburgerListBoxStyle}"
+                                                         TabIndex="2" />
+                                            </Grid>
+                                        </Grid>
+                                    </ScrollViewer>
                                 </Grid>
                             </controls:SplitView.Pane>
-                            <controls:TransitioningContentControl HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            <controls:TransitioningContentControl Padding="{TemplateBinding Padding}"
+                                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                                                   AutomationProperties.Name="Content"
                                                                   Content="{TemplateBinding Content}"
                                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
                                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                                  Padding="{TemplateBinding Padding}"
                                                                   RestartTransitionOnContentChange="True"
                                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                                                   Transition="{TemplateBinding ContentTransition}" />
                         </controls:SplitView>
                         <Button x:Name="HamburgerButton"
-                                Foreground="{TemplateBinding PaneForeground}"
                                 Width="{TemplateBinding HamburgerWidth}"
                                 Height="{TemplateBinding HamburgerHeight}"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top"
                                 AutomationProperties.Name="Main button"
+                                Foreground="{TemplateBinding PaneForeground}"
                                 Style="{StaticResource HamburgerButtonStyle}"
                                 TabIndex="0">
                             <ContentControl Margin="{TemplateBinding HamburgerMargin}"
diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/NumericUpDown.xaml
index 1f734141b2..055ebafe3c 100644
--- a/src/MahApps.Metro/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -10,26 +10,24 @@
     <converters:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter" />
 
     <Style TargetType="{x:Type Controls:NumericUpDown}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="UpDownButtonsWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Right" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="MinWidth" Value="62" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="SnapsToDevicePixels" Value="true" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:NumericUpDown}">
@@ -41,72 +39,75 @@
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="PART_TextBoxColumn" Width="*" />
-                                <ColumnDefinition x:Name="PART_NumericUpColumn" Width="Auto" />
-                                <ColumnDefinition x:Name="PART_NumericDownColumn" Width="Auto" />
+                                <ColumnDefinition x:Name="PART_TextBoxColumn"
+                                                  Width="*" />
+                                <ColumnDefinition x:Name="PART_NumericUpColumn"
+                                                  Width="Auto" />
+                                <ColumnDefinition x:Name="PART_NumericDownColumn"
+                                                  Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <TextBox x:Name="PART_TextBox"
                                      Grid.Column="0"
-                                     Margin="0 0 -2 0"
                                      MinWidth="20"
                                      MinHeight="{TemplateBinding MinHeight}"
+                                     Margin="0,0,-2,0"
                                      HorizontalAlignment="Stretch"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     Background="{x:Null}"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     BorderThickness="0"
-                                     FontFamily="{TemplateBinding FontFamily}"
-                                     FontSize="{TemplateBinding FontSize}"
                                      Controls:ControlsHelper.DisabledVisualElementVisibility="Collapsed"
-                                     Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                      Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
                                      Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
                                      Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
                                      Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                     Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                      Controls:TextBoxHelper.ButtonsAlignment="{TemplateBinding ButtonsAlignment}"
                                      Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
+                                     Controls:TextBoxHelper.HasText="{TemplateBinding Controls:TextBoxHelper.HasText}"
                                      Controls:TextBoxHelper.SelectAllOnFocus="{TemplateBinding Controls:TextBoxHelper.SelectAllOnFocus}"
-                                     Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                      Controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding Controls:TextBoxHelper.UseFloatingWatermark}"
-                                     Controls:TextBoxHelper.HasText="{TemplateBinding Controls:TextBoxHelper.HasText}"
+                                     Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
+                                     Background="{x:Null}"
+                                     BorderThickness="0"
                                      FocusVisualStyle="{x:Null}"
+                                     Focusable="{TemplateBinding Focusable}"
+                                     FontFamily="{TemplateBinding FontFamily}"
+                                     FontSize="{TemplateBinding FontSize}"
+                                     Foreground="{TemplateBinding Foreground}"
                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                      IsReadOnly="{TemplateBinding IsReadOnly}"
                                      IsTabStop="{TemplateBinding IsTabStop}"
-                                     Focusable="{TemplateBinding Focusable}"
                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                      TabIndex="{TemplateBinding TabIndex}"
                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                             <RepeatButton x:Name="PART_NumericUp"
                                           Grid.Column="1"
                                           Width="{TemplateBinding UpDownButtonsWidth}"
-                                          Margin="0 2 0 2"
-                                          Style="{DynamicResource ChromelessButtonStyle}"
-                                          Foreground="{TemplateBinding Foreground}"
+                                          Margin="0,2,0,2"
                                           Delay="{TemplateBinding Delay}"
-                                          IsTabStop="False">
+                                          Foreground="{TemplateBinding Foreground}"
+                                          IsTabStop="False"
+                                          Style="{DynamicResource ChromelessButtonStyle}">
                                 <Path x:Name="PolygonUp"
                                       Width="14"
                                       Height="14"
-                                      Fill="{DynamicResource GrayBrush1}"
                                       Data="F1 M 35,19L 41,19L 41,35L 57,35L 57,41L 41,41L 41,57L 35,57L 35,41L 19,41L 19,35L 35,35L 35,19 Z "
+                                      Fill="{DynamicResource GrayBrush1}"
                                       Stretch="Fill" />
                             </RepeatButton>
                             <RepeatButton x:Name="PART_NumericDown"
                                           Grid.Column="2"
                                           Width="{TemplateBinding UpDownButtonsWidth}"
-                                          Margin="0 2 2 2"
+                                          Margin="0,2,2,2"
                                           VerticalContentAlignment="Center"
-                                          Style="{DynamicResource ChromelessButtonStyle}"
-                                          Foreground="{TemplateBinding Foreground}"
                                           Delay="{TemplateBinding Delay}"
-                                          IsTabStop="False">
+                                          Foreground="{TemplateBinding Foreground}"
+                                          IsTabStop="False"
+                                          Style="{DynamicResource ChromelessButtonStyle}">
                                 <Path x:Name="PolygonDown"
                                       Width="14"
                                       Height="3"
-                                      Fill="{DynamicResource GrayBrush1}"
                                       Data="F1 M 19,38L 57,38L 57,44L 19,44L 19,38 Z "
+                                      Fill="{DynamicResource GrayBrush1}"
                                       Stretch="Fill" />
                             </RepeatButton>
                         </Grid>
@@ -114,21 +115,23 @@
                                 Background="{DynamicResource ControlsDisabledBrush}"
                                 BorderBrush="{DynamicResource ControlsDisabledBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                Opacity="0"
                                 IsHitTestVisible="False"
+                                Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent},
+                                                     Path=(Controls:ControlsHelper.DisabledVisualElementVisibility),
+                                                     Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="ButtonsAlignment" Value="Left">
                             <Setter TargetName="PART_NumericDown" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="PART_NumericDown" Property="Margin" Value="0 2 0 2" />
+                            <Setter TargetName="PART_NumericDown" Property="Margin" Value="0,2,0,2" />
                             <Setter TargetName="PART_NumericDownColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_NumericUp" Property="Grid.Column" Value="0" />
-                            <Setter TargetName="PART_NumericUp" Property="Margin" Value="2 2 0 2" />
+                            <Setter TargetName="PART_NumericUp" Property="Margin" Value="2,2,0,2" />
                             <Setter TargetName="PART_NumericUpColumn" Property="Width" Value="Auto" />
                             <Setter TargetName="PART_TextBox" Property="Grid.Column" Value="2" />
-                            <Setter TargetName="PART_TextBox" Property="Margin" Value="-2 0 0 0" />
+                            <Setter TargetName="PART_TextBox" Property="Margin" Value="-2,0,0,0" />
                             <Setter TargetName="PART_TextBoxColumn" Property="Width" Value="Auto" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
@@ -174,5 +177,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="UpDownButtonsWidth" Value="22" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file