diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
index 6400c7a6..950d8a09 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
@@ -50,6 +50,9 @@
         </Setter>
     </Style>
 
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="Gray" />
+    </DataTemplate>
 
     <!-- =============================================================================== -->
     <!-- CalculatorUpDown                                                                -->
@@ -60,6 +63,7 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
@@ -71,20 +75,22 @@
                             </Grid.ColumnDefinitions>
                             <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" BorderThickness="{TemplateBinding BorderThickness}"
                                          AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                                <TextBox x:Name="TextBox" BorderThickness="0" 
-                                         Background="{TemplateBinding Background}"
-                                         FontFamily="{TemplateBinding FontFamily}" 
-                                         FontSize="{TemplateBinding FontSize}" 
-                                         FontStretch="{TemplateBinding FontStretch}"
-                                         FontStyle="{TemplateBinding FontStyle}" 
-                                         FontWeight="{TemplateBinding FontWeight}" 
-                                         Foreground="{TemplateBinding Foreground}" 
-                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                         IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                         MinWidth="20" AcceptsReturn="False" 
-                                         TextWrapping="NoWrap" 
-                                         TabIndex="{TemplateBinding TabIndex}"
-                                         Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
+                                                        Background="{TemplateBinding Background}"
+                                                        FontFamily="{TemplateBinding FontFamily}" 
+                                                        FontSize="{TemplateBinding FontSize}" 
+                                                        FontStretch="{TemplateBinding FontStretch}"
+                                                        FontStyle="{TemplateBinding FontStyle}" 
+                                                        FontWeight="{TemplateBinding FontWeight}" 
+                                                        Foreground="{TemplateBinding Foreground}" 
+                                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                        IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                                        MinWidth="20" AcceptsReturn="False" 
+                                                        TextWrapping="NoWrap" 
+                                                        TabIndex="{TemplateBinding TabIndex}"
+                                                        Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                        Watermark="{TemplateBinding Watermark}"
+                                                        WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
                             </local:ButtonSpinner>
                             <ToggleButton x:Name="_calculatorToggleButton" Grid.Column="1"
                                           IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
index d802c662..f3ec5fdf 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
@@ -41,6 +41,28 @@ namespace Microsoft.Windows.Controls.Primitives
 
         #endregion //Text
 
+        #region Watermark
+
+        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register("Watermark", typeof(object), typeof(InputBase), new UIPropertyMetadata(null));
+        public object Watermark
+        {
+            get { return (object)GetValue(WatermarkProperty); }
+            set { SetValue(WatermarkProperty, value); }
+        }
+
+        #endregion //Watermark
+
+        #region WatermarkTemplate
+
+        public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register("WatermarkTemplate", typeof(DataTemplate), typeof(InputBase), new UIPropertyMetadata(null));
+        public DataTemplate WatermarkTemplate
+        {
+            get { return (DataTemplate)GetValue(WatermarkTemplateProperty); }
+            set { SetValue(WatermarkTemplateProperty, value); }
+        }
+
+        #endregion //WatermarkTemplate
+
         #endregion //Properties
     }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
index 27004fc9..24087089 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -2,6 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="Gray" />
+    </DataTemplate>
+    
     <!-- =============================================================================== -->
     <!-- DateTimeUpDown                                                                  -->
     <!-- =============================================================================== -->
@@ -11,25 +15,28 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
                     <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" BorderThickness="{TemplateBinding BorderThickness}"
                                          AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                        <TextBox x:Name="TextBox" BorderThickness="0" 
-                                 Background="{TemplateBinding Background}"
-                                 FontFamily="{TemplateBinding FontFamily}" 
-                                 FontSize="{TemplateBinding FontSize}" 
-                                 FontStretch="{TemplateBinding FontStretch}"
-                                 FontStyle="{TemplateBinding FontStyle}" 
-                                 FontWeight="{TemplateBinding FontWeight}" 
-                                 Foreground="{TemplateBinding Foreground}" 
-                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 IsReadOnly="True"
-                                 MinWidth="20" AcceptsReturn="False" 
-                                 TextWrapping="NoWrap" 
-                                 TabIndex="{TemplateBinding TabIndex}"
-                                 Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
+                                                Background="{TemplateBinding Background}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="True"
+                                                MinWidth="20" AcceptsReturn="False" 
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
                     </local:ButtonSpinner>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
index 7d582d12..49422736 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
@@ -5,7 +5,11 @@
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
     <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="Gray" />
+    </DataTemplate>
+
     <!-- =============================================================================== -->
     <!-- MaskedTextBox                                                                   -->
     <!-- =============================================================================== -->
@@ -13,22 +17,25 @@
     <Style TargetType="{x:Type local:MaskedTextBox}">
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="Focusable" Value="False" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:MaskedTextBox}">
-                    <TextBox x:Name="TextBox" 
-                             Background="{TemplateBinding Background}"
-                             FontFamily="{TemplateBinding FontFamily}" 
-                             FontSize="{TemplateBinding FontSize}" 
-                             FontStretch="{TemplateBinding FontStretch}"
-                             FontStyle="{TemplateBinding FontStyle}" 
-                             FontWeight="{TemplateBinding FontWeight}" 
-                             Foreground="{TemplateBinding Foreground}"
-                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                             IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                             MinWidth="20" AcceptsReturn="False" TextWrapping="NoWrap" 
-                             TabIndex="{TemplateBinding TabIndex}"
-                             Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <local:WatermarkTextBox x:Name="TextBox" 
+                                            Background="{TemplateBinding Background}"
+                                            FontFamily="{TemplateBinding FontFamily}" 
+                                            FontSize="{TemplateBinding FontSize}" 
+                                            FontStretch="{TemplateBinding FontStretch}"
+                                            FontStyle="{TemplateBinding FontStyle}" 
+                                            FontWeight="{TemplateBinding FontWeight}" 
+                                            Foreground="{TemplateBinding Foreground}"
+                                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                            MinWidth="20" AcceptsReturn="False" TextWrapping="NoWrap" 
+                                            TabIndex="{TemplateBinding TabIndex}"
+                                            Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Watermark="{TemplateBinding Watermark}"
+                                            WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
index 4ff4b52c..c66e5cb7 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
@@ -5,6 +5,10 @@
 
     <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="Gray" />
+    </DataTemplate>
+
     <!-- =============================================================================== -->
     <!-- NumericUpDown                                                                   -->
     <!-- =============================================================================== -->
@@ -14,25 +18,28 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
         <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:NumericUpDown}">
                     <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" BorderThickness="{TemplateBinding BorderThickness}"
                                          AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                        <TextBox x:Name="TextBox" BorderThickness="0" 
-                                 Background="{TemplateBinding Background}"
-                                 FontFamily="{TemplateBinding FontFamily}" 
-                                 FontSize="{TemplateBinding FontSize}" 
-                                 FontStretch="{TemplateBinding FontStretch}"
-                                 FontStyle="{TemplateBinding FontStyle}" 
-                                 FontWeight="{TemplateBinding FontWeight}" 
-                                 Foreground="{TemplateBinding Foreground}" 
-                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                 MinWidth="20" AcceptsReturn="False" 
-                                 TextWrapping="NoWrap" 
-                                 TabIndex="{TemplateBinding TabIndex}"
-                                 Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
+                                                Background="{TemplateBinding Background}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                                MinWidth="20" AcceptsReturn="False" 
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
                     </local:ButtonSpinner>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
deleted file mode 100644
index 209cd7e1..00000000
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Microsoft.Windows.Controls.PropertyGrid.Editors
-{
-    public class IntegerUpDownEditor : NumericUpDownEditor
-    {
-        protected override void SetControlProperties()
-        {
-            Editor.Maximum = int.MaxValue;
-            Editor.Minimum = int.MinValue;
-            Editor.ValueType = typeof(int);
-            Editor.FormatString = "F0";
-        }
-    }
-}