diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index 56150bb7..c2b53c66 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -1,135 +1,171 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
-                    xmlns:wpfdev="clr-namespace:WPFDevelopers.Net40"
-                    xmlns:converts="clr-namespace:WPFDevelopers.Converts">
-
-    <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter"/>
-   
-    <Style TargetType="{x:Type wpfdev:Window}" BasedOn="{x:Null}">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converts="clr-namespace:WPFDevelopers.Converts"
+    xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
+    xmlns:wpfdev="clr-namespace:WPFDevelopers.Net40">
+    <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
+    <Style BasedOn="{x:Null}" TargetType="{x:Type wpfdev:Window}">
         <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-        <Setter Property="Background"  Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-        <Setter Property="IsTabStop"  Value="False" />
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-        <Setter Property="WindowStyle"  Value="None" />
-        <Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}"/>
+        <Setter Property="WindowStyle" Value="None" />
+        <Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" />
         <Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
         <Setter Property="shell:WindowChrome.WindowChrome">
             <Setter.Value>
-                <shell:WindowChrome GlassFrameThickness="0,0,0,.1"
-                                    CaptionHeight="{Binding TitleHeight,RelativeSource={RelativeSource AncestorType=wpfdev:Window}}"/>
+                <shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" GlassFrameThickness="0,0,0,.1" />
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wpfdev:Window}">
-                    <Border SnapsToDevicePixels="True"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="{TemplateBinding Background}"
-                              x:Name="LayoutRoot">
+                    <Border
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="True">
+                        <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <Grid Grid.Row="0" Height="{TemplateBinding TitleHeight}" 
-                                  Background="{TemplateBinding BorderBrush}">
+                            <Grid
+                                Grid.Row="0"
+                                Height="{TemplateBinding TitleHeight}"
+                                Background="{TemplateBinding BorderBrush}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" MinWidth="30"/>
+                                    <ColumnDefinition Width="Auto" MinWidth="30" />
                                 </Grid.ColumnDefinitions>
-                                <Image Source="{TemplateBinding Icon}" Stretch="Fill"
-                                    VerticalAlignment="Center" HorizontalAlignment="Left" Width="30" Height="30" Margin="14,0,0,0"
+                                <Image
+                                    Width="30"
+                                    Height="30"
+                                    Margin="14,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
                                     RenderOptions.BitmapScalingMode="HighQuality"
-                                       Visibility="{TemplateBinding Icon,Converter={StaticResource ObjectNullToVisibilityConverter}}"/>
-                                <TextBlock Text="{TemplateBinding Title}" x:Name="PART_Title" Margin="6,0"
-                                       Foreground="{TemplateBinding Foreground}" Grid.Column="1"
-                                       VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}"/>
-                                <WrapPanel Grid.Column="2" shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                           Margin="0,6">
+                                    Source="{TemplateBinding Icon}"
+                                    Stretch="Fill"
+                                    Visibility="{TemplateBinding Icon,
+                                                                 Converter={StaticResource ObjectNullToVisibilityConverter}}" />
+                                <TextBlock
+                                    x:Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="6,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="{DynamicResource WD.TitleFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    Text="{TemplateBinding Title}" />
+                                <WrapPanel
+                                    Grid.Column="2"
+                                    Margin="0,6"
+                                    shell:WindowChrome.IsHitTestVisibleInChrome="True">
                                     <WrapPanel x:Name="PART_MinAndMax">
-                                        <Button Name="PART_MinimizeButton"  IsTabStop="False"   Padding="0" 
-                                            Style="{DynamicResource WD.WindowButtonStyle}" 
-                                            Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}">
+                                        <Button
+                                            Name="PART_MinimizeButton"
+                                            Padding="0"
+                                            Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}">
                                             <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Rectangle x:Name="MinimizeGlyph"  Width="10"  Height="1"   Margin="0 7 0 0" 
-                                                   VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
+                                                <Rectangle
+                                                    x:Name="MinimizeGlyph"
+                                                    Width="10"
+                                                    Height="1"
+                                                    Margin="0,7,0,0"
+                                                    VerticalAlignment="Bottom"
+                                                    Fill="{TemplateBinding Foreground}" />
                                             </Grid>
                                         </Button>
-                                        <Button Name="PART_MaximizeButton" IsTabStop="False"  Padding="0"
-                                            Style="{DynamicResource WD.WindowButtonStyle}"
-                                            Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}">
+                                        <Button
+                                            Name="PART_MaximizeButton"
+                                            Padding="0"
+                                            Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}">
                                             <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Path Width="10" Height="10"
-                                              HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                              Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{TemplateBinding Foreground}"
-                                              Stretch="Fill" UseLayoutRounding="False" />
+                                                <Path
+                                                    Width="10"
+                                                    Height="10"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Data="{DynamicResource WD.WindowMaximizeGeometry}"
+                                                    Fill="{TemplateBinding Foreground}"
+                                                    Stretch="Fill"
+                                                    UseLayoutRounding="False" />
                                             </Grid>
                                         </Button>
-                                        <Button Name="PART_RestoreButton" IsTabStop="False"  Padding="0"
-                                            Style="{DynamicResource WD.WindowButtonStyle}" 
+                                        <Button
+                                            Name="PART_RestoreButton"
+                                            Padding="0"
                                             Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}"
                                             Visibility="Collapsed">
                                             <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Path Width="10" Height="10"
-                                              HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                              Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{TemplateBinding Foreground}"
-                                              Stretch="Fill" UseLayoutRounding="False" />
+                                                <Path
+                                                    Width="10"
+                                                    Height="10"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Data="{DynamicResource WD.WindowRestoreGeometry}"
+                                                    Fill="{TemplateBinding Foreground}"
+                                                    Stretch="Fill"
+                                                    UseLayoutRounding="False" />
                                             </Grid>
                                         </Button>
                                     </WrapPanel>
 
-                                    <Button Name="PART_CloseButton" 
-                                            IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}"
-                                            Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}">
-                                        <Path Width="10" Height="10"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Data="{DynamicResource WD.WindowCloseGeometry}"
-                              Fill="{TemplateBinding Foreground}"
-                              Stretch="Fill" />
+                                    <Button
+                                        Name="PART_CloseButton"
+                                        Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
+                                        IsTabStop="False"
+                                        Style="{DynamicResource WD.WindowButtonStyle}">
+                                        <Path
+                                            Width="10"
+                                            Height="10"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Data="{DynamicResource WD.WindowCloseGeometry}"
+                                            Fill="{TemplateBinding Foreground}"
+                                            Stretch="Fill" />
                                     </Button>
                                 </WrapPanel>
                             </Grid>
                             <AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
-                                <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True"/>
+                                <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
                             </AdornerDecorator>
-                            <ResizeGrip x:Name="ResizeGrip" 
-                                        HorizontalAlignment="Right" 
-                                        VerticalAlignment="Bottom" 
-                                        Grid.Row="1" IsTabStop="False"
-                                        Visibility="Collapsed"/>
+                            <ResizeGrip
+                                x:Name="ResizeGrip"
+                                Grid.Row="1"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                IsTabStop="False"
+                                Visibility="Collapsed" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Visibility" Value="Visible" TargetName="PART_RestoreButton"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="PART_MaximizeButton"/>
-                            <!--<Setter Property="BorderThickness" Value="{Binding Source={x:Static shell:SystemParameters2.Current}, Path=WindowResizeBorderThickness}"/>-->
-                            <Setter Property="Margin" TargetName="LayoutRoot" Value="7"/>
+                            <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode"  Value="CanResizeWithGrip" />
-                                <Condition Property="WindowState"  Value="Normal" />
+                                <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
+                                <Condition Property="WindowState" Value="Normal" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
                         </MultiTrigger>
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode"  Value="NoResize" />
-                                <Condition Property="WindowStyle"  Value="ToolWindow" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>-->
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index 5547c305..4f0f1518 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:wpfdev="clr-namespace:WPFDevelopers.Net40" xmlns:converts="clr-namespace:WPFDevelopers.Converts" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:converts="clr-namespace:WPFDevelopers.Converts" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:wpfdev="clr-namespace:WPFDevelopers.Net40" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
 	<SolidColorBrush x:Key="WD.ButtonFocusVisualColor" po:Freeze="True" Color="#60000000" />
 	<Color x:Key="WD.ShadowDepthColor" po:Freeze="True">#AA000000</Color>
 	<Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#909399</Color>
@@ -636,7 +636,7 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}" />
-	<Style TargetType="{x:Type wpfdev:Window}" BasedOn="{x:Null}">
+	<Style BasedOn="{x:Null}" TargetType="{x:Type wpfdev:Window}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
@@ -650,14 +650,14 @@
 		<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
 		<Setter Property="shell:WindowChrome.WindowChrome">
 			<Setter.Value>
-				<shell:WindowChrome GlassFrameThickness="0,0,0,.1" CaptionHeight="{Binding TitleHeight,RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" />
+				<shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" GlassFrameThickness="0,0,0,.1" />
 			</Setter.Value>
 		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type wpfdev:Window}">
-					<Border SnapsToDevicePixels="True" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid Background="{TemplateBinding Background}" x:Name="LayoutRoot">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
 							<Grid.RowDefinitions>
 								<RowDefinition Height="Auto" />
 								<RowDefinition Height="*" />
@@ -668,27 +668,27 @@
 									<ColumnDefinition Width="*" />
 									<ColumnDefinition Width="Auto" MinWidth="30" />
 								</Grid.ColumnDefinitions>
-								<Image Source="{TemplateBinding Icon}" Stretch="Fill" VerticalAlignment="Center" HorizontalAlignment="Left" Width="30" Height="30" Margin="14,0,0,0" RenderOptions.BitmapScalingMode="HighQuality" Visibility="{TemplateBinding Icon,Converter={StaticResource ObjectNullToVisibilityConverter}}" />
-								<TextBlock Text="{TemplateBinding Title}" x:Name="PART_Title" Margin="6,0" Foreground="{TemplateBinding Foreground}" Grid.Column="1" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" />
-								<WrapPanel Grid.Column="2" shell:WindowChrome.IsHitTestVisibleInChrome="True" Margin="0,6">
+								<Image Width="30" Height="30" Margin="14,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" Source="{TemplateBinding Icon}" Stretch="Fill" Visibility="{TemplateBinding Icon,&#xD;&#xA;                                                                 Converter={StaticResource ObjectNullToVisibilityConverter}}" />
+								<TextBlock x:Name="PART_Title" Grid.Column="1" Margin="6,0" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Title}" />
+								<WrapPanel Grid.Column="2" Margin="0,6" shell:WindowChrome.IsHitTestVisibleInChrome="True">
 									<WrapPanel x:Name="PART_MinAndMax">
-										<Button Name="PART_MinimizeButton" IsTabStop="False" Padding="0" Style="{DynamicResource WD.WindowButtonStyle}" Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}">
+										<Button Name="PART_MinimizeButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 											<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-												<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0 7 0 0" VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
+												<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0,7,0,0" VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
 											</Grid>
 										</Button>
-										<Button Name="PART_MaximizeButton" IsTabStop="False" Padding="0" Style="{DynamicResource WD.WindowButtonStyle}" Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}">
+										<Button Name="PART_MaximizeButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 											<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 												<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" UseLayoutRounding="False" />
 											</Grid>
 										</Button>
-										<Button Name="PART_RestoreButton" IsTabStop="False" Padding="0" Style="{DynamicResource WD.WindowButtonStyle}" Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}" Visibility="Collapsed">
+										<Button Name="PART_RestoreButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" Visibility="Collapsed">
 											<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 												<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" UseLayoutRounding="False" />
 											</Grid>
 										</Button>
 									</WrapPanel>
-									<Button Name="PART_CloseButton" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}">
+									<Button Name="PART_CloseButton" Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
 									</Button>
 								</WrapPanel>
@@ -696,15 +696,14 @@
 							<AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
 								<ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
 							</AdornerDecorator>
-							<ResizeGrip x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" />
+							<ResizeGrip x:Name="ResizeGrip" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" IsTabStop="False" Visibility="Collapsed" />
 						</Grid>
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="WindowState" Value="Maximized">
-							<Setter Property="Visibility" Value="Visible" TargetName="PART_RestoreButton" />
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PART_MaximizeButton" />
-							<!--<Setter Property="BorderThickness" Value="{Binding Source={x:Static shell:SystemParameters2.Current}, Path=WindowResizeBorderThickness}"/>-->
-							<Setter Property="Margin" TargetName="LayoutRoot" Value="7" />
+							<Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
+							<Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
 						</Trigger>
 						<Trigger Property="WindowStyle" Value="ToolWindow">
 							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
@@ -716,13 +715,6 @@
 							</MultiTrigger.Conditions>
 							<Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
 						</MultiTrigger>
-						<!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode"  Value="NoResize" />
-                                <Condition Property="WindowStyle"  Value="ToolWindow" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>-->
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -1501,13 +1493,6 @@
 		</Style.Triggers>
 	</Style>
 	<Style BasedOn="{StaticResource DefaultSlider}" TargetType="{x:Type Slider}" />
-	<Style x:Key="WD.DefaultTextBlock" TargetType="{x:Type TextBlock}">
-		<Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
-		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
-		<Setter Property="FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultTextBlock}" TargetType="{x:Type TextBlock}" />
 	<Style x:Key="WD.DefaultHyperlink" TargetType="{x:Type Hyperlink}">
 		<Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
@@ -3633,7 +3618,7 @@
 		<Setter Property="UseLayoutRounding" Value="True" />
 		<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
 		<Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
-		<Setter Property="WindowStyle" Value="None" />
+		<Setter Property="WindowStyle" Value="ToolWindow" />
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -3648,7 +3633,7 @@
 							<controls:SmallPanel Grid.Row="0">
 								<DockPanel Margin="20,0,0,0">
 									<TextBlock x:Name="PART_Title" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="Close">
+									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
 									</Button>
 								</DockPanel>
@@ -3802,7 +3787,7 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource DefaultGridSplitter}" TargetType="{x:Type GridSplitter}" />
-	<Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
+	<Style x:Key="WD.DefaultLabel" TargetType="{x:Type Label}">
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Top" />
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Generic.xaml b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
index 52496fef..50db423d 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -1,136 +1,177 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-                    xmlns:wpfdev="clr-namespace:WPFDevelopers.Net45x"
-                    xmlns:converts="clr-namespace:WPFDevelopers.Converts">
-
-
-    <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter"/>
-    <Style x:Key="WPFDevelopersWindow" TargetType="{x:Type wpfdev:Window}" BasedOn="{x:Null}">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converts="clr-namespace:WPFDevelopers.Converts"
+    xmlns:wpfdev="clr-namespace:WPFDevelopers.Net45x">
+    <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
+    <Style
+        x:Key="WPFDevelopersWindow"
+        BasedOn="{x:Null}"
+        TargetType="{x:Type wpfdev:Window}">
         <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-        <Setter Property="Background"  Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="IsTabStop"  Value="False" />
-        <!--<Setter Property="ResizeMode" Value="CanResizeWithGrip" />-->
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-        <Setter Property="WindowStyle"  Value="None" />
-        <Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}"/>
-        <Setter Property="MaxWidth" Value="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}"/>
+        <Setter Property="WindowStyle" Value="None" />
+        <Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" />
+        <Setter Property="MaxWidth" Value="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" />
         <Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
-                <WindowChrome  GlassFrameThickness="0,0,0,.1" 
-                               UseAeroCaptionButtons="False"
-                               CaptionHeight="{Binding TitleHeight,RelativeSource={RelativeSource AncestorType=wpfdev:Window}}"/>
+                <WindowChrome
+                    CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}"
+                    GlassFrameThickness="0,0,0,.1"
+                    UseAeroCaptionButtons="False" />
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wpfdev:Window}">
-                    <Border SnapsToDevicePixels="True"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="{TemplateBinding Background}"
-                              x:Name="LayoutRoot">
+                    <Border
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="True">
+                        <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <Grid Grid.Row="0" Height="{TemplateBinding TitleHeight}" 
-                                  Background="{TemplateBinding BorderBrush}">
+                            <Grid
+                                Grid.Row="0"
+                                Height="{TemplateBinding TitleHeight}"
+                                Background="{TemplateBinding BorderBrush}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" MinWidth="30"/>
+                                    <ColumnDefinition Width="Auto" MinWidth="30" />
                                 </Grid.ColumnDefinitions>
-                                <Image Source="{TemplateBinding Icon}" Stretch="Fill"
-                                    VerticalAlignment="Center" HorizontalAlignment="Left" Width="30" Height="30" Margin="14,0,0,0"
+                                <Image
+                                    Width="30"
+                                    Height="30"
+                                    Margin="14,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
                                     RenderOptions.BitmapScalingMode="HighQuality"
-                                       Visibility="{TemplateBinding Icon,Converter={StaticResource ObjectNullToVisibilityConverter}}"/>
-                                <TextBlock Text="{TemplateBinding Title}" x:Name="PART_Title" Margin="6,0"
-                                      Foreground="{TemplateBinding Foreground}" Grid.Column="1"
-                                       VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}"/>
-                                <WrapPanel Grid.Column="2" WindowChrome.IsHitTestVisibleInChrome="True"
-                                           Margin="0,6">
+                                    Source="{TemplateBinding Icon}"
+                                    Stretch="Fill"
+                                    Visibility="{TemplateBinding Icon,
+                                                                 Converter={StaticResource ObjectNullToVisibilityConverter}}" />
+                                <TextBlock
+                                    x:Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="6,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="{DynamicResource WD.TitleFontSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    Text="{TemplateBinding Title}" />
+                                <WrapPanel
+                                    Grid.Column="2"
+                                    Margin="0,6"
+                                    WindowChrome.IsHitTestVisibleInChrome="True">
                                     <WrapPanel x:Name="PART_MinAndMax">
-                                        <Button Name="PART_MinimizeButton"  IsTabStop="False"   Padding="0" 
-                                            Style="{DynamicResource WD.WindowButtonStyle}" 
-                                            Command="SystemCommands.MinimizeWindowCommand">
+                                        <Button
+                                            Name="PART_MinimizeButton"
+                                            Padding="0"
+                                            Command="SystemCommands.MinimizeWindowCommand"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}">
                                             <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Rectangle x:Name="MinimizeGlyph"  Width="10"  Height="1"   Margin="0 7 0 0" 
-                                                   VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
+                                                <Rectangle
+                                                    x:Name="MinimizeGlyph"
+                                                    Width="10"
+                                                    Height="1"
+                                                    Margin="0,7,0,0"
+                                                    VerticalAlignment="Bottom"
+                                                    Fill="{TemplateBinding Foreground}" />
                                             </Grid>
                                         </Button>
-                                        <Button Name="PART_MaximizeButton" IsTabStop="False"  Padding="0"
-                                            Style="{DynamicResource WD.WindowButtonStyle}"
-                                            Command="SystemCommands.MaximizeWindowCommand">
+                                        <Button
+                                            Name="PART_MaximizeButton"
+                                            Padding="0"
+                                            Command="SystemCommands.MaximizeWindowCommand"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}">
                                             <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Path Width="10" Height="10"
-                                              HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                              Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{TemplateBinding Foreground}"
-                                              Stretch="Fill" UseLayoutRounding="False" />
+                                                <Path
+                                                    Width="10"
+                                                    Height="10"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Data="{DynamicResource WD.WindowMaximizeGeometry}"
+                                                    Fill="{TemplateBinding Foreground}"
+                                                    Stretch="Fill"
+                                                    UseLayoutRounding="False" />
                                             </Grid>
                                         </Button>
-                                        <Button Name="PART_RestoreButton" IsTabStop="False"  Padding="0"
-                                            Style="{DynamicResource WD.WindowButtonStyle}"
+                                        <Button
+                                            Name="PART_RestoreButton"
+                                            Padding="0"
                                             Command="SystemCommands.RestoreWindowCommand"
+                                            IsTabStop="False"
+                                            Style="{DynamicResource WD.WindowButtonStyle}"
                                             Visibility="Collapsed">
                                             <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Path Width="10" Height="10"
-                                              HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                              Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{TemplateBinding Foreground}"
-                                              Stretch="Fill" UseLayoutRounding="False" />
+                                                <Path
+                                                    Width="10"
+                                                    Height="10"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Data="{DynamicResource WD.WindowRestoreGeometry}"
+                                                    Fill="{TemplateBinding Foreground}"
+                                                    Stretch="Fill"
+                                                    UseLayoutRounding="False" />
                                             </Grid>
                                         </Button>
                                     </WrapPanel>
 
-                                    <Button Name="PART_CloseButton"
-                                            IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}"
-                                            Command="SystemCommands.CloseWindowCommand">
-                                        <Path Width="10" Height="10"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Data="{DynamicResource WD.WindowCloseGeometry}"
-                              Fill="{TemplateBinding Foreground}"
-                              Stretch="Fill" />
+                                    <Button
+                                        Name="PART_CloseButton"
+                                        Command="SystemCommands.CloseWindowCommand"
+                                        IsTabStop="False"
+                                        Style="{DynamicResource WD.WindowButtonStyle}">
+                                        <Path
+                                            Width="10"
+                                            Height="10"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Data="{DynamicResource WD.WindowCloseGeometry}"
+                                            Fill="{TemplateBinding Foreground}"
+                                            Stretch="Fill" />
                                     </Button>
                                 </WrapPanel>
                             </Grid>
                             <AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
-                                <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True"/>
+                                <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
                             </AdornerDecorator>
-                            <ResizeGrip x:Name="ResizeGrip" 
-                                        HorizontalAlignment="Right" 
-                                        VerticalAlignment="Bottom" 
-                                        Grid.Row="1" IsTabStop="False"
-                                        Visibility="Collapsed"/>
+                            <ResizeGrip
+                                x:Name="ResizeGrip"
+                                Grid.Row="1"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                IsTabStop="False"
+                                Visibility="Collapsed" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Visibility" Value="Visible" TargetName="PART_RestoreButton"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="PART_MaximizeButton"/>
-                            <Setter Property="Margin" TargetName="LayoutRoot" Value="7"/>
+                            <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode"  Value="CanResizeWithGrip" />
-                                <Condition Property="WindowState"  Value="Normal" />
+                                <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
+                                <Condition Property="WindowState" Value="Normal" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
                         </MultiTrigger>
-                        <!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode"  Value="NoResize" />
-                                <Condition Property="WindowStyle"  Value="ToolWindow" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>-->
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index f6670fcc..a9690754 100644
--- a/src/WPFDevelopers.Net45x/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:wpfdev="clr-namespace:WPFDevelopers.Net45x" xmlns:converts="clr-namespace:WPFDevelopers.Converts" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:converts="clr-namespace:WPFDevelopers.Converts" xmlns:wpfdev="clr-namespace:WPFDevelopers.Net45x" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
 	<SolidColorBrush x:Key="WD.ButtonFocusVisualColor" po:Freeze="True" Color="#60000000" />
 	<Color x:Key="WD.ShadowDepthColor" po:Freeze="True">#AA000000</Color>
 	<Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#909399</Color>
@@ -636,13 +636,12 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}" />
-	<Style x:Key="WPFDevelopersWindow" TargetType="{x:Type wpfdev:Window}" BasedOn="{x:Null}">
+	<Style x:Key="WPFDevelopersWindow" BasedOn="{x:Null}" TargetType="{x:Type wpfdev:Window}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="IsTabStop" Value="False" />
-		<!--<Setter Property="ResizeMode" Value="CanResizeWithGrip" />-->
 		<Setter Property="SnapsToDevicePixels" Value="True" />
 		<Setter Property="UseLayoutRounding" Value="True" />
 		<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
@@ -652,14 +651,14 @@
 		<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
 		<Setter Property="WindowChrome.WindowChrome">
 			<Setter.Value>
-				<WindowChrome GlassFrameThickness="0,0,0,.1" UseAeroCaptionButtons="False" CaptionHeight="{Binding TitleHeight,RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" />
+				<WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" GlassFrameThickness="0,0,0,.1" UseAeroCaptionButtons="False" />
 			</Setter.Value>
 		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type wpfdev:Window}">
-					<Border SnapsToDevicePixels="True" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid Background="{TemplateBinding Background}" x:Name="LayoutRoot">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
 							<Grid.RowDefinitions>
 								<RowDefinition Height="Auto" />
 								<RowDefinition Height="*" />
@@ -670,27 +669,27 @@
 									<ColumnDefinition Width="*" />
 									<ColumnDefinition Width="Auto" MinWidth="30" />
 								</Grid.ColumnDefinitions>
-								<Image Source="{TemplateBinding Icon}" Stretch="Fill" VerticalAlignment="Center" HorizontalAlignment="Left" Width="30" Height="30" Margin="14,0,0,0" RenderOptions.BitmapScalingMode="HighQuality" Visibility="{TemplateBinding Icon,Converter={StaticResource ObjectNullToVisibilityConverter}}" />
-								<TextBlock Text="{TemplateBinding Title}" x:Name="PART_Title" Margin="6,0" Foreground="{TemplateBinding Foreground}" Grid.Column="1" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" />
-								<WrapPanel Grid.Column="2" WindowChrome.IsHitTestVisibleInChrome="True" Margin="0,6">
+								<Image Width="30" Height="30" Margin="14,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" Source="{TemplateBinding Icon}" Stretch="Fill" Visibility="{TemplateBinding Icon,&#xD;&#xA;                                                                 Converter={StaticResource ObjectNullToVisibilityConverter}}" />
+								<TextBlock x:Name="PART_Title" Grid.Column="1" Margin="6,0" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Title}" />
+								<WrapPanel Grid.Column="2" Margin="0,6" WindowChrome.IsHitTestVisibleInChrome="True">
 									<WrapPanel x:Name="PART_MinAndMax">
-										<Button Name="PART_MinimizeButton" IsTabStop="False" Padding="0" Style="{DynamicResource WD.WindowButtonStyle}" Command="SystemCommands.MinimizeWindowCommand">
+										<Button Name="PART_MinimizeButton" Padding="0" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 											<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-												<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0 7 0 0" VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
+												<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0,7,0,0" VerticalAlignment="Bottom" Fill="{TemplateBinding Foreground}" />
 											</Grid>
 										</Button>
-										<Button Name="PART_MaximizeButton" IsTabStop="False" Padding="0" Style="{DynamicResource WD.WindowButtonStyle}" Command="SystemCommands.MaximizeWindowCommand">
+										<Button Name="PART_MaximizeButton" Padding="0" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 											<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 												<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" UseLayoutRounding="False" />
 											</Grid>
 										</Button>
-										<Button Name="PART_RestoreButton" IsTabStop="False" Padding="0" Style="{DynamicResource WD.WindowButtonStyle}" Command="SystemCommands.RestoreWindowCommand" Visibility="Collapsed">
+										<Button Name="PART_RestoreButton" Padding="0" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" Visibility="Collapsed">
 											<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 												<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" UseLayoutRounding="False" />
 											</Grid>
 										</Button>
 									</WrapPanel>
-									<Button Name="PART_CloseButton" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" Command="SystemCommands.CloseWindowCommand">
+									<Button Name="PART_CloseButton" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
 									</Button>
 								</WrapPanel>
@@ -698,14 +697,14 @@
 							<AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
 								<ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
 							</AdornerDecorator>
-							<ResizeGrip x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" />
+							<ResizeGrip x:Name="ResizeGrip" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" IsTabStop="False" Visibility="Collapsed" />
 						</Grid>
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="WindowState" Value="Maximized">
-							<Setter Property="Visibility" Value="Visible" TargetName="PART_RestoreButton" />
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PART_MaximizeButton" />
-							<Setter Property="Margin" TargetName="LayoutRoot" Value="7" />
+							<Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
+							<Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
 						</Trigger>
 						<Trigger Property="WindowStyle" Value="ToolWindow">
 							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
@@ -717,13 +716,6 @@
 							</MultiTrigger.Conditions>
 							<Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
 						</MultiTrigger>
-						<!--<MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode"  Value="NoResize" />
-                                <Condition Property="WindowStyle"  Value="ToolWindow" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>-->
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -1502,13 +1494,6 @@
 		</Style.Triggers>
 	</Style>
 	<Style BasedOn="{StaticResource DefaultSlider}" TargetType="{x:Type Slider}" />
-	<Style x:Key="WD.DefaultTextBlock" TargetType="{x:Type TextBlock}">
-		<Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
-		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
-		<Setter Property="FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultTextBlock}" TargetType="{x:Type TextBlock}" />
 	<Style x:Key="WD.DefaultHyperlink" TargetType="{x:Type Hyperlink}">
 		<Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
@@ -3634,7 +3619,7 @@
 		<Setter Property="UseLayoutRounding" Value="True" />
 		<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
 		<Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
-		<Setter Property="WindowStyle" Value="None" />
+		<Setter Property="WindowStyle" Value="ToolWindow" />
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -3649,7 +3634,7 @@
 							<controls:SmallPanel Grid.Row="0">
 								<DockPanel Margin="20,0,0,0">
 									<TextBlock x:Name="PART_Title" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="Close">
+									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
 									</Button>
 								</DockPanel>
@@ -3803,15 +3788,15 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource DefaultGridSplitter}" TargetType="{x:Type GridSplitter}" />
-	<Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
+	<Style x:Key="WD.DefaultLabel" TargetType="{x:Type Label}">
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Top" />
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Label}">
-					<Border>
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
+					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
new file mode 100644
index 00000000..fb2a76a8
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
@@ -0,0 +1,64 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.BadgeExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <ToggleButton
+                x:Name="MyBadgeToggleButton"
+                Margin="10"
+                HorizontalAlignment="Center"
+                Content="显示Badge" />
+            <StackPanel
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
+                    wd:Badge.Text="new"
+                    Content="Default"
+                    Style="{DynamicResource WD.PrimaryButton}" />
+                <Button
+                    Margin="40,0"
+                    wd:Badge.FontSize="12"
+                    wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
+                    wd:Badge.Text="3"
+                    Content="Success"
+                    Style="{DynamicResource WD.SuccessDefaultButton}" />
+                <Button
+                    wd:Badge.FontSize="12"
+                    wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
+                    wd:Badge.Text="10+"
+                    Content="Warning"
+                    Style="{DynamicResource WD.WarningDefaultButton}" />
+                <Button
+                    Margin="40,0"
+                    wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
+                    wd:Badge.Text="NEW"
+                    Content="Danger"
+                    Style="{DynamicResource WD.DangerDefaultButton}" />
+                <Rectangle
+                    Width="100"
+                    Height="100"
+                    wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
+                    Fill="Aqua" />
+            </StackPanel>
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BadgeExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BadgeExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs
new file mode 100644
index 00000000..bd32c9d3
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// BarrageExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class BadgeExample : UserControl
+    {
+        public BadgeExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 6b2be229..1fbbe128 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -139,18 +139,27 @@
                             Click="BtnOffTask_Click"
                             Content="Off Task"
                             Style="{DynamicResource WD.DangerPrimaryButton}" />
+                        <Button
+                            wd:Loading.Child="{x:Static wd:NormalLoading.Default}"
+                            wd:Loading.IsShow="True"
+                            Content="NormalLoading"
+                            Style="{DynamicResource WD.PrimaryButton}" />
                     </WrapPanel>
                     <TextBlock
                         Margin="0,20,0,0"
                         FontSize="20"
                         Text="Button" />
                     <WrapPanel Margin="0,10">
-                        <Button Content="Default" />
+                        <Button wd:Badge.IsShow="True" Content="Default" />
                         <Button
                             Margin="10,0"
                             Content="Default"
                             IsEnabled="False" />
-                        <Button Content="Default" Style="{DynamicResource WD.PrimaryButton}" />
+                        <Button
+                            wd:Badge.IsShow="True"
+                            wd:Badge.Text="new"
+                            Content="Default"
+                            Style="{DynamicResource WD.PrimaryButton}" />
                         <Button
                             Margin="10,0"
                             Content="Default"
@@ -158,7 +167,12 @@
                             Style="{DynamicResource WD.PrimaryButton}" />
                     </WrapPanel>
                     <WrapPanel Margin="0,10">
-                        <Button Content="Success" Style="{DynamicResource WD.SuccessDefaultButton}" />
+                        <Button
+                            wd:Badge.FontSize="12"
+                            wd:Badge.IsShow="True"
+                            wd:Badge.Text="3"
+                            Content="Success"
+                            Style="{DynamicResource WD.SuccessDefaultButton}" />
                         <Button
                             Margin="10,0"
                             Content="Success"
@@ -172,7 +186,12 @@
                             Style="{DynamicResource WD.SuccessPrimaryButton}" />
                     </WrapPanel>
                     <WrapPanel Margin="0,10">
-                        <Button Content="Warning" Style="{DynamicResource WD.WarningDefaultButton}" />
+                        <Button
+                            wd:Badge.FontSize="12"
+                            wd:Badge.IsShow="True"
+                            wd:Badge.Text="10+"
+                            Content="Warning"
+                            Style="{DynamicResource WD.WarningDefaultButton}" />
                         <Button
                             Margin="10,0"
                             Content="Warning"
@@ -186,7 +205,11 @@
                             Style="{DynamicResource WD.WarningPrimaryButton}" />
                     </WrapPanel>
                     <WrapPanel Margin="0,10">
-                        <Button Content="Danger" Style="{DynamicResource WD.DangerDefaultButton}" />
+                        <Button
+                            wd:Badge.IsShow="True"
+                            wd:Badge.Text="NEW"
+                            Content="Danger"
+                            Style="{DynamicResource WD.DangerDefaultButton}" />
                         <Button
                             Margin="10,0"
                             Content="Danger"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
index c902ca13..94624ba0 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
@@ -96,7 +96,7 @@ private void btnInformation_Click(object sender, RoutedEventArgs e)
 
         private void btnWarning_Click(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("当前文件不存在！", "警告", MessageBoxImage.Warning);
+            MessageBox.Show("执行此操作可能导致文件无法打开！", "警告", MessageBoxImage.Warning, App.CurrentMainWindow);
         }
 
         private void btnError_Click(object sender, RoutedEventArgs e)
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index b05b5629..9a16f231 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -72,6 +72,7 @@ public enum MenuEnum
         MultiSelectSearchComboBox,
         BreadCrumbBar,
         CropImage,
+        Badge,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 5d4fbb72..d7a5de37 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -294,6 +294,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.CropImage:
                     ControlPanel = new CropImageExample();
                     break;
+                case MenuEnum.Badge:
+                    ControlPanel = new BadgeExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 7f8cbb1a..5454da79 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -403,6 +403,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ZooSemy\ZooSemyExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>ZooSemyExample.xaml</DependentUpon>
+    </Compile>
+	 <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BadgeExample.xaml.cs">
+      <SubType>Code</SubType>
+      <DependentUpon>BadgeExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\ElementVisualTreeHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\MenuEnum.cs" />
@@ -841,6 +845,10 @@
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ZooSemy\ZooSemyExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+    </Page>
+	<Page Include="$(MSBuildThisFileDirectory)ExampleViews\BadgeExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)Light.Carmine.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
index 3bdcb994..4ce48358 100644
--- a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
+++ b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
@@ -13,7 +13,7 @@
 		<ApplicationIcon>..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico</ApplicationIcon>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="WPFDevelopers" Version="1.1.0.1-preview8" />
+		<PackageReference Include="WPFDevelopers" Version="1.1.0.1-preview9" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="ICSharpCode.AvalonEdit, Version=6.1.3.50, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 3eb69f94..d0946e3d 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -131,6 +131,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ElementAdorner\ThumbAngle.cs" Link="Controls\ElementAdorner\ThumbAngle.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\CropControl\CropControl.cs" Link="Controls\CropControl\CropControl.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropImageExample.xaml.cs" Link="ExampleViews\CropImageExample.xaml.cs" DependentUpon="CropImageExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BadgeExample.xaml.cs" Link="ExampleViews\BadgeExample.xaml.cs" DependentUpon="BadgeExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -439,5 +440,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropImageExample.xaml">
 			<Link>ExampleViews\CropImageExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BadgeExample.xaml">
+			<Link>ExampleViews\BadgeExample.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
new file mode 100644
index 00000000..023054f4
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace WPFDevelopers.Controls
+{
+    public class Badge : Adorner
+    {
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(Badge), new PropertyMetadata(string.Empty));
+
+        public static readonly DependencyProperty FontSizeProperty =
+            DependencyProperty.Register("FontSize", typeof(double), typeof(Badge), new PropertyMetadata(10.0d));
+
+
+        public static readonly DependencyProperty IsShowProperty =
+            DependencyProperty.RegisterAttached("IsShow", typeof(bool), typeof(Badge),
+                new PropertyMetadata(false, OnIsBadgeChanged));
+
+        private readonly double _size;
+
+        private readonly string _text;
+
+        public Badge(UIElement adornedElement, string text = null, double size = 0)
+            : base(adornedElement)
+        {
+            _text = text;
+            _size = size;
+            ToolTip = text;
+        }
+
+        public string Text
+        {
+            get => (string) GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
+        }
+
+        public double FontSize
+        {
+            get => (double) GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
+        }
+
+        public static string GetText(UIElement element)
+        {
+            if (element == null) throw new ArgumentNullException("Text");
+
+            return (string) element.GetValue(TextProperty);
+        }
+
+        public static void SetText(UIElement element, string Text)
+        {
+            if (element == null) throw new ArgumentNullException("Text");
+
+            element.SetValue(TextProperty, Text);
+        }
+
+        public static double GetFontSize(UIElement element)
+        {
+            if (element == null) throw new ArgumentNullException("FontSize");
+
+            return (double) element.GetValue(FontSizeProperty);
+        }
+
+        public static void SetFontSize(UIElement element, string Text)
+        {
+            if (element == null) throw new ArgumentNullException("FontSize");
+
+            element.SetValue(FontSizeProperty, Text);
+        }
+
+        private static void OnIsBadgeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue is bool isBadge && d is FrameworkElement parent)
+            {
+                if (isBadge)
+                {
+                    parent.IsVisibleChanged += Parent_IsVisibleChanged;
+                    if (!parent.IsLoaded)
+                        parent.Loaded += Parent_Loaded;
+                    else
+                        CreateBadge(parent);
+                }
+                else
+                {
+                    parent.Loaded -= Parent_Loaded;
+                    parent.IsVisibleChanged -= Parent_IsVisibleChanged;
+                    CreateBadge(parent, true);
+                }
+            }
+        }
+        private static void Parent_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+
+            if (e.NewValue is bool isVisible && sender is FrameworkElement parent)
+            {
+                var isShow = GetIsShow(parent);
+                if (isVisible && isShow)
+                    CreateBadge(parent);
+            }
+        }
+        private static void Parent_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is UIElement element)
+                CreateBadge(element);
+        }
+
+        private static void CreateBadge(UIElement uIElement, bool isRemove = false)
+        {
+            var layer = AdornerLayer.GetAdornerLayer(uIElement);
+            if (layer == null) return;
+            if (isRemove && uIElement != null)
+            {
+                var adorners = layer.GetAdorners(uIElement);
+                if (adorners != null)
+                    foreach (var item in adorners)
+                        if (item is Badge container)
+                            layer.Remove(container);
+                return;
+            }
+
+            var value = GetText(uIElement);
+            var size = GetFontSize(uIElement);
+            var badgeAdorner = new Badge(uIElement, value, size);
+            layer.Add(badgeAdorner);
+        }
+
+        public static bool GetIsShow(DependencyObject obj)
+        {
+            return (bool) obj.GetValue(IsShowProperty);
+        }
+
+        public static void SetIsShow(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsShowProperty, value);
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            var adornedElement = AdornedElement as FrameworkElement;
+            var margin = adornedElement.Margin;
+            var desiredWidth = adornedElement.DesiredSize.Width - margin.Left - margin.Right;
+            var brush = new SolidColorBrush((Color) Application.Current.TryFindResource("WD.DangerColor"));
+            brush.Freeze();
+            var radius = 5.0;
+            var center = new Point(desiredWidth, 0);
+            FormattedText formattedText = null;
+            if (!string.IsNullOrEmpty(_text))
+                formattedText = DrawingContextHelper.GetFormattedText(
+                    _text,
+                    Brushes.White,
+                    FlowDirection.LeftToRight,
+                    _size);
+            var pen = new Pen(Brushes.White, .3);
+            pen.Freeze();
+            drawingContext.PushTransform(new MatrixTransform(Matrix.Identity));
+            if (formattedText != null)
+            {
+                var height = formattedText.Height;
+                var width = formattedText.Width > 20 ? 20 : formattedText.Width;
+                var isSingle = false;
+                if (_text.Length == 1)
+                {
+                    var max = formattedText.Width > formattedText.Height ? formattedText.Width : formattedText.Height;
+                    height = max;
+                    width = max;
+                    isSingle = true;
+                }
+
+                var startPoint = new Point(0, 0);
+                var endPoint = new Point(0, 0);
+                if (!isSingle)
+                {
+                    startPoint = new Point(center.X - width / 1.4, center.Y - height / 1.8);
+                    endPoint = new Point(center.X + width / 1.4 + 6, center.Y + height / 1.8);
+                }
+                else
+                {
+                    startPoint = new Point(center.X - width / 2, center.Y - height / 2);
+                    endPoint = new Point(center.X + width / 2, center.Y + height / 2);
+                }
+
+                var rect = new Rect(startPoint, endPoint);
+                drawingContext.DrawRoundedRectangle(brush, pen, rect, 8, 8);
+                formattedText.MaxTextWidth = width + 10;
+                var centerRect = new Point(rect.Left + rect.Width / 2, rect.Top + rect.Height / 2);
+                var textPosition = new Point(centerRect.X - formattedText.Width / 2,
+                    centerRect.Y - formattedText.Height / 2);
+                drawingContext.DrawText(formattedText, textPosition);
+            }
+            else
+            {
+                drawingContext.DrawEllipse(brush, pen, center, radius, radius);
+            }
+
+            drawingContext.Pop();
+            RenderOptions.SetEdgeMode(this, EdgeMode.Unspecified);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBar.cs b/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBar.cs
index 9824b2ca..44a6e251 100644
--- a/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBar.cs
+++ b/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBar.cs
@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Specialized;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace WPFDevelopers.Controls
@@ -9,31 +7,35 @@ public class BreadCrumbBar : ListBox
     {
         static BreadCrumbBar()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(BreadCrumbBar), new FrameworkPropertyMetadata(typeof(BreadCrumbBar)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(BreadCrumbBar),
+                new FrameworkPropertyMetadata(typeof(BreadCrumbBar)));
         }
+
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
         }
+
         protected override void OnSelectionChanged(SelectionChangedEventArgs e)
         {
             base.OnSelectionChanged(e);
-            for (int i = 0; i <= SelectedIndex; i++)
+            for (var i = 0; i <= SelectedIndex; i++)
             {
-                var item = (ListBoxItem)ItemContainerGenerator.ContainerFromIndex(i);
+                var item = (ListBoxItem) ItemContainerGenerator.ContainerFromIndex(i);
                 if (item == null) continue;
                 if (!item.IsEnabled)
                     item.IsEnabled = true;
             }
-            for (int i = Items.Count - 1; i > SelectedIndex; i--)
+
+            for (var i = Items.Count - 1; i > SelectedIndex; i--)
             {
-                var item = (ListBoxItem)ItemContainerGenerator.ContainerFromIndex(i);
+                var item = (ListBoxItem) ItemContainerGenerator.ContainerFromIndex(i);
                 if (item == null) continue;
-                if(item.IsEnabled)
+                if (item.IsEnabled)
                     item.IsEnabled = false;
             }
         }
-       
+
         protected override bool IsItemItsOwnContainerOverride(object item)
         {
             return item is BreadCrumbBarItem;
@@ -44,4 +46,4 @@ protected override DependencyObject GetContainerForItemOverride()
             return new BreadCrumbBarItem();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBarItem.cs b/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBarItem.cs
index 1f83f589..a3467650 100644
--- a/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBarItem.cs
+++ b/src/WPFDevelopers.Shared/Controls/BreadCrumbBar/BreadCrumbBarItem.cs
@@ -7,10 +7,11 @@ namespace WPFDevelopers.Controls
     public class BreadCrumbBarItem : ListBoxItem
     {
         private static readonly Type _typeofSelf = typeof(BreadCrumbBarItem);
+
         static BreadCrumbBarItem()
         {
             DefaultStyleKeyProperty.OverrideMetadata(_typeofSelf,
                 new FrameworkPropertyMetadata(_typeofSelf));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
index c0fa9bd7..c3da4790 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
@@ -1,71 +1,71 @@
 using System.Linq;
-using System.Security.Cryptography;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
-using System.Windows.Shapes;
 using WPFDevelopers.Helpers;
-using WPFDevelopers.Utilities;
 
 namespace WPFDevelopers.Controls
 {
     public static class MessageBox
     {
-        public static MessageBoxResult Show(string messageBoxText)
+        public static MessageBoxResult Show(string messageBoxText,Window owner = null)
         {
             var msg = new WPFMessageBox(messageBoxText);
-            return GetWindow(msg);
+            return GetWindow(msg, owner);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption)
+        public static MessageBoxResult Show(string messageBoxText, string caption, Window owner = null)
         {
             var msg = new WPFMessageBox(messageBoxText, caption);
-            return GetWindow(msg);
+            return GetWindow(msg, owner);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button)
+        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, Window owner = null)
         {
             var msg = new WPFMessageBox(messageBoxText, caption, button);
-            return GetWindow(msg);
+            return GetWindow(msg, owner);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxImage icon)
+        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxImage icon, Window owner = null)
         {
             var msg = new WPFMessageBox(messageBoxText, caption, icon);
-            return GetWindow(msg);
+            return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button,
-            MessageBoxImage icon)
+            MessageBoxImage icon, Window owner = null)
         {
             var msg = new WPFMessageBox(messageBoxText, caption, button, icon);
-            return GetWindow(msg);
+            return GetWindow(msg, owner);
         }
 
-        private static MessageBoxResult GetWindow(WPFMessageBox msg)
+        private static MessageBoxResult GetWindow(WPFMessageBox msg, Window owner = null)
         {
-            try
+            msg.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            if (owner != null)
+            {
+                msg.CreateMask();
+                msg.Owner = owner;
+                msg.ShowDialog();
+            }
+            else
             {
-                msg.WindowStartupLocation = WindowStartupLocation.CenterOwner;
                 Window win = null;
                 if (Application.Current.Windows.Count > 0)
                     win = Application.Current.Windows.OfType<Window>().FirstOrDefault(o => o.IsActive);
                 if (win != null)
                 {
+                    if (win.WindowState == WindowState.Minimized)
+                        msg.BorderThickness = new Thickness(1);
                     msg.CreateMask();
                     msg.Owner = win;
                     msg.ShowDialog();
                 }
                 else
+                {
+                    msg.BorderThickness = new Thickness(1);
                     msg.Show();
-                return msg.Result;
-            }
-            catch (System.Exception)
-            {
-                throw;
+                }
             }
+            return msg.Result;
         }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
index 8c3602e0..f9bc1abc 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
@@ -1,4 +1,9 @@
-using System;
+#if NET40
+using Microsoft.Windows.Shell;
+#else
+using System.Windows.Shell;
+# endif
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -57,7 +62,6 @@ public WPFMessageBox(string message, string caption, MessageBoxButton button)
         {
             _titleString = caption;
             _messageString = message;
-            ;
         }
 
         public WPFMessageBox(string message, string caption, MessageBoxImage image)
@@ -80,6 +84,7 @@ public WPFMessageBox(string message, string caption, MessageBoxButton button, Me
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
+
             _title = GetTemplateChild(TitleTemplateName) as TextBlock;
             _message = GetTemplateChild(MessageTemplateName) as TextBox;
 
@@ -117,6 +122,25 @@ public override void OnApplyTemplate()
                 BorderThickness = new Thickness(1);
                 WindowStartupLocation = WindowStartupLocation.CenterScreen;
             }
+
+#if NET40
+            var chrome = new WindowChrome
+            {
+                CaptionHeight = 40,
+                GlassFrameThickness = new Thickness(1),
+            };
+            WindowChrome.SetIsHitTestVisibleInChrome(_closeButton, true);
+            WindowChrome.SetWindowChrome(this, chrome);
+#else
+            var chrome = new WindowChrome
+            {
+                CaptionHeight = 40,
+                GlassFrameThickness = new Thickness(1),
+                UseAeroCaptionButtons = false
+            };
+             WindowChrome.SetIsHitTestVisibleInChrome(_closeButton, true);
+             WindowChrome.SetWindowChrome(this, chrome);
+#endif
         }
 
         private void _buttonOK_Click(object sender, RoutedEventArgs e)
@@ -145,8 +169,6 @@ private void DisplayButtons(MessageBoxButton button)
                     _cancelVisibility = Visibility.Visible;
                     _okVisibility = Visibility.Visible;
                     break;
-                //case MessageBoxButton.YesNoCancel:
-                //    break;
                 default:
                     _okVisibility = Visibility.Visible;
                     break;
@@ -159,19 +181,23 @@ private void DisplayImage(MessageBoxImage image)
             {
                 case MessageBoxImage.Warning:
                     _geometry = (Geometry) Application.Current.TryFindResource("WD.WarningGeometry");
-                    _solidColorBrush = (SolidColorBrush) Application.Current.TryFindResource("WD.WarningSolidColorBrush");
+                    _solidColorBrush =
+                        (SolidColorBrush) Application.Current.TryFindResource("WD.WarningSolidColorBrush");
                     break;
                 case MessageBoxImage.Error:
                     _geometry = (Geometry) Application.Current.TryFindResource("WD.ErrorGeometry");
-                    _solidColorBrush = (SolidColorBrush) Application.Current.TryFindResource("WD.DangerSolidColorBrush");
+                    _solidColorBrush =
+                        (SolidColorBrush) Application.Current.TryFindResource("WD.DangerSolidColorBrush");
                     break;
                 case MessageBoxImage.Information:
                     _geometry = (Geometry) Application.Current.TryFindResource("WD.WarningGeometry");
-                    _solidColorBrush = (SolidColorBrush) Application.Current.TryFindResource("WD.SuccessSolidColorBrush");
+                    _solidColorBrush =
+                        (SolidColorBrush) Application.Current.TryFindResource("WD.SuccessSolidColorBrush");
                     break;
                 case MessageBoxImage.Question:
                     _geometry = (Geometry) Application.Current.TryFindResource("WD.QuestionGeometry");
-                    _solidColorBrush = (SolidColorBrush) Application.Current.TryFindResource("WD.NormalSolidColorBrush");
+                    _solidColorBrush =
+                        (SolidColorBrush) Application.Current.TryFindResource("WD.NormalSolidColorBrush");
                     break;
             }
         }
diff --git a/src/WPFDevelopers.Shared/Helpers/DrawingContextHelper.cs b/src/WPFDevelopers.Shared/Helpers/DrawingContextHelper.cs
index d2c9b0a9..8cea8bfa 100644
--- a/src/WPFDevelopers.Shared/Helpers/DrawingContextHelper.cs
+++ b/src/WPFDevelopers.Shared/Helpers/DrawingContextHelper.cs
@@ -70,7 +70,6 @@ public static FormattedText GetFormattedText(string text, Brush color = null,
                 TextAlignment = TextAlignment.Justify,
                 Trimming = TextTrimming.CharacterEllipsis
             };
-            //textSize, color == null ? Brush : (Brush)brushConverter.ConvertFromString(color))
         }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
index a201ba87..a768594a 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
@@ -19,7 +19,7 @@
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
         <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
-        <Setter Property="WindowStyle" Value="None" />
+        <Setter Property="WindowStyle" Value="ToolWindow" />
         <Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -47,8 +47,7 @@
                                         Margin="0,6"
                                         HorizontalAlignment="Right"
                                         IsTabStop="False"
-                                        Style="{DynamicResource WD.WindowButtonStyle}"
-                                        ToolTip="Close">
+                                        Style="{DynamicResource WD.WindowButtonStyle}">
                                         <Path
                                             Width="10"
                                             Height="10"
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 0167ccf3..f7f8c88c 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -13,7 +13,6 @@ Basic\ControlBasic.xaml
 ..\Styles\Styles.RadioButton.xaml
 ..\Styles\Styles.ScrollBar.xaml
 ..\Styles\Styles.Slider.xaml
-..\Styles\Styles.TextBlock.xaml
 ..\Styles\Styles.Hyperlink.xaml
 ..\Styles\Styles.CheckBox.xaml
 ..\Styles\Styles.TextBox.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index a4d1a760..e6e1191e 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -13,7 +13,6 @@ Basic\ControlBasic.xaml
 ..\Styles\Styles.RadioButton.xaml
 ..\Styles\Styles.ScrollBar.xaml
 ..\Styles\Styles.Slider.xaml
-..\Styles\Styles.TextBlock.xaml
 ..\Styles\Styles.Hyperlink.xaml
 ..\Styles\Styles.CheckBox.xaml
 ..\Styles\Styles.TextBox.xaml
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index f3c1cdab..9898d4b1 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Assists\ThincknessAssert.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Badge\Badge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBarItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CropImage\CropImage.cs" />
@@ -328,10 +329,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Styles.TextBlock.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Styles\Styles.TextBox.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>