diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png
new file mode 100644
index 00000000..df0970c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
index 8acfa9c4..01408e80 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
@@ -81,6 +81,9 @@
     <Compile Include="Views\NavigationView.xaml.cs">
       <DependentUpon>NavigationView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\WatermarkTextBoxView.xaml.cs">
+      <DependentUpon>WatermarkTextBoxView.xaml</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -110,6 +113,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\WatermarkTextBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\PencilTool16.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
index 23fb8bac..3cac99eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
@@ -20,6 +20,7 @@ namespace Samples.Modules.Text
         protected override void RegisterViewsAndTypes()
         {
             Container.RegisterNavigationType(typeof(HomeView));
+            Container.RegisterNavigationType(typeof(WatermarkTextBoxView));
         }
     }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
index e681092c..87929223 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
@@ -11,5 +11,6 @@
     <TreeViewItem Header="MaskedTextBox" />
     <TreeViewItem Header="MultiLineTextEditor" />
     <TreeViewItem Header="RichTextBox" />
+    <TreeViewItem Header="WatermarkTextBox" Tag="{x:Type views:WatermarkTextBoxView}" />
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
new file mode 100644
index 00000000..33a04260
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
@@ -0,0 +1,41 @@
+<infControls:DemoView x:Class="Samples.Modules.Text.Views.WatermarkTextBoxView"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                      xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
+                      Title="WatermarkTextBox">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <TextBlock Text="The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text." />
+        
+        <StackPanel Grid.Row="1" Margin="10">
+            <TextBlock Text="Default:" Style="{StaticResource Header}" />
+            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" Watermark="Enter Text" />
+
+            <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
+            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" >
+                <extToolkit:WatermarkTextBox.Watermark>
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="/Samples.Modules.Text;component/Images/PencilTool16.png" Stretch="None" />
+                        <TextBlock Text="Enter Text" Margin="4,0,0,0" />
+                    </StackPanel>
+                </extToolkit:WatermarkTextBox.Watermark>
+            </extToolkit:WatermarkTextBox>
+
+            <TextBlock Grid.Row="2" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
+            <extToolkit:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text">
+                <extToolkit:WatermarkTextBox.WatermarkTemplate>
+                    <DataTemplate>
+                        <Border BorderBrush="Green" BorderThickness="1" Padding="5" >
+                            <ContentControl Content="{Binding}" Foreground="DarkRed" FontWeight="Bold" Focusable="False" />
+                        </Border>
+                    </DataTemplate>
+                </extToolkit:WatermarkTextBox.WatermarkTemplate>
+            </extToolkit:WatermarkTextBox>
+        </StackPanel>
+    </Grid>
+</infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
new file mode 100644
index 00000000..899e78b5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using Samples.Infrastructure.Controls;
+using Microsoft.Practices.Prism.Regions;
+
+namespace Samples.Modules.Text.Views
+{
+    /// <summary>
+    /// Interaction logic for WatermarkTextBoxView.xaml
+    /// </summary>
+    [RegionMemberLifetime(KeepAlive=false)]
+    public partial class WatermarkTextBoxView : DemoView
+    {
+        public WatermarkTextBoxView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
index 9d675434..99b2dad0 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
@@ -5,6 +5,7 @@
         
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Resources/TextBlockStyles.xaml"   />
                 <ResourceDictionary Source="/Resources/TreeViewStyles.xaml"   />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
new file mode 100644
index 00000000..b5b8bd85
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="Header" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="#FF8605BD" />
+        <Setter Property="Margin" Value="0,5" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
index fad1f6eb..40015624 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
+    
     <SolidColorBrush x:Key="HighlightFill" Color="#59FFFFFF"/>
     <LinearGradientBrush x:Key="SelectedFill" EndPoint="0,1" StartPoint="0,0">
         <GradientStop Color="#59FFFFFF" Offset="0"/>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
index 3943e042..7f7b711a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
@@ -115,6 +115,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Resources\TextBlockStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\TreeViewStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>