diff --git a/src/CS.Windows.Controls.WP7/Themes/WatermarkTextBox.xaml b/src/CS.Windows.Controls.WP7/Themes/WatermarkTextBox.xaml
index 86f9291..4c107e8 100644
--- a/src/CS.Windows.Controls.WP7/Themes/WatermarkTextBox.xaml
+++ b/src/CS.Windows.Controls.WP7/Themes/WatermarkTextBox.xaml
@@ -1,131 +1,131 @@
-<!--
-Copyright 2011 Josh Close
-This file is a part of CS.Windows.Controls and is licensed under the MS-PL
-See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html
-https://github.com/JoshClose/Windows.Controls
--->
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:vsm="clr-namespace:System.Windows;assembly=System.Windows" 
-	xmlns:Controls="clr-namespace:CS.Windows.Controls">
-
-	<ControlTemplate x:Key="PhoneDisabledTextBoxTemplate" TargetType="Controls:WatermarkTextBox">
-		<ContentControl x:Name="ContentElement" BorderThickness="0" Padding="{TemplateBinding Padding}" Margin="{StaticResource PhoneTextBoxInnerMargin}"
-						HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-	</ControlTemplate>
-
-	<Style TargetType="Controls:WatermarkTextBox">
-		<Setter Property="FontFamily" Value="{StaticResource PhoneFontFamilyNormal}"/>
-		<Setter Property="FontSize" Value="{StaticResource PhoneFontSizeMediumLarge}"/>
-		<Setter Property="Background" Value="{StaticResource PhoneTextBoxBrush}"/>
-		<Setter Property="Foreground" Value="{StaticResource PhoneTextBoxForegroundBrush}"/>
-		<Setter Property="FocusedForeground" Value="{StaticResource PhoneTextBoxForegroundBrush}" />
-		<Setter Property="BorderBrush" Value="{StaticResource PhoneTextBoxBrush}"/>
-		<Setter Property="SelectionBackground" Value="{StaticResource PhoneAccentBrush}"/>
-		<Setter Property="SelectionForeground" Value="{StaticResource PhoneTextBoxSelectionForegroundBrush}"/>
-		<Setter Property="BorderThickness" Value="{StaticResource PhoneBorderThickness}"/>
-		<Setter Property="Padding" Value="2"/>
-		<Setter Property="WatermarkStyle">
-			<Setter.Value>
-				<Style TargetType="ContentControl">
-					<Setter Property="Opacity" Value="0.5" />
-					<Setter Property="Padding" Value="2" />
-					<Setter Property="Margin" Value="{StaticResource PhoneTextBoxInnerMargin}" />
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Controls:WatermarkTextBox">
-					<Grid Background="Transparent">
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal"/>
-								<VisualState x:Name="MouseOver"/>
-								<VisualState x:Name="Disabled">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="Visibility">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<Visibility>Collapsed</Visibility>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="Visibility">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<Visibility>Visible</Visibility>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="ReadOnly">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="Visibility">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<Visibility>Collapsed</Visibility>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="Visibility">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<Visibility>Visible</Visibility>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="Background">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="BorderBrush">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyContent" Storyboard.TargetProperty="Foreground">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxReadOnlyBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="FocusStates">
-								<VisualState x:Name="Focused">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="Background">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxEditBackgroundBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="BorderBrush">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxEditBorderBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Unfocused"/>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Border x:Name="EnabledBorder" Background="{TemplateBinding Background}"
-								BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" 
-								Margin="{StaticResource PhoneTouchTargetOverhang}">
-							<Grid Background="Transparent">
-								<ContentControl x:Name="WatermarkElement" BorderThickness="0"
-												HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-												Content="{TemplateBinding WatermarkText}" Style="{TemplateBinding WatermarkStyle}"/>
-								<ContentControl x:Name="ContentElement" BorderThickness="0" Padding="{TemplateBinding Padding}" 
-												HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-												Margin="{StaticResource PhoneTextBoxInnerMargin}"/>
-							</Grid>
-						</Border>
-						<Border x:Name="DisabledOrReadonlyBorder" Visibility="Collapsed" Background="Transparent" BorderBrush="{StaticResource PhoneDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{StaticResource PhoneTouchTargetOverhang}" >
-							<TextBox x:Name="DisabledOrReadonlyContent" Text="{TemplateBinding Text}" Foreground="{StaticResource PhoneDisabledBrush}" Background="Transparent"
-									 SelectionBackground="{TemplateBinding SelectionBackground}" SelectionForeground="{TemplateBinding SelectionForeground}"
-									 TextWrapping="{TemplateBinding TextWrapping}" TextAlignment="{TemplateBinding TextAlignment}" IsReadOnly="True" Template="{StaticResource PhoneDisabledTextBoxTemplate}"
-									 FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" FontStyle="{TemplateBinding FontStyle}" />
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
+<!--
+Copyright 2011 Josh Close
+This file is a part of CS.Windows.Controls and is licensed under the MS-PL
+See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html
+https://github.com/JoshClose/Windows.Controls
+-->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:vsm="clr-namespace:System.Windows;assembly=System.Windows" 
+	xmlns:Controls="clr-namespace:CS.Windows.Controls">
+
+	<ControlTemplate x:Key="PhoneDisabledTextBoxTemplate" TargetType="TextBox">
+		<ContentControl x:Name="ContentElement" BorderThickness="0" Padding="{TemplateBinding Padding}" Margin="{StaticResource PhoneTextBoxInnerMargin}"
+						HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
+	</ControlTemplate>
+
+	<Style TargetType="Controls:WatermarkTextBox">
+		<Setter Property="FontFamily" Value="{StaticResource PhoneFontFamilyNormal}"/>
+		<Setter Property="FontSize" Value="{StaticResource PhoneFontSizeMediumLarge}"/>
+		<Setter Property="Background" Value="{StaticResource PhoneTextBoxBrush}"/>
+		<Setter Property="Foreground" Value="{StaticResource PhoneTextBoxForegroundBrush}"/>
+		<Setter Property="FocusedForeground" Value="{StaticResource PhoneTextBoxForegroundBrush}" />
+		<Setter Property="BorderBrush" Value="{StaticResource PhoneTextBoxBrush}"/>
+		<Setter Property="SelectionBackground" Value="{StaticResource PhoneAccentBrush}"/>
+		<Setter Property="SelectionForeground" Value="{StaticResource PhoneTextBoxSelectionForegroundBrush}"/>
+		<Setter Property="BorderThickness" Value="{StaticResource PhoneBorderThickness}"/>
+		<Setter Property="Padding" Value="2"/>
+		<Setter Property="WatermarkStyle">
+			<Setter.Value>
+				<Style TargetType="ContentControl">
+					<Setter Property="Opacity" Value="0.5" />
+					<Setter Property="Padding" Value="2" />
+					<Setter Property="Margin" Value="{StaticResource PhoneTextBoxInnerMargin}" />
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Controls:WatermarkTextBox">
+					<Grid Background="Transparent">
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal"/>
+								<VisualState x:Name="MouseOver"/>
+								<VisualState x:Name="Disabled">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="Visibility">
+											<DiscreteObjectKeyFrame KeyTime="0">
+												<DiscreteObjectKeyFrame.Value>
+													<Visibility>Collapsed</Visibility>
+												</DiscreteObjectKeyFrame.Value>
+											</DiscreteObjectKeyFrame>
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="Visibility">
+											<DiscreteObjectKeyFrame KeyTime="0">
+												<DiscreteObjectKeyFrame.Value>
+													<Visibility>Visible</Visibility>
+												</DiscreteObjectKeyFrame.Value>
+											</DiscreteObjectKeyFrame>
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="ReadOnly">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="Visibility">
+											<DiscreteObjectKeyFrame KeyTime="0">
+												<DiscreteObjectKeyFrame.Value>
+													<Visibility>Collapsed</Visibility>
+												</DiscreteObjectKeyFrame.Value>
+											</DiscreteObjectKeyFrame>
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="Visibility">
+											<DiscreteObjectKeyFrame KeyTime="0">
+												<DiscreteObjectKeyFrame.Value>
+													<Visibility>Visible</Visibility>
+												</DiscreteObjectKeyFrame.Value>
+											</DiscreteObjectKeyFrame>
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyBorder" Storyboard.TargetProperty="BorderBrush">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DisabledOrReadonlyContent" Storyboard.TargetProperty="Foreground">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxReadOnlyBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="FocusStates">
+								<VisualState x:Name="Focused">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxEditBackgroundBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="EnabledBorder" Storyboard.TargetProperty="BorderBrush">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource PhoneTextBoxEditBorderBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="Unfocused"/>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Border x:Name="EnabledBorder" Background="{TemplateBinding Background}"
+								BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" 
+								Margin="{StaticResource PhoneTouchTargetOverhang}">
+							<Grid Background="Transparent">
+								<ContentControl x:Name="WatermarkElement" BorderThickness="0"
+												HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+												Content="{TemplateBinding WatermarkText}" Style="{TemplateBinding WatermarkStyle}"/>
+								<ContentControl x:Name="ContentElement" BorderThickness="0" Padding="{TemplateBinding Padding}" 
+												HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+												Margin="{StaticResource PhoneTextBoxInnerMargin}"/>
+							</Grid>
+						</Border>
+						<Border x:Name="DisabledOrReadonlyBorder" Visibility="Collapsed" Background="Transparent" BorderBrush="{StaticResource PhoneDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{StaticResource PhoneTouchTargetOverhang}" >
+							<TextBox x:Name="DisabledOrReadonlyContent" Text="{TemplateBinding Text}" Foreground="{StaticResource PhoneDisabledBrush}" Background="Transparent"
+									 SelectionBackground="{TemplateBinding SelectionBackground}" SelectionForeground="{TemplateBinding SelectionForeground}"
+									 TextWrapping="{TemplateBinding TextWrapping}" TextAlignment="{TemplateBinding TextAlignment}" IsReadOnly="True" Template="{StaticResource PhoneDisabledTextBoxTemplate}"
+									 FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" FontStyle="{TemplateBinding FontStyle}" />
+						</Border>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/ExampleApp.WP7/MainPage.xaml b/src/ExampleApp.WP7/MainPage.xaml
index 896bec3..009c1c4 100644
--- a/src/ExampleApp.WP7/MainPage.xaml
+++ b/src/ExampleApp.WP7/MainPage.xaml
@@ -1,129 +1,135 @@
-<phone:PhoneApplicationPage 
-    x:Class="ExampleApp.WP7.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
-    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:Controls="clr-namespace:CS.Windows.Controls;assembly=CS.Windows.Controls" mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="768"
-    FontFamily="{StaticResource PhoneFontFamilyNormal}"
-    FontSize="{StaticResource PhoneFontSizeNormal}"
-    Foreground="{StaticResource PhoneForegroundBrush}"
-    SupportedOrientations="Portrait" Orientation="Portrait"
-    shell:SystemTray.IsVisible="True">
-
-    <!--LayoutRoot is the root grid where all page content is placed-->
-    <Grid x:Name="LayoutRoot" Background="Transparent">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <!--TitlePanel contains the name of the application and page title-->
-        <StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">
-            <TextBlock x:Name="ApplicationTitle" Text="MY APPLICATION" Style="{StaticResource PhoneTextNormalStyle}"/>
-            <TextBlock x:Name="PageTitle" Text="page name" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
-        </StackPanel>
-
-        <!--ContentPanel - place additional content here-->
-        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
-			<ScrollViewer>
-				<StackPanel>
-					<TextBlock Text="TextBox" />
-					<TextBox />
-
-					<TextBlock Text="WatermarkTextBox" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"/>
-					
-					<TextBlock Text="WatermarkTextBox Data Bound" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
-											   Text="{Binding PreFilledText, Mode=TwoWay}"/>
-					
-					<TextBlock Text="WatermarkTextBox with Text" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
-											   Text="this is the text"/>
-					
-					<TextBlock Text="WatermarkTextBox Set Text On Click" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
-											   Text="{Binding FillOnClickText, Mode=TwoWay}" />
-					<Button Content="click to fill text" Click="Button_Click_1" />
-
-					<TextBlock Text="Transparent WatermarkTextBox" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
-										   Background="Transparent"
-										   BorderBrush="Transparent"
-										   Foreground="White"
-										   FocusedForeground="Black">
-						<Controls:WatermarkTextBox.WatermarkStyle>
-							<Style TargetType="ContentControl">
-								<Setter Property="Opacity" Value="1" />
-							</Style>
-						</Controls:WatermarkTextBox.WatermarkStyle>
-					</Controls:WatermarkTextBox>
-					
-					<TextBlock Text="Disabled WatermarkTextBox" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark" />
-					
-					<TextBlock Text="WatermarkTextBox Focus On Click" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
-											   x:Name="watermarkTextBoxClick"/>
-					<Button Content="click to focus" Click="Button_Click_3" />
-					
-					<!-- ***************************** -->
-					<!-- WatermarkPasswordBox Examples -->
-					<!-- ***************************** -->
-
-					<TextBlock Text="PasswordBox" />
-					<PasswordBox />
-
-					<TextBlock Text="WatermarkPasswordBox" />
-					<Controls:WatermarkPasswordBox WatermarkText="this is the watermark" />
-					
-					<TextBlock Text="WatermarkPasswordBox with password" />
-					<Controls:WatermarkPasswordBox WatermarkText="this is the watermark"
-												   Password="this is the password" />
-
-					<TextBlock Text="WatermarkPasswordBox Set Password On Click" />
-					<Controls:WatermarkPasswordBox WatermarkText="this is the watermark"
-												   Password="{Binding FillOnClickPassword, Mode=TwoWay}" />
-					<Button Content="click to fill password" Click="Button_Click_2" />
-
-					<TextBlock Text="Transparent WatermarkPasswordBox" />
-					<Controls:WatermarkPasswordBox
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Foreground="White"
-					FocusedForeground="Black"
-					WatermarkText="this is the watermark">
-						<Controls:WatermarkPasswordBox.WatermarkStyle>
-							<Style TargetType="ContentControl">
-								<Setter Property="Opacity" Value="1" />
-							</Style>
-						</Controls:WatermarkPasswordBox.WatermarkStyle>
-					</Controls:WatermarkPasswordBox>
-
-					<Button Click="Button_Click">Button</Button>
-
-					<TextBlock Text="WatermarkPasswordBox Focus On Click" />
-					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
-											   x:Name="watermarkPasswordBoxClick"/>
-					<Button Content="click to focus" Click="Button_Click_4" />
-				</StackPanel>
-			</ScrollViewer>
-		</Grid>
-    </Grid>
- 
-    <!--Sample code showing usage of ApplicationBar-->
-    <!--<phone:PhoneApplicationPage.ApplicationBar>
-        <shell:ApplicationBar IsVisible="True" IsMenuEnabled="True">
-            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button1.png" Text="Button 1"/>
-            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button2.png" Text="Button 2"/>
-            <shell:ApplicationBar.MenuItems>
-                <shell:ApplicationBarMenuItem Text="MenuItem 1"/>
-                <shell:ApplicationBarMenuItem Text="MenuItem 2"/>
-            </shell:ApplicationBar.MenuItems>
-        </shell:ApplicationBar>
-    </phone:PhoneApplicationPage.ApplicationBar>-->
-
+<phone:PhoneApplicationPage 
+    x:Class="ExampleApp.WP7.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:Controls="clr-namespace:CS.Windows.Controls;assembly=CS.Windows.Controls" mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="768"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+    SupportedOrientations="Portrait" Orientation="Portrait"
+    shell:SystemTray.IsVisible="True">
+
+    <!--LayoutRoot is the root grid where all page content is placed-->
+    <Grid x:Name="LayoutRoot" Background="Transparent">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!--TitlePanel contains the name of the application and page title-->
+        <StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">
+            <TextBlock x:Name="ApplicationTitle" Text="MY APPLICATION" Style="{StaticResource PhoneTextNormalStyle}"/>
+            <TextBlock x:Name="PageTitle" Text="page name" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
+        </StackPanel>
+
+        <!--ContentPanel - place additional content here-->
+        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
+			<ScrollViewer>
+				<StackPanel>
+					<TextBlock Text="TextBox" />
+					<TextBox />
+
+					<TextBlock Text="WatermarkTextBox" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"/>
+					
+					<TextBlock Text="WatermarkTextBox Data Bound" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
+											   Text="{Binding PreFilledText, Mode=TwoWay}"/>
+					
+					<TextBlock Text="WatermarkTextBox with Text" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
+											   Text="this is the text"/>
+					
+					<TextBlock Text="WatermarkTextBox Set Text On Click" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
+											   Text="{Binding FillOnClickText, Mode=TwoWay}" />
+					<Button Content="click to fill text" Click="Button_Click_1" />
+
+					<TextBlock Text="Transparent WatermarkTextBox" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
+										   Background="Transparent"
+										   BorderBrush="Transparent"
+										   Foreground="White"
+										   FocusedForeground="Black">
+						<Controls:WatermarkTextBox.WatermarkStyle>
+							<Style TargetType="ContentControl">
+								<Setter Property="Opacity" Value="1" />
+							</Style>
+						</Controls:WatermarkTextBox.WatermarkStyle>
+					</Controls:WatermarkTextBox>
+					
+					<TextBlock Text="Disabled WatermarkTextBox" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark" />
+					
+					<TextBlock Text="WatermarkTextBox Focus On Click" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
+											   x:Name="watermarkTextBoxClick"/>
+					<Button Content="click to focus" Click="Button_Click_3" />
+                    
+                    <TextBlock Text="WatermarkTextBox toggle enabled" />
+                    <Controls:WatermarkTextBox WatermarkText="this is the watermark" 
+                                               IsEnabled="{Binding IsEnabled, Mode=OneWay}" />
+                    <Button Content="click to toggle IsEnabled" Click="Button_Click_5" />
+                    
+					
+					<!-- ***************************** -->
+					<!-- WatermarkPasswordBox Examples -->
+					<!-- ***************************** -->
+
+					<TextBlock Text="PasswordBox" />
+					<PasswordBox />
+
+					<TextBlock Text="WatermarkPasswordBox" />
+					<Controls:WatermarkPasswordBox WatermarkText="this is the watermark" />
+					
+					<TextBlock Text="WatermarkPasswordBox with password" />
+					<Controls:WatermarkPasswordBox WatermarkText="this is the watermark"
+												   Password="this is the password" />
+
+					<TextBlock Text="WatermarkPasswordBox Set Password On Click" />
+					<Controls:WatermarkPasswordBox WatermarkText="this is the watermark"
+												   Password="{Binding FillOnClickPassword, Mode=TwoWay}" />
+					<Button Content="click to fill password" Click="Button_Click_2" />
+
+					<TextBlock Text="Transparent WatermarkPasswordBox" />
+					<Controls:WatermarkPasswordBox
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Foreground="White"
+					FocusedForeground="Black"
+					WatermarkText="this is the watermark">
+						<Controls:WatermarkPasswordBox.WatermarkStyle>
+							<Style TargetType="ContentControl">
+								<Setter Property="Opacity" Value="1" />
+							</Style>
+						</Controls:WatermarkPasswordBox.WatermarkStyle>
+					</Controls:WatermarkPasswordBox>
+
+					<Button Click="Button_Click">Button</Button>
+
+					<TextBlock Text="WatermarkPasswordBox Focus On Click" />
+					<Controls:WatermarkTextBox WatermarkText="this is the watermark"
+											   x:Name="watermarkPasswordBoxClick"/>
+					<Button Content="click to focus" Click="Button_Click_4" />
+				</StackPanel>
+			</ScrollViewer>
+		</Grid>
+    </Grid>
+ 
+    <!--Sample code showing usage of ApplicationBar-->
+    <!--<phone:PhoneApplicationPage.ApplicationBar>
+        <shell:ApplicationBar IsVisible="True" IsMenuEnabled="True">
+            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button1.png" Text="Button 1"/>
+            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button2.png" Text="Button 2"/>
+            <shell:ApplicationBar.MenuItems>
+                <shell:ApplicationBarMenuItem Text="MenuItem 1"/>
+                <shell:ApplicationBarMenuItem Text="MenuItem 2"/>
+            </shell:ApplicationBar.MenuItems>
+        </shell:ApplicationBar>
+    </phone:PhoneApplicationPage.ApplicationBar>-->
+
 </phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/src/ExampleApp.WP7/MainPage.xaml.cs b/src/ExampleApp.WP7/MainPage.xaml.cs
index e8e044c..cfd9713 100644
--- a/src/ExampleApp.WP7/MainPage.xaml.cs
+++ b/src/ExampleApp.WP7/MainPage.xaml.cs
@@ -1,57 +1,62 @@
-#region License
-// Copyright 2011 Josh Close
-// This file is a part of CS.Windows.Controls and is licensed under the MS-PL
-// See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html
-// https://github.com/JoshClose/Windows.Controls
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-using Microsoft.Phone.Controls;
-
-namespace ExampleApp.WP7
-{
-	public partial class MainPage : PhoneApplicationPage
-	{
-		// Constructor
-		public MainPage()
-		{
-			InitializeComponent();
-
-			DataContext = new MainPageViewModel();
-		}
-
-		private void Button_Click( object sender, RoutedEventArgs e )
-		{
-			( (MainPageViewModel)DataContext ).ButtonClick( sender, e );
-		}
-
-		private void Button_Click_1( object sender, RoutedEventArgs e )
-		{
-			( (MainPageViewModel)DataContext ).FillTextBoxButtonClick( sender, e );
-		}
-
-		private void Button_Click_2( object sender, RoutedEventArgs e )
-		{
-			( (MainPageViewModel)DataContext ).FillPasswordBoxButtonClick( sender, e );
-		}
-
-		private void Button_Click_3( object sender, RoutedEventArgs e )
-		{
-			watermarkTextBoxClick.Focus();
-		}
-
-		private void Button_Click_4( object sender, RoutedEventArgs e )
-		{
-			watermarkPasswordBoxClick.Focus();
-		}
-	}
+#region License
+// Copyright 2011 Josh Close
+// This file is a part of CS.Windows.Controls and is licensed under the MS-PL
+// See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html
+// https://github.com/JoshClose/Windows.Controls
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using Microsoft.Phone.Controls;
+
+namespace ExampleApp.WP7
+{
+	public partial class MainPage : PhoneApplicationPage
+	{
+		// Constructor
+		public MainPage()
+		{
+			InitializeComponent();
+
+			DataContext = new MainPageViewModel();
+		}
+
+		private void Button_Click( object sender, RoutedEventArgs e )
+		{
+			( (MainPageViewModel)DataContext ).ButtonClick( sender, e );
+		}
+
+		private void Button_Click_1( object sender, RoutedEventArgs e )
+		{
+			( (MainPageViewModel)DataContext ).FillTextBoxButtonClick( sender, e );
+		}
+
+		private void Button_Click_2( object sender, RoutedEventArgs e )
+		{
+			( (MainPageViewModel)DataContext ).FillPasswordBoxButtonClick( sender, e );
+		}
+
+		private void Button_Click_3( object sender, RoutedEventArgs e )
+		{
+			watermarkTextBoxClick.Focus();
+		}
+
+		private void Button_Click_4( object sender, RoutedEventArgs e )
+		{
+			watermarkPasswordBoxClick.Focus();
+		}
+
+        private void Button_Click_5( object sender, RoutedEventArgs e )
+        {
+            ( (MainPageViewModel)DataContext ).ToggleIsEnabledClick( sender, e );
+        }
+	}
 }
\ No newline at end of file
diff --git a/src/ExampleApp.WP7/MainPageViewModel.cs b/src/ExampleApp.WP7/MainPageViewModel.cs
index cb5331b..2ec603b 100644
--- a/src/ExampleApp.WP7/MainPageViewModel.cs
+++ b/src/ExampleApp.WP7/MainPageViewModel.cs
@@ -1,93 +1,109 @@
-#region License
-// Copyright 2011 Josh Close
-// This file is a part of CS.Windows.Controls and is licensed under the MS-PL
-// See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html
-// https://github.com/JoshClose/Windows.Controls
-#endregion
-using System;
-using System.ComponentModel;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-
-namespace ExampleApp.WP7
-{
-	public class MainPageViewModel : INotifyPropertyChanged
-	{
-		private string password;
-		private string preFilledText = "this is the text";
-		private string fillOnClickText;
-		private string fillOnClickPassword;
-
-		public string Password
-		{
-			get { return password; }
-			set
-			{
-				password = value;
-				RaisePropertyChanged( "Password" );
-			}
-		}
-
-		public string PreFilledText
-		{
-			get { return preFilledText; }
-			set
-			{
-				preFilledText = value;
-				RaisePropertyChanged( "PreFilledText" );
-			}
-		}
-
-		public string FillOnClickText
-		{
-			get { return fillOnClickText; }
-			set
-			{
-				fillOnClickText = value;
-				RaisePropertyChanged( "FillOnClickText" );
-			}
-		}
-
-		public string FillOnClickPassword
-		{
-			get { return fillOnClickPassword; }
-			set
-			{
-				fillOnClickPassword = value;
-				RaisePropertyChanged( "FillOnClickPassword" );
-			}
-		}
-
-		public event PropertyChangedEventHandler PropertyChanged;
-
-		public void RaisePropertyChanged( string propertyName )
-		{
-			if( PropertyChanged != null )
-			{
-				PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-			}
-		}
-
-		public void ButtonClick( object sender, RoutedEventArgs e)
-		{
-			var x = "";
-		}
-
-		public void FillTextBoxButtonClick( object sender, RoutedEventArgs e )
-		{
-			FillOnClickText = "this is the text";
-		}
-
-		public void FillPasswordBoxButtonClick( object sender, RoutedEventArgs e )
-		{
-			FillOnClickPassword = "this is the password";
-		}
-	}
-}
+#region License
+// Copyright 2011 Josh Close
+// This file is a part of CS.Windows.Controls and is licensed under the MS-PL
+// See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html
+// https://github.com/JoshClose/Windows.Controls
+#endregion
+using System;
+using System.ComponentModel;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace ExampleApp.WP7
+{
+	public class MainPageViewModel : INotifyPropertyChanged
+	{
+		private string password;
+		private string preFilledText = "this is the text";
+		private string fillOnClickText;
+		private string fillOnClickPassword;
+	    private bool isEnabled;
+
+		public string Password
+		{
+			get { return password; }
+			set
+			{
+				password = value;
+				RaisePropertyChanged( "Password" );
+			}
+		}
+
+		public string PreFilledText
+		{
+			get { return preFilledText; }
+			set
+			{
+				preFilledText = value;
+				RaisePropertyChanged( "PreFilledText" );
+			}
+		}
+
+		public string FillOnClickText
+		{
+			get { return fillOnClickText; }
+			set
+			{
+				fillOnClickText = value;
+				RaisePropertyChanged( "FillOnClickText" );
+			}
+		}
+
+		public string FillOnClickPassword
+		{
+			get { return fillOnClickPassword; }
+			set
+			{
+				fillOnClickPassword = value;
+				RaisePropertyChanged( "FillOnClickPassword" );
+			}
+		}
+
+	    public bool IsEnabled
+	    {
+            get { return isEnabled; }
+	        set
+	        {
+	            isEnabled = value;
+	            RaisePropertyChanged("IsEnabled");
+	        }
+	    }
+
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		public void RaisePropertyChanged( string propertyName )
+		{
+			if( PropertyChanged != null )
+			{
+				PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+			}
+		}
+
+		public void ButtonClick( object sender, RoutedEventArgs e)
+		{
+			var x = "";
+		}
+
+		public void FillTextBoxButtonClick( object sender, RoutedEventArgs e )
+		{
+			FillOnClickText = "this is the text";
+		}
+
+		public void FillPasswordBoxButtonClick( object sender, RoutedEventArgs e )
+		{
+			FillOnClickPassword = "this is the password";
+		}
+
+        public void ToggleIsEnabledClick( object sender, RoutedEventArgs e )
+        {
+            IsEnabled = !IsEnabled;
+        }
+	}
+}