diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
index 4e1964c1..8cbc0403 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
@@ -9,17 +9,20 @@
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#3C7FB1" Offset="0.05"/>
-        <GradientStop Color="#98D6FA" Offset="0.07"/>
-        <GradientStop Color="#AEDDF8" Offset="1"/>
+        <GradientStop Color="#5794BF" Offset="0.05"/>
+        <GradientStop Color="#B7D5EA" Offset="0.07"/>
+        <GradientStop Color="#C7E2F1" Offset="1"/>
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#3C7FB1" Offset="0.05"/>
-        <GradientStop Color="#98D6FA" Offset="0.07"/>
-        <GradientStop Color="#AEDDF8" Offset="1"/>
+        <GradientStop Color="#3D7BAD" Offset="0.05"/>
+        <GradientStop Color="#A4C9E3" Offset="0.07"/>
+        <GradientStop Color="#B7D9ED" Offset="1"/>
     </LinearGradientBrush>
 
+    <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
+    <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
+
     <DataTemplate x:Key="DefaultWatermarkTemplate">
         <ContentControl Content="{Binding}" Foreground="Gray" />
     </DataTemplate>
@@ -40,15 +43,15 @@
                 <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
                     <Grid>
 
-                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1.5" Background="{TemplateBinding Background}">
+                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}">
                             
                         </Border>
 
-                        <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1.5" >
+                        <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" >
                             
                         </Border>
 
-                        <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1.5" >
+                        <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" >
                            
                         </Border>
 
@@ -81,7 +84,8 @@
                             <Setter TargetName="FocusVisual" Property="Opacity"  Value="1" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="Border"  Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                            <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}"/>
+                            <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}"/>
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>