diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index c2b53c66..2a257410 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -3,9 +3,9 @@
     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">
+    xmlns:wd="clr-namespace:WPFDevelopers.Net40">
     <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
-    <Style BasedOn="{x:Null}" TargetType="{x:Type wpfdev:Window}">
+    <Style BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
         <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
@@ -19,12 +19,12 @@
         <Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
         <Setter Property="shell:WindowChrome.WindowChrome">
             <Setter.Value>
-                <shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" GlassFrameThickness="0,0,0,.1" />
+                <shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" />
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type wpfdev:Window}">
+                <ControlTemplate TargetType="{x:Type wd:Window}">
                     <Border
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -35,6 +35,7 @@
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
                             <Grid
+                                x:Name="PART_GridChrome"
                                 Grid.Row="0"
                                 Height="{TemplateBinding TitleHeight}"
                                 Background="{TemplateBinding BorderBrush}">
@@ -138,6 +139,13 @@
                                     </Button>
                                 </WrapPanel>
                             </Grid>
+                            <ContentPresenter
+                                x:Name="PART_TitleToolBar"
+                                Grid.Row="0"
+                                shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                Content="{Binding TitleBar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                Focusable="False"
+                                Visibility="Collapsed" />
                             <AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
                                 <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
                             </AdornerDecorator>
@@ -159,6 +167,10 @@
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
                         </Trigger>
+                        <Trigger Property="NoChrome" Value="True">
+                            <Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index 4f0f1518..df20d3f3 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: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">
+<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:wd="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>
@@ -144,6 +144,17 @@
 	<sys:Double x:Key="WD.RepeatButtonSize">5</sys:Double>
 	<BooleanToVisibilityConverter x:Key="WD.Bool2VisibilityConverter" />
 	<Thickness x:Key="WD.TabItemBorderThickness">0,0,0,2</Thickness>
+	<Style TargetType="ToolTip">
+		<Setter Property="Visibility" Value="Visible" />
+		<Style.Triggers>
+			<DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="{x:Null}">
+				<Setter Property="Visibility" Value="Collapsed" />
+			</DataTrigger>
+			<DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="">
+				<Setter Property="Visibility" Value="Collapsed" />
+			</DataTrigger>
+		</Style.Triggers>
+	</Style>
 	<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
 	<Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
 		<Setter Property="OverridesDefaultStyle" Value="True" />
@@ -349,6 +360,11 @@
 	<converts:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
 	<converts:StepIndexConverter x:Key="WD.StepIndexConverter" />
 	<converts:BreadCrumbBarConvertr x:Key="WD.BreadCrumbBarConvertr" />
+	<Style x:Key="WD.MessageListBox" TargetType="{x:Type controls:MessageListBox}">
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+	</Style>
 	<SolidColorBrush x:Key="WD.SecondaryTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PrimaryTextColor}" />
 	<SolidColorBrush x:Key="WD.PlaceholderTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PlaceholderTextColor}" />
 	<SolidColorBrush x:Key="WD.NormalSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.NormalColor}" />
@@ -636,7 +652,7 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}" />
-	<Style BasedOn="{x:Null}" TargetType="{x:Type wpfdev:Window}">
+	<Style BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
@@ -650,19 +666,19 @@
 		<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
 		<Setter Property="shell:WindowChrome.WindowChrome">
 			<Setter.Value>
-				<shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" GlassFrameThickness="0,0,0,.1" />
+				<shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" />
 			</Setter.Value>
 		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type wpfdev:Window}">
+				<ControlTemplate TargetType="{x:Type wd:Window}">
 					<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 x:Name="PART_GridChrome" Grid.Row="0" Height="{TemplateBinding TitleHeight}" Background="{TemplateBinding BorderBrush}">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="Auto" />
 									<ColumnDefinition Width="*" />
@@ -693,6 +709,7 @@
 									</Button>
 								</WrapPanel>
 							</Grid>
+							<ContentPresenter x:Name="PART_TitleToolBar" Grid.Row="0" shell:WindowChrome.IsHitTestVisibleInChrome="True" Content="{Binding TitleBar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" Focusable="False" Visibility="Collapsed" />
 							<AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
 								<ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
 							</AdornerDecorator>
@@ -708,6 +725,10 @@
 						<Trigger Property="WindowStyle" Value="ToolWindow">
 							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
 						</Trigger>
+						<Trigger Property="NoChrome" Value="True">
+							<Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
+						</Trigger>
 						<MultiTrigger>
 							<MultiTrigger.Conditions>
 								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
@@ -893,6 +914,8 @@
 	<Style x:Key="WD.DefaultRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
 		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Padding" Value="4,0" />
 		<Setter Property="VerticalAlignment" Value="Center" />
@@ -904,7 +927,7 @@
 						<BulletDecorator.Bullet>
 							<Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
 								<controls:SmallPanel MinWidth="16" MinHeight="16">
-									<Ellipse x:Name="PART_Border" Fill="{TemplateBinding Background}" Stroke="{DynamicResource WD.BaseSolidColorBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
+									<Ellipse x:Name="PART_Border" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
 									<Ellipse x:Name="PART_Ellipse" MinWidth="6" MinHeight="6" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5">
 										<Ellipse.RenderTransform>
 											<ScaleTransform ScaleX="0" ScaleY="0" />
@@ -913,7 +936,7 @@
 								</controls:SmallPanel>
 							</Border>
 						</BulletDecorator.Bullet>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CheckStates">
 								<VisualState x:Name="Unchecked" />
@@ -1518,13 +1541,16 @@
 		<Setter Property="Padding" Value="4,0" />
 		<Setter Property="VerticalAlignment" Value="Center" />
 		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type CheckBox}">
 					<BulletDecorator Margin="{TemplateBinding Margin}" Background="Transparent">
 						<BulletDecorator.Bullet>
 							<Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" CornerRadius="{Binding ElementName=PART_Border, Path=CornerRadius}">
-								<Border x:Name="PART_Border" Width="16" Height="16" Background="{DynamicResource WD.WindowForegroundColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="3">
+								<Border x:Name="PART_Border" Width="16" Height="16" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="3">
 									<controls:SmallPanel>
 										<Path x:Name="PART_CheckMark" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5" SnapsToDevicePixels="False" Stretch="Fill">
 											<Path.RenderTransform>
@@ -1540,7 +1566,7 @@
 								</Border>
 							</Border>
 						</BulletDecorator.Bullet>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CheckStates">
 								<VisualState x:Name="Checked">
@@ -1673,6 +1699,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="Padding" Value="14.5,3,30,3" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -1788,13 +1815,14 @@
 		<Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+		<Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ComboBoxItem}">
 					<controls:SmallPanel>
 						<Rectangle x:Name="PART_RectangleMouseOver" Fill="{TemplateBinding Background}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
 						<Rectangle x:Name="PART_RectangleSelected" Fill="{DynamicResource WD.BaseSolidColorBrush}" SnapsToDevicePixels="True" UseLayoutRounding="True" Visibility="Collapsed" />
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
+						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
@@ -2474,20 +2502,6 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsSelected" Value="True" />
-					<Condition Property="Selector.IsSelectionActive" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
 	</Style>
 	<Style x:Key="WD.DefaultDataGridRow" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridRow}">
 		<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -3678,7 +3692,10 @@
 							</Ellipse.RenderTransform>
 							<Ellipse.Triggers>
 								<EventTrigger RoutedEvent="Loaded">
-									<BeginStoryboard Storyboard="{StaticResource StarStoryboard}" />
+									<BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+								</EventTrigger>
+								<EventTrigger RoutedEvent="Unloaded">
+									<StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
 								</EventTrigger>
 							</Ellipse.Triggers>
 						</Ellipse>
@@ -3707,7 +3724,10 @@
 								</Ellipse.RenderTransform>
 								<Ellipse.Triggers>
 									<EventTrigger RoutedEvent="Loaded">
-										<BeginStoryboard Storyboard="{StaticResource StarStoryboard}" />
+										<BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+									</EventTrigger>
+									<EventTrigger RoutedEvent="Unloaded">
+										<StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
 									</EventTrigger>
 								</Ellipse.Triggers>
 							</Ellipse>
@@ -3787,7 +3807,7 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource DefaultGridSplitter}" TargetType="{x:Type GridSplitter}" />
-	<Style x:Key="WD.DefaultLabel" TargetType="{x:Type Label}">
+	<Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Top" />
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
@@ -5918,8 +5938,7 @@
 	<Style x:Key="WD.BreadCrumbBarItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreadCrumbBarItem}">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="FontWeight" Value="SemiBold" />
-		<Setter Property="FontSize" Value="{StaticResource WD.TitleFontSize}" />
+		<Setter Property="FontSize" Value="{StaticResource WD.MediumFontSize}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:BreadCrumbBarItem}">
@@ -5983,6 +6002,95 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.CropImage}" TargetType="{x:Type controls:CropImage}" />
+	<Style x:Key="WD.MessageListBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MessageListBoxItem}">
+		<Setter Property="FontSize" Value="{DynamicResource WD.NormalFontSize}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="helpers:ListBoxItemExtensions.AutoRemoveOnOpacityZero" Value="True" />
+		<Setter Property="Width" Value="300" />
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="Margin" Value="4,2" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:MessageListBoxItem}">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="Storyboard_Close">
+							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
+							<DoubleAnimation BeginTime="0:0:0.2" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0" />
+						</Storyboard>
+						<Storyboard x:Key="Storyboard_Loaded">
+							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0" To="1" Duration="0:0:0.2" />
+							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="Opacity" From=".1" To="1" Duration="0:0:0.2" />
+							<DoubleAnimation BeginTime="0:0:10" Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
+							<DoubleAnimation BeginTime="0:0:10" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0.2" />
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<controls:SmallPanel x:Name="PART_SmallPanel" Margin="{TemplateBinding Margin}" RenderTransformOrigin=".5,0">
+						<controls:SmallPanel.RenderTransform>
+							<ScaleTransform />
+						</controls:SmallPanel.RenderTransform>
+						<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.NormalShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+						<Border Padding="{TemplateBinding Padding}">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="*" />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<DockPanel x:Name="PART_DockPanel" Grid.Column="0">
+									<Path x:Name="PART_Path" Width="15" Height="15" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
+									<TextBlock Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" TextWrapping="Wrap" />
+								</DockPanel>
+								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="30" Height="28" Padding="0" HorizontalAlignment="Right" Style="{StaticResource WD.PathButton}">
+									<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.SecondaryTextSolidColorBrush}" Stretch="Fill" />
+								</Button>
+							</Grid>
+						</Border>
+					</controls:SmallPanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="MessageType" Value="Warning">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.WarningGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.WarningSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.WarningSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="MessageType" Value="Error">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ErrorGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.DangerSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.DangerSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="MessageType" Value="Information">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.InformationGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="MessageType" Value="Question">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.QuestionGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.NormalSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.NormalSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="IsCenter" Value="True">
+							<Setter TargetName="PART_DockPanel" Property="HorizontalAlignment" Value="Center" />
+						</Trigger>
+						<EventTrigger RoutedEvent="Button.Click" SourceName="PART_CloseButton">
+							<BeginStoryboard x:Name="BeginStoryboardClose" Storyboard="{StaticResource Storyboard_Close}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="Loaded">
+							<BeginStoryboard x:Name="BeginStoryboardLoaded" Storyboard="{StaticResource Storyboard_Loaded}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="Unloaded">
+							<StopStoryboard BeginStoryboardName="BeginStoryboardLoaded" />
+							<StopStoryboard BeginStoryboardName="BeginStoryboardClose" />
+						</EventTrigger>
+						<Trigger Property="Opacity" Value="0">
+							<Setter Property="Visibility" Value="Collapsed" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.MessageListBoxItem}" TargetType="{x:Type controls:MessageListBoxItem}" />
+	<Style BasedOn="{StaticResource WD.MessageListBox}" TargetType="{x:Type controls:MessageListBox}" />
 	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
 	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
 		<Setter Property="IsTodayHighlighted" Value="True" />
diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
index 6d11bc11..1a6adf1c 100644
--- a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
+++ b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
@@ -8,9 +8,9 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<Copyright>Copyright © WPFDevelopersOrg 2022</Copyright>
-		<AssemblyVersion>1.1.0.1</AssemblyVersion>
-		<FileVersion>1.1.0.1</FileVersion>
-		<Version>1.1.0.1</Version>
+		<AssemblyVersion>1.1.0.2</AssemblyVersion>
+		<FileVersion>1.1.0.2</FileVersion>
+		<Version>1.1.0.2</Version>
 		<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
 		<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
 	</PropertyGroup>
diff --git a/src/WPFDevelopers.Net40/Window.cs b/src/WPFDevelopers.Net40/Window.cs
index e4f3ae4a..9750bb20 100644
--- a/src/WPFDevelopers.Net40/Window.cs
+++ b/src/WPFDevelopers.Net40/Window.cs
@@ -4,6 +4,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
+using System.Windows.Media;
 using Microsoft.Windows.Shell;
 using WPFDevelopers.Helpers;
 
@@ -12,9 +13,16 @@ namespace WPFDevelopers.Net40
     public class Window : System.Windows.Window
     {
         private WindowStyle _windowStyle;
+
         public static readonly DependencyProperty TitleHeightProperty =
             DependencyProperty.Register("TitleHeight", typeof(double), typeof(Window), new PropertyMetadata(50d));
 
+        public static readonly DependencyProperty NoChromeProperty =
+            DependencyProperty.Register("NoChrome", typeof(bool), typeof(Window), new PropertyMetadata(false));
+
+        public static readonly DependencyProperty TitleBarProperty =
+            DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));
+
         static Window()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(typeof(Window)));
@@ -43,6 +51,18 @@ public double TitleHeight
             set => SetValue(TitleHeightProperty, value);
         }
 
+        public bool NoChrome
+        {
+            get => (bool)GetValue(NoChromeProperty);
+            set => SetValue(NoChromeProperty, value);
+        }
+
+        public object TitleBar
+        {
+            get => (object)GetValue(TitleBarProperty);
+            set => SetValue(TitleBarProperty, value);
+        }
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             hWnd = new WindowInteropHelper(this).Handle;
@@ -70,23 +90,16 @@ private void CanMinimizeWindow(object sender, CanExecuteRoutedEventArgs e)
 
         private void CloseWindow(object sender, ExecutedRoutedEventArgs e)
         {
-            //Close();
             SystemCommands.CloseWindow(this);
         }
 
         private void MaximizeWindow(object sender, ExecutedRoutedEventArgs e)
         {
             SystemCommands.MaximizeWindow(this);
-            //var window = sender as Window;
-            //window.WindowState = WindowState.Maximized;
-            //WindowState = WindowState.Maximized;
         }
 
         private void MinimizeWindow(object sender, ExecutedRoutedEventArgs e)
         {
-            //SystemCommands.MinimizeWindow(this);
-            //WindowStyle = WindowStyle.SingleBorderWindow;
-            //WindowState = WindowState.Minimized;
             SendMessage(hWnd, ApiCodes.WM_SYSCOMMAND, new IntPtr(ApiCodes.SC_MINIMIZE), IntPtr.Zero);
         }
 
diff --git a/src/WPFDevelopers.Net45x/Themes/Generic.xaml b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
index 50db423d..afd47567 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -2,12 +2,12 @@
     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">
+    xmlns:wd="clr-namespace:WPFDevelopers.Net45x">
     <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
     <Style
         x:Key="WPFDevelopersWindow"
         BasedOn="{x:Null}"
-        TargetType="{x:Type wpfdev:Window}">
+        TargetType="{x:Type wd:Window}">
         <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
@@ -23,14 +23,14 @@
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <WindowChrome
-                    CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}"
+                    CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}"
                     GlassFrameThickness="0,0,0,.1"
                     UseAeroCaptionButtons="False" />
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type wpfdev:Window}">
+                <ControlTemplate TargetType="{x:Type wd:Window}">
                     <Border
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -41,6 +41,7 @@
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
                             <Grid
+                                x:Name="PART_GridChrome"
                                 Grid.Row="0"
                                 Height="{TemplateBinding TitleHeight}"
                                 Background="{TemplateBinding BorderBrush}">
@@ -144,6 +145,13 @@
                                     </Button>
                                 </WrapPanel>
                             </Grid>
+                            <ContentPresenter
+                                x:Name="PART_TitleToolBar"
+                                Grid.Row="0"
+                                Content="{Binding TitleBar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                Focusable="False"
+                                Visibility="Collapsed"
+                                WindowChrome.IsHitTestVisibleInChrome="True" />
                             <AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
                                 <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
                             </AdornerDecorator>
@@ -165,6 +173,10 @@
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
                         </Trigger>
+                        <Trigger Property="NoChrome" Value="True">
+                            <Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index a9690754..0ed3fe2c 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: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">
+<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:wd="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>
@@ -144,6 +144,17 @@
 	<sys:Double x:Key="WD.RepeatButtonSize">5</sys:Double>
 	<BooleanToVisibilityConverter x:Key="WD.Bool2VisibilityConverter" />
 	<Thickness x:Key="WD.TabItemBorderThickness">0,0,0,2</Thickness>
+	<Style TargetType="ToolTip">
+		<Setter Property="Visibility" Value="Visible" />
+		<Style.Triggers>
+			<DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="{x:Null}">
+				<Setter Property="Visibility" Value="Collapsed" />
+			</DataTrigger>
+			<DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="">
+				<Setter Property="Visibility" Value="Collapsed" />
+			</DataTrigger>
+		</Style.Triggers>
+	</Style>
 	<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
 	<Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
 		<Setter Property="OverridesDefaultStyle" Value="True" />
@@ -349,6 +360,11 @@
 	<converts:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
 	<converts:StepIndexConverter x:Key="WD.StepIndexConverter" />
 	<converts:BreadCrumbBarConvertr x:Key="WD.BreadCrumbBarConvertr" />
+	<Style x:Key="WD.MessageListBox" TargetType="{x:Type controls:MessageListBox}">
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+	</Style>
 	<SolidColorBrush x:Key="WD.SecondaryTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PrimaryTextColor}" />
 	<SolidColorBrush x:Key="WD.PlaceholderTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PlaceholderTextColor}" />
 	<SolidColorBrush x:Key="WD.NormalSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.NormalColor}" />
@@ -636,7 +652,7 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}" />
-	<Style x:Key="WPFDevelopersWindow" BasedOn="{x:Null}" TargetType="{x:Type wpfdev:Window}">
+	<Style x:Key="WPFDevelopersWindow" BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
@@ -651,19 +667,19 @@
 		<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
 		<Setter Property="WindowChrome.WindowChrome">
 			<Setter.Value>
-				<WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wpfdev:Window}}" GlassFrameThickness="0,0,0,.1" UseAeroCaptionButtons="False" />
+				<WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" UseAeroCaptionButtons="False" />
 			</Setter.Value>
 		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type wpfdev:Window}">
+				<ControlTemplate TargetType="{x:Type wd:Window}">
 					<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 x:Name="PART_GridChrome" Grid.Row="0" Height="{TemplateBinding TitleHeight}" Background="{TemplateBinding BorderBrush}">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="Auto" />
 									<ColumnDefinition Width="*" />
@@ -694,6 +710,7 @@
 									</Button>
 								</WrapPanel>
 							</Grid>
+							<ContentPresenter x:Name="PART_TitleToolBar" Grid.Row="0" Content="{Binding TitleBar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" Focusable="False" Visibility="Collapsed" WindowChrome.IsHitTestVisibleInChrome="True" />
 							<AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
 								<ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
 							</AdornerDecorator>
@@ -709,6 +726,10 @@
 						<Trigger Property="WindowStyle" Value="ToolWindow">
 							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
 						</Trigger>
+						<Trigger Property="NoChrome" Value="True">
+							<Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
+						</Trigger>
 						<MultiTrigger>
 							<MultiTrigger.Conditions>
 								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
@@ -894,6 +915,8 @@
 	<Style x:Key="WD.DefaultRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
 		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Padding" Value="4,0" />
 		<Setter Property="VerticalAlignment" Value="Center" />
@@ -905,7 +928,7 @@
 						<BulletDecorator.Bullet>
 							<Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
 								<controls:SmallPanel MinWidth="16" MinHeight="16">
-									<Ellipse x:Name="PART_Border" Fill="{TemplateBinding Background}" Stroke="{DynamicResource WD.BaseSolidColorBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
+									<Ellipse x:Name="PART_Border" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
 									<Ellipse x:Name="PART_Ellipse" MinWidth="6" MinHeight="6" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5">
 										<Ellipse.RenderTransform>
 											<ScaleTransform ScaleX="0" ScaleY="0" />
@@ -914,7 +937,7 @@
 								</controls:SmallPanel>
 							</Border>
 						</BulletDecorator.Bullet>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CheckStates">
 								<VisualState x:Name="Unchecked" />
@@ -1519,13 +1542,16 @@
 		<Setter Property="Padding" Value="4,0" />
 		<Setter Property="VerticalAlignment" Value="Center" />
 		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type CheckBox}">
 					<BulletDecorator Margin="{TemplateBinding Margin}" Background="Transparent">
 						<BulletDecorator.Bullet>
 							<Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" CornerRadius="{Binding ElementName=PART_Border, Path=CornerRadius}">
-								<Border x:Name="PART_Border" Width="16" Height="16" Background="{DynamicResource WD.WindowForegroundColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="3">
+								<Border x:Name="PART_Border" Width="16" Height="16" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="3">
 									<controls:SmallPanel>
 										<Path x:Name="PART_CheckMark" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5" SnapsToDevicePixels="False" Stretch="Fill">
 											<Path.RenderTransform>
@@ -1541,7 +1567,7 @@
 								</Border>
 							</Border>
 						</BulletDecorator.Bullet>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CheckStates">
 								<VisualState x:Name="Checked">
@@ -1674,6 +1700,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="Padding" Value="14.5,3,30,3" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -1789,13 +1816,14 @@
 		<Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+		<Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ComboBoxItem}">
 					<controls:SmallPanel>
 						<Rectangle x:Name="PART_RectangleMouseOver" Fill="{TemplateBinding Background}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
 						<Rectangle x:Name="PART_RectangleSelected" Fill="{DynamicResource WD.BaseSolidColorBrush}" SnapsToDevicePixels="True" UseLayoutRounding="True" Visibility="Collapsed" />
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
+						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
@@ -2475,20 +2503,6 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsSelected" Value="True" />
-					<Condition Property="Selector.IsSelectionActive" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
 	</Style>
 	<Style x:Key="WD.DefaultDataGridRow" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridRow}">
 		<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -3679,7 +3693,10 @@
 							</Ellipse.RenderTransform>
 							<Ellipse.Triggers>
 								<EventTrigger RoutedEvent="Loaded">
-									<BeginStoryboard Storyboard="{StaticResource StarStoryboard}" />
+									<BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+								</EventTrigger>
+								<EventTrigger RoutedEvent="Unloaded">
+									<StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
 								</EventTrigger>
 							</Ellipse.Triggers>
 						</Ellipse>
@@ -3708,7 +3725,10 @@
 								</Ellipse.RenderTransform>
 								<Ellipse.Triggers>
 									<EventTrigger RoutedEvent="Loaded">
-										<BeginStoryboard Storyboard="{StaticResource StarStoryboard}" />
+										<BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+									</EventTrigger>
+									<EventTrigger RoutedEvent="Unloaded">
+										<StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
 									</EventTrigger>
 								</Ellipse.Triggers>
 							</Ellipse>
@@ -3788,7 +3808,7 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource DefaultGridSplitter}" TargetType="{x:Type GridSplitter}" />
-	<Style x:Key="WD.DefaultLabel" TargetType="{x:Type Label}">
+	<Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Top" />
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
@@ -5919,8 +5939,7 @@
 	<Style x:Key="WD.BreadCrumbBarItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreadCrumbBarItem}">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="FontWeight" Value="SemiBold" />
-		<Setter Property="FontSize" Value="{StaticResource WD.TitleFontSize}" />
+		<Setter Property="FontSize" Value="{StaticResource WD.MediumFontSize}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:BreadCrumbBarItem}">
@@ -5984,6 +6003,95 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.CropImage}" TargetType="{x:Type controls:CropImage}" />
+	<Style x:Key="WD.MessageListBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MessageListBoxItem}">
+		<Setter Property="FontSize" Value="{DynamicResource WD.NormalFontSize}" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="helpers:ListBoxItemExtensions.AutoRemoveOnOpacityZero" Value="True" />
+		<Setter Property="Width" Value="300" />
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="Margin" Value="4,2" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:MessageListBoxItem}">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="Storyboard_Close">
+							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
+							<DoubleAnimation BeginTime="0:0:0.2" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0" />
+						</Storyboard>
+						<Storyboard x:Key="Storyboard_Loaded">
+							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0" To="1" Duration="0:0:0.2" />
+							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="Opacity" From=".1" To="1" Duration="0:0:0.2" />
+							<DoubleAnimation BeginTime="0:0:10" Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
+							<DoubleAnimation BeginTime="0:0:10" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0.2" />
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<controls:SmallPanel x:Name="PART_SmallPanel" Margin="{TemplateBinding Margin}" RenderTransformOrigin=".5,0">
+						<controls:SmallPanel.RenderTransform>
+							<ScaleTransform />
+						</controls:SmallPanel.RenderTransform>
+						<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.NormalShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+						<Border Padding="{TemplateBinding Padding}">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="*" />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<DockPanel x:Name="PART_DockPanel" Grid.Column="0">
+									<Path x:Name="PART_Path" Width="15" Height="15" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
+									<TextBlock Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" TextWrapping="Wrap" />
+								</DockPanel>
+								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="30" Height="28" Padding="0" HorizontalAlignment="Right" Style="{StaticResource WD.PathButton}">
+									<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.SecondaryTextSolidColorBrush}" Stretch="Fill" />
+								</Button>
+							</Grid>
+						</Border>
+					</controls:SmallPanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="MessageType" Value="Warning">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.WarningGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.WarningSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.WarningSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="MessageType" Value="Error">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ErrorGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.DangerSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.DangerSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="MessageType" Value="Information">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.InformationGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="MessageType" Value="Question">
+							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.QuestionGeometry}" />
+							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.NormalSolidColorBrush}" />
+							<Setter Property="Foreground" Value="{StaticResource WD.NormalSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="IsCenter" Value="True">
+							<Setter TargetName="PART_DockPanel" Property="HorizontalAlignment" Value="Center" />
+						</Trigger>
+						<EventTrigger RoutedEvent="Button.Click" SourceName="PART_CloseButton">
+							<BeginStoryboard x:Name="BeginStoryboardClose" Storyboard="{StaticResource Storyboard_Close}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="Loaded">
+							<BeginStoryboard x:Name="BeginStoryboardLoaded" Storyboard="{StaticResource Storyboard_Loaded}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="Unloaded">
+							<StopStoryboard BeginStoryboardName="BeginStoryboardLoaded" />
+							<StopStoryboard BeginStoryboardName="BeginStoryboardClose" />
+						</EventTrigger>
+						<Trigger Property="Opacity" Value="0">
+							<Setter Property="Visibility" Value="Collapsed" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.MessageListBoxItem}" TargetType="{x:Type controls:MessageListBoxItem}" />
+	<Style BasedOn="{StaticResource WD.MessageListBox}" TargetType="{x:Type controls:MessageListBox}" />
 	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
 	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
 		<Setter Property="IsTodayHighlighted" Value="True" />
diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
index 4e3fbd65..0383e14c 100644
--- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
+++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -9,9 +9,9 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<Copyright>Copyright © WPFDevelopersOrg 2022</Copyright>
-		<AssemblyVersion>1.1.0.1</AssemblyVersion>
-		<FileVersion>1.1.0.1</FileVersion>
-		<Version>1.1.0.1</Version>
+		<AssemblyVersion>1.1.0.2</AssemblyVersion>
+		<FileVersion>1.1.0.2</FileVersion>
+		<Version>1.1.0.2</Version>
 		<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
diff --git a/src/WPFDevelopers.Net45x/Window.cs b/src/WPFDevelopers.Net45x/Window.cs
index 46d6719e..0984f288 100644
--- a/src/WPFDevelopers.Net45x/Window.cs
+++ b/src/WPFDevelopers.Net45x/Window.cs
@@ -10,9 +10,16 @@ namespace WPFDevelopers.Net45x
     public class Window : System.Windows.Window
     {
         private WindowStyle _windowStyle;
+
         public static readonly DependencyProperty TitleHeightProperty =
             DependencyProperty.Register("TitleHeight", typeof(double), typeof(Window), new PropertyMetadata(50d));
 
+        public static readonly DependencyProperty NoChromeProperty =
+            DependencyProperty.Register("NoChrome", typeof(bool), typeof(Window), new PropertyMetadata(false));
+
+        public static readonly DependencyProperty TitleBarProperty =
+            DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));
+
         static Window()
         {
             StyleProperty.OverrideMetadata(typeof(Window),
@@ -29,7 +36,6 @@ public Window()
                 CanMinimizeWindow));
             CommandBindings.Add(new CommandBinding(SystemCommands.RestoreWindowCommand, RestoreWindow,
                 CanResizeWindow));
-            //CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
         }
         public override void OnApplyTemplate()
         {
@@ -41,7 +47,16 @@ public double TitleHeight
             get => (double)GetValue(TitleHeightProperty);
             set => SetValue(TitleHeightProperty, value);
         }
-
+        public bool NoChrome
+        {
+            get => (bool)GetValue(NoChromeProperty);
+            set => SetValue(NoChromeProperty, value);
+        }
+        public object TitleBar
+        {
+            get => (object)GetValue(TitleBarProperty);
+            set => SetValue(TitleBarProperty, value);
+        }
         private static T GetResourceKey<T>(string key)
         {
             if (Application.Current.TryFindResource(key) is T resource) return resource;
@@ -76,7 +91,6 @@ private void CanMinimizeWindow(object sender, CanExecuteRoutedEventArgs e)
 
         private void CloseWindow(object sender, ExecutedRoutedEventArgs e)
         {
-            //Close();
             SystemCommands.CloseWindow(this);
         }
 
@@ -87,7 +101,6 @@ private void MaximizeWindow(object sender, ExecutedRoutedEventArgs e)
 
         private void MinimizeWindow(object sender, ExecutedRoutedEventArgs e)
         {
-            //SystemCommands.MinimizeWindow(this);
             SendMessage(hWnd, ApiCodes.WM_SYSCOMMAND, new IntPtr(ApiCodes.SC_MINIMIZE), IntPtr.Zero);
         }
 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
index fb2a76a8..91207c02 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
@@ -54,6 +54,10 @@
                     Height="100"
                     wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
                     Fill="Aqua" />
+                <Label
+                    Background="Red"
+                    Content="40"
+                    FontSize="40" />
             </StackPanel>
         </Grid>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 1fbbe128..0909acd4 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -111,7 +111,21 @@
                         </Menu>
                         <Menu IsEnabled="False" />
                     </WrapPanel>
-
+                    <TextBlock
+                        Margin="0,20,0,0"
+                        FontSize="20"
+                        Text="Window" />
+                    <WrapPanel Margin="0,10">
+                        <Button
+                            Click="Button_Click"
+                            Content="ToolWindow"
+                            Style="{DynamicResource WD.PrimaryButton}" />
+                        <Button
+                            Margin="10,0"
+                            Click="ButtonNone_Click"
+                            Content="NoneWindow"
+                            Style="{DynamicResource WD.DangerPrimaryButton}" />
+                    </WrapPanel>
                     <TextBlock
                         Margin="0,20,0,0"
                         FontSize="20"
@@ -129,7 +143,7 @@
                             Style="{DynamicResource WD.SuccessPrimaryButton}" />
                         <Button
                             Name="btnLoading"
-                            wd:Loading.Child="{x:Static wd:NormalLoading.Default}"
+                            wd:Loading.LoadingType="Normal"
                             Click="BtnLoading_Click"
                             Content="AddLoading"
                             Style="{DynamicResource WD.WarningPrimaryButton}" />
@@ -140,8 +154,9 @@
                             Content="Off Task"
                             Style="{DynamicResource WD.DangerPrimaryButton}" />
                         <Button
-                            wd:Loading.Child="{x:Static wd:NormalLoading.Default}"
+                            wd:Badge.IsShow="True"
                             wd:Loading.IsShow="True"
+                            wd:Loading.LoadingType="Normal"
                             Content="NormalLoading"
                             Style="{DynamicResource WD.PrimaryButton}" />
                     </WrapPanel>
@@ -309,7 +324,8 @@
                         <ComboBox
                             Width="200"
                             wd:ElementHelper.Watermark="ComboBox"
-                            Background="LightYellow">
+                            Background="LightYellow"
+                            Foreground="Black">
                             <ComboBoxItem>Option 1</ComboBoxItem>
                             <ComboBoxItem>Option 2</ComboBoxItem>
                             <ComboBoxItem>Option 3</ComboBoxItem>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
index 94624ba0..5d79a88d 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, App.CurrentMainWindow);
+            MessageBox.Show("执行此操作可能导致文件无法打开！", "警告", MessageBoxImage.Warning);
         }
 
         private void btnError_Click(object sender, RoutedEventArgs e)
@@ -182,7 +182,7 @@ private void LoadingTask_Click(object sender, RoutedEventArgs e)
         }
         private void BtnLoading_Click(object sender, RoutedEventArgs e)
         {
-            var task = new Task(() => { Thread.Sleep(5000); });
+            var task = new Task(() => { Thread.Sleep(50000); });
             task.ContinueWith(previousTask => { Loading.SetIsShow(btnLoading, false); }, TaskScheduler.FromCurrentSynchronizationContext());
             Loading.SetIsShow(btnLoading, true);
             task.Start();
@@ -226,8 +226,17 @@ private static void AllSelectedChangedCallback(DependencyObject d, DependencyPro
 
 
 
+
         #endregion
 
-       
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            new NoChromeWindow().Show();
+        }
+
+        private void ButtonNone_Click(object sender, RoutedEventArgs e)
+        {
+            new NoneNoChromeWindow().Show();
+        }
     }
 }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
index 2fa9024b..a358774c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
@@ -19,7 +19,7 @@
                 </Grid.ColumnDefinitions>
                 <wpfdev:BreathLamp Width="60" Height="60" LampEffect="OuterGlow" IsLampStart="true"
                                    VerticalAlignment="Top" HorizontalAlignment="Left"
-                                   Background="{DynamicResource DefaultBackgroundPressedSolidColorBrush}" 
+                                   Background="{DynamicResource WD.BlackSolidColorBrush}" 
                                    EffectColor="{DynamicResource WD.DefaultBackgroundPressedColor}">
                     <Ellipse>
                         <Ellipse.Fill>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
index 48e1dc31..2d7e68d5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
@@ -1,46 +1,62 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.LoadingExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.LoadingExample"
+    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 Margin="10">
             <StackPanel Grid.Column="1">
-                <CheckBox Name="MyCheckBox" Content="启动 Loading 动画"
-                          VerticalAlignment="Center"
-                          HorizontalAlignment="Center"/>
-                <UniformGrid Margin="10" Rows="2" Columns="3">
-                    <Border Background="Red" 
-                wd:Loading.IsShow="{Binding ElementName=MyCheckBox,Path=IsChecked}">
-                        <TextBlock Text="Mask 0"
-                       VerticalAlignment="Center" 
-                       HorizontalAlignment="Center"/>
+                <CheckBox
+                    Name="MyCheckBox"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Content="启动 Loading 动画" />
+                <UniformGrid
+                    Margin="10"
+                    Columns="3"
+                    Rows="2">
+                    <Border wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}" Background="Red">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="Mask 0" />
                     </Border>
-                    <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg"
-                           wd:Loading.Child="{x:Static wd:NormalLoading.Default}"
-                           wd:Loading.IsShow="{Binding ElementName=MyCheckBox,Path=IsChecked}"/>
-                    <Button Content="Mask 1" wd:Loading.IsShow="{Binding ElementName=MyCheckBox,Path=IsChecked}" Height="28"
-                    VerticalAlignment="Top" HorizontalAlignment="Center"/>
-                    <Button Content="Mask 2" wd:Loading.IsShow="{Binding ElementName=MyCheckBox,Path=IsChecked}"
-                    VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,10"/>
-                    <Button Content="提交" wd:Loading.IsShow="{Binding ElementName=MyCheckBox,Path=IsChecked}" 
-                    VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,10"
-                    Style="{StaticResource WD.PrimaryButton}"/>
+                    <Image
+                        wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}"
+                        wd:Loading.LoadingType="Normal"
+                        Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg" />
+                    <Button
+                        Height="28"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}"
+                        Content="Mask 1" />
+                    <Button
+                        Margin="0,10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}"
+                        Content="Mask 2" />
+                    <Button
+                        Margin="0,10"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}"
+                        Content="提交"
+                        Style="{StaticResource WD.PrimaryButton}" />
                 </UniformGrid>
             </StackPanel>
         </Grid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/LoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/LoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/LoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/LoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
index 11981440..5854c0eb 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
@@ -1,22 +1,25 @@
-<wpfdev:Window x:Class="WPFDevelopers.Samples.MainWindow"
-               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-               xmlns:local="clr-namespace:WPFDevelopers.Samples"
-               xmlns:example="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-               xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-               xmlns:vm="clr-namespace:WPFDevelopers.Samples.ViewModels"
-               xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-               xmlns:System="clr-namespace:System;assembly=mscorlib"
-               xmlns:helpers="clr-namespace:WPFDevelopers.Samples.Helpers" 
-               mc:Ignorable="d"
-               Title="WPFDevelopers" Icon="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico"
-               Height="{x:Static local:App.Height}" Width="{x:Static local:App.Wdith}"
-               WindowStartupLocation="CenterScreen">
-    <wpfdev:Window.Effect>
-        <wpfdev:GrayscaleEffect x:Name="grayscaleEffect" Factor="1"/>
-    </wpfdev:Window.Effect>
+<wd:Window
+    x:Class="WPFDevelopers.Samples.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:System="clr-namespace:System;assembly=mscorlib"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:example="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Samples.Helpers"
+    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:WPFDevelopers.Samples.ViewModels"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    Title="WPFDevelopers"
+    Width="{x:Static local:App.Wdith}"
+    Height="{x:Static local:App.Height}"
+    Icon="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <wd:Window.Effect>
+        <wd:GrayscaleEffect x:Name="grayscaleEffect" Factor="1" />
+    </wd:Window.Effect>
     <!--<shell:WindowChrome.WindowChrome>
         <shell:WindowChrome  GlassFrameThickness="0 1 0 0"/>
     </shell:WindowChrome.WindowChrome>
@@ -24,11 +27,11 @@
         <wpfdev:WindowAcrylicBlur BlurColor="AliceBlue" Opacity="0.2"/>
     </wpfdev:WindowAcrylicBlur.WindowAcrylicBlur>-->
     <Window.DataContext>
-        <vm:MainVM/>
+        <vm:MainVM />
     </Window.DataContext>
     <Window.Resources>
-        <!--<ObjectDataProvider x:Key="EnumDataMenu" 
-                            MethodName="GetValues" 
+        <!--<ObjectDataProvider x:Key="EnumDataMenu"
+                            MethodName="GetValues"
                             ObjectType="{x:Type System:Enum}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="helpers:MenuEnum"/>
@@ -37,30 +40,39 @@
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Loaded">
-            <i:InvokeCommandAction Command="{Binding ViewLoaded}"></i:InvokeCommandAction>
+            <i:InvokeCommandAction Command="{Binding ViewLoaded}" />
         </i:EventTrigger>
     </i:Interaction.Triggers>
 
     <!--<Grid Background="{StaticResource WD.ExtralightSolidColorBrush}">-->
 
     <Grid>
-        <wpfdev:NotifyIcon Title="WPF开发者" Name="WpfNotifyIcon">
-            <wpfdev:NotifyIcon.ContextMenu>
+        <wd:NotifyIcon Name="WpfNotifyIcon" Title="WPF开发者">
+            <wd:NotifyIcon.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="开启灰度" Name="menuItemGrayscale" Click="Grayscale_Click"/>
-                    <MenuItem Header="托盘消息" Click="SendMessage_Click"/>
-                    <MenuItem Header="闪烁" Name="menuItemTwink"  Click="Twink_Click"/>
-                    <MenuItem Header="关于" Click="About_Click">
+                    <MenuItem
+                        Name="menuItemGrayscale"
+                        Click="Grayscale_Click"
+                        Header="开启灰度" />
+                    <MenuItem Click="SendMessage_Click" Header="托盘消息" />
+                    <MenuItem
+                        Name="menuItemTwink"
+                        Click="Twink_Click"
+                        Header="闪烁" />
+                    <MenuItem Click="About_Click" Header="关于">
                         <MenuItem.Icon>
-                            <Path Data="{StaticResource WD.WarningGeometry}" 
-                                      Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
-                                      Stretch="Uniform" Height="20" Width="20"/>
+                            <Path
+                                Width="20"
+                                Height="20"
+                                Data="{StaticResource WD.WarningGeometry}"
+                                Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
+                                Stretch="Uniform" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="退出" Click="Quit_Click"/>
+                    <MenuItem Click="Quit_Click" Header="退出" />
                 </ContextMenu>
-            </wpfdev:NotifyIcon.ContextMenu>
-        </wpfdev:NotifyIcon>
+            </wd:NotifyIcon.ContextMenu>
+        </wd:NotifyIcon>
         <!--<Rectangle Margin="5,0,0,0">
             <Rectangle.Fill>
                 <VisualBrush Viewport="0,0,95,35" ViewportUnits="Absolute" TileMode="Tile">
@@ -76,7 +88,7 @@
                 </VisualBrush>
             </Rectangle.Fill>
         </Rectangle>-->
-        
+
         <!--<Grid.RowDefinitions>
             <RowDefinition Height="30"/>
             <RowDefinition/>
@@ -88,35 +100,37 @@
 
         <Grid Margin="10">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" MinWidth="150"/>
+                <ColumnDefinition Width="Auto" MinWidth="150" />
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition/>
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Border Margin="0,0,5,0" Background="{DynamicResource WD.BackgroundSolidColorBrush}" 
-                    CornerRadius="4,0,0,4" 
-                    Effect="{StaticResource WD.NormalShadowDepth}">
-                <wpfdev:NavigateMenu ItemsSource="{Binding NavigateMenuModelList}" x:Name="NavigateMenu">
+            <Border
+                Margin="0,0,5,0"
+                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="4,0,0,4"
+                Effect="{StaticResource WD.NormalShadowDepth}">
+                <wd:NavigateMenu x:Name="NavigateMenu" ItemsSource="{Binding NavigateMenuModelList}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="SelectionChanged">
-                            <i:InvokeCommandAction Command="{Binding MenuSelectionChangedCommand}"
-                                           CommandParameter="{Binding ElementName=NavigateMenu,Path=SelectedItem}"/>
+                            <i:InvokeCommandAction Command="{Binding MenuSelectionChangedCommand}" CommandParameter="{Binding ElementName=NavigateMenu, Path=SelectedItem}" />
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
-                </wpfdev:NavigateMenu>
+                </wd:NavigateMenu>
             </Border>
-            <GridSplitter Grid.Column="1"
-              HorizontalAlignment="Stretch"
-              VerticalAlignment="Stretch"
-              ShowsPreview="True"
-              Width="5"
-              />
-            <Border Grid.Column="2" 
-                    Margin="5,0,0,0"
-                    Background="{DynamicResource WD.BackgroundSolidColorBrush}" 
-                    CornerRadius="4"
-                    Effect="{StaticResource WD.NormalShadowDepth}">
-                <ContentControl Content="{Binding ControlPanel}"/>
+            <GridSplitter
+                Grid.Column="1"
+                Width="5"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ShowsPreview="True" />
+            <Border
+                Grid.Column="2"
+                Margin="5,0,0,0"
+                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="4"
+                Effect="{StaticResource WD.NormalShadowDepth}">
+                <ContentControl Content="{Binding ControlPanel}" />
             </Border>
         </Grid>
     </Grid>
-</wpfdev:Window>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml
new file mode 100644
index 00000000..a423b870
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml
@@ -0,0 +1,50 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.MessageExample"
+    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>
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Bottom"
+            Orientation="Horizontal">
+            <Button
+                Click="AddButton_Click"
+                Content="Info Message"
+                Style="{StaticResource WD.SuccessPrimaryButton}"
+                Tag="Info" />
+            <Button
+                Click="AddButton_Click"
+                Content="Error Message"
+                Style="{StaticResource WD.DangerPrimaryButton}"
+                Tag="Error" />
+            <Button
+                Click="AddButton_Click"
+                Content="Warning Message"
+                Style="{StaticResource WD.WarningPrimaryButton}"
+                Tag="Warning" />
+            <Button
+                Click="AddButton_Click"
+                Content="Question Message"
+                Style="{StaticResource WD.PrimaryButton}"
+                Tag="Question" />
+            <Button
+                Click="AddButton_Click"
+                Content="Long Message"
+                Style="{StaticResource WD.SuccessPrimaryButton}"
+                Tag="Long" />
+        </StackPanel>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MessageExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MessageExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs
new file mode 100644
index 00000000..3036cbe9
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MessageExample.xaml.cs
@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+using WPFDevelopers.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// MessageExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class MessageExample : UserControl
+    {
+        public MessageExample()
+        {
+            InitializeComponent();
+        }
+        private void AddButton_Click(object sender, RoutedEventArgs e)
+        {
+            var btn = sender as Button;
+            switch (btn.Tag)
+            {
+                case "Info":
+                    Message.Push(App.Current.MainWindow, "This is a info message", MessageBoxImage.Information);
+                    break;
+                case "Error":
+                    Message.Push("This is a error message", MessageBoxImage.Error, true);
+                    break;
+                case "Warning":
+                    Message.Push("This is a warning message", MessageBoxImage.Warning, true);
+                    break;
+                case "Question":
+                    Message.Push("This is a question message", MessageBoxImage.Question);
+                    break;
+                default:
+                    Message.Push("这是一条很长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长长消息", MessageBoxImage.Information);
+                    break;
+            }
+
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml
new file mode 100644
index 00000000..22a4531b
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml
@@ -0,0 +1,64 @@
+<wd:Window
+    x:Class="WPFDevelopers.Samples.ExampleViews.NoChromeWindow"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    Title="NoChromeWindow"
+    Width="400"
+    Height="300"
+    BorderBrush="Transparent"
+    BorderThickness="0"
+    NoChrome="True"
+    ResizeMode="NoResize"
+    TitleHeight="30"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="ToolWindow"
+    mc:Ignorable="d">
+    <wd:Window.TitleBar>
+        <Grid Height="40" VerticalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" MinWidth="30" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Margin="10,0"
+                VerticalAlignment="Center"
+                FontSize="14"
+                Foreground="{StaticResource WD.SecondaryTextSolidColorBrush}"
+                IsHitTestVisible="False"
+                Text="ToolWindow" />
+            <Button
+                x:Name="CloseButton"
+                Grid.Column="2"
+                Width="30"
+                Height="30"
+                HorizontalAlignment="Right"
+                Click="CloseButton_Click"
+                Style="{StaticResource WD.WindowButtonStyle}"
+                ToolTip="关闭">
+                <Path
+                    Width="10"
+                    Height="10"
+                    Data="{StaticResource WD.WindowCloseGeometry}"
+                    Fill="DarkGray"
+                    Stretch="UniformToFill" />
+            </Button>
+        </Grid>
+    </wd:Window.TitleBar>
+    <controls:CodeViewer>
+        <Grid>
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="Content" />
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoChromeWindow.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoChromeWindow.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml.cs
new file mode 100644
index 00000000..7f2c948f
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoChromeWindow.xaml.cs
@@ -0,0 +1,19 @@
+using System.Windows;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    ///     Window1.xaml 的交互逻辑
+    /// </summary>
+    public partial class NoChromeWindow 
+    {
+        public NoChromeWindow()
+        {
+            InitializeComponent();
+        }
+        private void CloseButton_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml
new file mode 100644
index 00000000..ebece741
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml
@@ -0,0 +1,65 @@
+<wd:Window
+    x:Class="WPFDevelopers.Samples.ExampleViews.NoneNoChromeWindow"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    Title="NoChromeWindow"
+    Width="400"
+    Height="300"
+    BorderBrush="{StaticResource WD.DangerSolidColorBrush}"
+    BorderThickness="1"
+    NoChrome="True"
+    TitleHeight="30"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <wd:Window.TitleBar>
+        <Grid Height="40" VerticalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" MinWidth="30" />
+            </Grid.ColumnDefinitions>
+            <Rectangle
+                Grid.ColumnSpan="3"
+                Fill="{StaticResource WD.DangerSolidColorBrush}"
+                IsHitTestVisible="False" />
+            <TextBlock
+                Margin="10,0"
+                VerticalAlignment="Center"
+                Foreground="{StaticResource WD.WindowForegroundColorBrush}"
+                IsHitTestVisible="False"
+                Text="Danger" />
+            <Button
+                x:Name="CloseButton"
+                Grid.Column="2"
+                Width="30"
+                Height="30"
+                HorizontalAlignment="Right"
+                Click="CloseButton_Click"
+                Style="{StaticResource WD.WindowButtonStyle}"
+                ToolTip="关闭">
+                <Path
+                    Width="10"
+                    Height="10"
+                    Data="{StaticResource WD.WindowCloseGeometry}"
+                    Fill="{StaticResource WD.WindowForegroundColorBrush}"
+                    Stretch="UniformToFill" />
+            </Button>
+        </Grid>
+    </wd:Window.TitleBar>
+    <controls:CodeViewer>
+        <Grid>
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="Content" />
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoneNoChromeWindow.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NoneNoChromeWindow.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml.cs
new file mode 100644
index 00000000..91b3b2c9
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NoneNoChromeWindow.xaml.cs
@@ -0,0 +1,19 @@
+using System.Windows;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    ///     Window1.xaml 的交互逻辑
+    /// </summary>
+    public partial class NoneNoChromeWindow
+    {
+        public NoneNoChromeWindow()
+        {
+            InitializeComponent();
+        }
+        private void CloseButton_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 9a16f231..23b01c4a 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -73,6 +73,7 @@ public enum MenuEnum
         BreadCrumbBar,
         CropImage,
         Badge,
+        Message,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index d7a5de37..139ec250 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -297,6 +297,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.Badge:
                     ControlPanel = new BadgeExample();
                     break;
+                case MenuEnum.Message:
+                    ControlPanel = new MessageExample();
+                    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 5454da79..833e0ddc 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -254,6 +254,9 @@
       <SubType>Code</SubType>
       <DependentUpon>MaskExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\MessageExample.xaml.cs">
+      <DependentUpon>MessageExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\MultiSelectComboBoxExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>MultiSelectComboBoxExample.xaml</DependentUpon>
@@ -262,6 +265,12 @@
       <SubType>Code</SubType>
       <DependentUpon>MultiSelectSearchComboBoxExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NoChromeWindow.xaml.cs">
+      <DependentUpon>NoChromeWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NoneNoChromeWindow.xaml.cs">
+      <DependentUpon>NoneNoChromeWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NumberCard\NumberCardControl.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>NumberCardControl.xaml</DependentUpon>
@@ -404,7 +413,7 @@
       <SubType>Code</SubType>
       <DependentUpon>ZooSemyExample.xaml</DependentUpon>
     </Compile>
-	 <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BadgeExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BadgeExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>BadgeExample.xaml</DependentUpon>
     </Compile>
@@ -698,6 +707,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\MessageExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\MultiSelectComboBoxExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -706,6 +719,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NoChromeWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NoneNoChromeWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NumberCard\NumberCardControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -846,7 +867,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-	<Page Include="$(MSBuildThisFileDirectory)ExampleViews\BadgeExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\BadgeExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
index 836a0779..2266dda3 100644
--- a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
+++ b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
@@ -32,7 +32,7 @@
 		</BootstrapperPackage>
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="WPFDevelopers" Version="1.1.0.1-preview8" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
diff --git a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
index 4ce48358..3b619bae 100644
--- a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
+++ b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
@@ -13,8 +13,9 @@
 		<ApplicationIcon>..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico</ApplicationIcon>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="WPFDevelopers" Version="1.1.0.1-preview9" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview" />
 	</ItemGroup>
+	
 	<ItemGroup>
 		<Reference Include="ICSharpCode.AvalonEdit, Version=6.1.3.50, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
 			<SpecificVersion>False</SpecificVersion>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index d0946e3d..e4b1b926 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -132,6 +132,9 @@
 		<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" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\MessageExample.xaml.cs" Link="ExampleViews\MessageExample.xaml.cs" DependentUpon="MessageExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoChromeWindow.xaml.cs" Link="ExampleViews\NoChromeWindow.xaml.cs" DependentUpon="NoChromeWindow.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoneNoChromeWindow.xaml.cs" Link="ExampleViews\NoneNoChromeWindow.xaml.cs" DependentUpon="NoneNoChromeWindow.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -443,5 +446,14 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BadgeExample.xaml">
 			<Link>ExampleViews\BadgeExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\MessageExample.xaml">
+			<Link>ExampleViews\MessageExample.xaml</Link>
+		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoChromeWindow.xaml">
+			<Link>ExampleViews\NoChromeWindow.xaml</Link>
+		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoneNoChromeWindow.xaml">
+			<Link>ExampleViews\NoneNoChromeWindow.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
index 023054f4..01bc009c 100644
--- a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
+++ b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
@@ -72,9 +72,9 @@ public static void SetFontSize(UIElement element, string Text)
 
         private static void OnIsBadgeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (e.NewValue is bool isBadge && d is FrameworkElement parent)
+            if (e.NewValue is bool isShow && d is FrameworkElement parent)
             {
-                if (isBadge)
+                if (isShow)
                 {
                     parent.IsVisibleChanged += Parent_IsVisibleChanged;
                     if (!parent.IsLoaded)
@@ -96,7 +96,7 @@ private static void Parent_IsVisibleChanged(object sender, DependencyPropertyCha
             if (e.NewValue is bool isVisible && sender is FrameworkElement parent)
             {
                 var isShow = GetIsShow(parent);
-                if (isVisible && isShow)
+                if (isVisible && isShow && !parent.IsLoaded)
                     CreateBadge(parent);
             }
         }
diff --git a/src/WPFDevelopers.Shared/Controls/Loading/Loading.cs b/src/WPFDevelopers.Shared/Controls/Loading/Loading.cs
index 55badbf7..2ce95496 100644
--- a/src/WPFDevelopers.Shared/Controls/Loading/Loading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loading/Loading.cs
@@ -1,8 +1,5 @@
-using System.Runtime.CompilerServices;
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows;
 using System.Windows.Documents;
-using System.Windows.Markup;
 using System.Windows.Media;
 using WPFDevelopers.Helpers;
 using WPFDevelopers.Utilities;
@@ -11,111 +8,129 @@ namespace WPFDevelopers.Controls
 {
     public class Loading : BaseControl
     {
-        public static readonly DependencyProperty IsShowProperty =
-           DependencyProperty.RegisterAttached("IsShow", typeof(bool), typeof(Loading),
-               new PropertyMetadata(false, OnIsLoadingChanged));
         private const short SIZE = 25;
         private const double MINSIZE = 40;
-        private static FrameworkElement oldFrameworkElement;
-        private static void OnIsLoadingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+
+        public static readonly DependencyProperty IsShowProperty =
+            DependencyProperty.RegisterAttached("IsShow", typeof(bool), typeof(Loading),
+                new PropertyMetadata(false, OnIsShowChanged));
+
+        public static readonly DependencyProperty LoadingTypeProperty =
+            DependencyProperty.RegisterAttached("LoadingType", typeof(LoadingType), typeof(Loading),
+                new PropertyMetadata(LoadingType.Default));
+
+
+        public static LoadingType GetLoadingType(DependencyObject obj)
+        {
+            return (LoadingType) obj.GetValue(LoadingTypeProperty);
+        }
+
+        public static void SetLoadingType(DependencyObject obj, LoadingType value)
+        {
+            obj.SetValue(LoadingTypeProperty, value);
+        }
+
+        private static void OnIsShowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (e.NewValue is bool isMask && d is FrameworkElement parent)
+            if (e.NewValue is bool isShow && d is FrameworkElement parent)
             {
-                if (isMask)
+                if (isShow)
                 {
+                    parent.IsVisibleChanged += Parent_IsVisibleChanged;
                     if (!parent.IsLoaded)
                         parent.Loaded += Parent_Loaded;
                     else
-                        CreateMask(parent);
+                        CreateLoading(parent);
                 }
                 else
                 {
                     parent.Loaded -= Parent_Loaded;
-                    CreateMask(parent, true);
+                    parent.IsVisibleChanged -= Parent_IsVisibleChanged;
+                    CreateLoading(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 && !parent.IsLoaded)
+                    CreateLoading(parent);
+            }
+        }
+
         private static void Parent_Loaded(object sender, RoutedEventArgs e)
         {
             if (sender is UIElement element)
-                CreateMask(element);
+                CreateLoading(element);
         }
-        static void CreateMask(UIElement uIElement, bool isRemove = false)
+
+        private static void CreateLoading(UIElement uIElement, bool isRemove = false)
         {
+            UIElement value = null;
             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)
+            var adorners = layer.GetAdorners(uIElement);
+            if (isRemove || adorners != null)
+                foreach (var item in adorners)
+                    if (item is AdornerContainer container)
                     {
-                        if (item is AdornerContainer container)
-                        {
-                            var isAddChild = (bool)Loading.GetIsAddChild(uIElement);
-                            if (!isAddChild)
-                                Loading.SetChild(uIElement, null);
-                            container.Child = null;
-                            layer.Remove(container);
-                        }
+                        if (isRemove)
+                            SetChild(uIElement, null);
+                        container.Child = null;
+                        layer.Remove(container);
                     }
-                }
-                return;
-            }
+
             var adornerContainer = new AdornerContainer(uIElement);
-            var value = Loading.GetChild(uIElement);
-            if (value == null)
+            var type = GetLoadingType(uIElement);
+            var isLoading = GetIsShow(uIElement);
+            if (!isLoading) return;
+            var w = (double) uIElement.GetValue(ActualWidthProperty);
+            var h = (double) uIElement.GetValue(ActualHeightProperty);
+            switch (type)
             {
-                var isLoading = GetIsShow(uIElement);
-                if (isLoading)
-                {
-                    var w = (double)uIElement.GetValue(ActualWidthProperty);
-                    var h = (double)uIElement.GetValue(ActualHeightProperty);
-                    var defaultLoading = new DefaultLoading();
-                    if (w < MINSIZE || h < MINSIZE)
+                case LoadingType.Default:
+                    if (isLoading)
                     {
-                        defaultLoading.Width = SIZE;
-                        defaultLoading.Height = SIZE;
-                        defaultLoading.StrokeArray = new DoubleCollection { 10, 100 };
+                        var defaultLoading = new DefaultLoading();
+                        if (w < MINSIZE || h < MINSIZE)
+                        {
+                            defaultLoading.Width = SIZE;
+                            defaultLoading.Height = SIZE;
+                            defaultLoading.StrokeArray = new DoubleCollection {10, 100};
+                        }
+
+                        value = defaultLoading;
                     }
-                    SetChild(uIElement, defaultLoading);
-                    value = Loading.GetChild(uIElement);
-                }
-                if (value != null)
-                    adornerContainer.Child = new MaskControl(uIElement) { Content = value, Background = ControlsHelper.Brush };
-            }
-            else
-            {
-                var normalLoading = (FrameworkElement)value;
-                var frameworkElement = (FrameworkElement)uIElement;
-                Loading.SetIsAddChild(uIElement, true);
 
-                if (oldFrameworkElement != null)
-                    value = oldFrameworkElement;
-                else
-                {
-                    string xaml = XamlWriter.Save(normalLoading);
-                    oldFrameworkElement = (FrameworkElement) XamlReader.Parse(xaml);
-                }
+                    break;
+                case LoadingType.Normal:
+                    var frameworkElement = (FrameworkElement) uIElement;
+                    var normalLoading = new NormalLoading();
+                    var _size = frameworkElement.ActualHeight < frameworkElement.ActualWidth
+                        ? frameworkElement.ActualHeight
+                        : frameworkElement.ActualWidth;
+                    if (_size < MINSIZE)
+                    {
+                        normalLoading.Width = SIZE;
+                        normalLoading.Height = SIZE;
+                    }
 
-                var _size = frameworkElement.ActualHeight < frameworkElement.ActualWidth ? frameworkElement.ActualHeight : frameworkElement.ActualWidth;
-                if(_size < MINSIZE)
-                {
-                    normalLoading.Width = SIZE;
-                    normalLoading.Height = SIZE;
                     value = normalLoading;
-                }
-                
-                adornerContainer.Child = new MaskControl(uIElement) { Content = value, Background = ControlsHelper.Brush };
-
+                    break;
             }
-            layer.Add(adornerContainer);
 
+            if (value != null)
+                adornerContainer.Child = new MaskControl(uIElement)
+                    {Content = value, Background = ControlsHelper.Brush};
+            layer.Add(adornerContainer);
         }
+
         public static bool GetIsShow(DependencyObject obj)
         {
-            return (bool)obj.GetValue(IsShowProperty);
+            return (bool) obj.GetValue(IsShowProperty);
         }
 
         public static void SetIsShow(DependencyObject obj, bool value)
@@ -123,4 +138,20 @@ public static void SetIsShow(DependencyObject obj, bool value)
             obj.SetValue(IsShowProperty, value);
         }
     }
+
+    /// <summary>
+    ///     Loading类型
+    /// </summary>
+    public enum LoadingType
+    {
+        /// <summary>
+        ///     默认
+        /// </summary>
+        Default,
+
+        /// <summary>
+        ///     普通
+        /// </summary>
+        Normal
+    }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Loading/NormalLoading.cs b/src/WPFDevelopers.Shared/Controls/Loading/NormalLoading.cs
index bdd0f747..690101ae 100644
--- a/src/WPFDevelopers.Shared/Controls/Loading/NormalLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loading/NormalLoading.cs
@@ -20,7 +20,6 @@ public class NormalLoading : Control
             DependencyProperty.Register("StrokeArray", typeof(DoubleCollection), typeof(NormalLoading)
                 , new PropertyMetadata(new DoubleCollection {10, 100}));
 
-        public static NormalLoading Default = new NormalLoading();
         private Ellipse _ellipse;
 
         private Storyboard _storyboard;
diff --git a/src/WPFDevelopers.Shared/Controls/Mask/Mask.cs b/src/WPFDevelopers.Shared/Controls/Mask/Mask.cs
index 04922015..ee820295 100644
--- a/src/WPFDevelopers.Shared/Controls/Mask/Mask.cs
+++ b/src/WPFDevelopers.Shared/Controls/Mask/Mask.cs
@@ -13,10 +13,11 @@ public class Mask : BaseControl
 
         private static void OnIsShowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if (e.NewValue is bool IsShow && d is FrameworkElement parent)
+            if (e.NewValue is bool isShow && d is FrameworkElement parent)
             {
-                if (IsShow)
+                if (isShow)
                 {
+                    parent.IsVisibleChanged += Parent_IsVisibleChanged;
                     if (!parent.IsLoaded)
                         parent.Loaded += Parent_Loaded;
                     else
@@ -25,11 +26,22 @@ private static void OnIsShowChanged(DependencyObject d, DependencyPropertyChange
                 else
                 {
                     parent.Loaded -= Parent_Loaded;
+                    parent.IsVisibleChanged -= Parent_IsVisibleChanged;
                     CreateMask(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 && !parent.IsLoaded)
+                    CreateMask(parent);
+            }
+        }
+
         private static void Parent_Loaded(object sender, RoutedEventArgs e)
         {
             if (sender is UIElement element)
diff --git a/src/WPFDevelopers.Shared/Controls/Mask/MaskControl.cs b/src/WPFDevelopers.Shared/Controls/Mask/MaskControl.cs
index c417542c..19e4b339 100644
--- a/src/WPFDevelopers.Shared/Controls/Mask/MaskControl.cs
+++ b/src/WPFDevelopers.Shared/Controls/Mask/MaskControl.cs
@@ -12,6 +12,12 @@ public class MaskControl : ContentControl
 
         private readonly Visual visual;
 
+        static MaskControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(MaskControl),
+                new FrameworkPropertyMetadata(typeof(MaskControl)));
+        }
+
         public MaskControl(Visual _visual)
         {
             visual = _visual;
diff --git a/src/WPFDevelopers.Shared/Controls/Message/Message.cs b/src/WPFDevelopers.Shared/Controls/Message/Message.cs
new file mode 100644
index 00000000..2cb96ef1
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Message/Message.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Linq;
+using System.Windows;
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    public static class Message
+    {
+        private static MessageAdorner messageAdorner;
+
+        static void CreateMessageAdorner(Window owner = null, string message = null, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        {
+            try
+            {
+                if (messageAdorner != null)
+                {
+                    messageAdorner.Push(message, type, center);
+                    return;
+                }
+                if (owner == null)
+                    owner = ControlsHelper.GetDefaultWindow();
+                var layer = ControlsHelper.GetAdornerLayer(owner);
+                if (layer == null)
+                    throw new Exception("not AdornerLayer is null");
+                messageAdorner = new MessageAdorner(layer);
+                layer.Add(messageAdorner);
+                messageAdorner.Push(message, type, center);
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
+        public static void Push(this Window owner, string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        {
+            CreateMessageAdorner(owner, message, type, center);
+        }
+        public static void Push(string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        {
+            CreateMessageAdorner(message: message, type: type, center: center);
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs b/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs
new file mode 100644
index 00000000..edcabb01
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Message/MessageAdorner.cs
@@ -0,0 +1,73 @@
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace WPFDevelopers.Controls
+{
+    public class MessageAdorner : Adorner
+    {
+        private MessageListBox listBox;
+        private UIElement _child;
+        private FrameworkElement adornedElement;
+        public MessageAdorner(UIElement adornedElement) : base(adornedElement)
+        {
+            this.adornedElement = adornedElement as FrameworkElement;
+        }
+
+        public void Push(string message, MessageBoxImage type = MessageBoxImage.Information, bool center = false)
+        {
+            if (listBox == null)
+            {
+                listBox = new MessageListBox();
+                Child = listBox;
+            }
+            var mItem = new MessageListBoxItem { Content = message, MessageType = type, IsCenter = center };
+            listBox.Items.Insert(0, mItem);
+        }
+
+
+
+        private void ListBox_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (e.NewSize.Height != 0.0)
+                return;
+            listBox.Items.RemoveAt(listBox.Items.Count - 1);
+        }
+
+        public UIElement Child
+        {
+            get => _child;
+            set
+            {
+                if (value == null)
+                {
+                    RemoveVisualChild(_child);
+                    _child = value;
+                    return;
+                }
+                AddVisualChild(value);
+                _child = value;
+            }
+        }
+        protected override int VisualChildrenCount
+        {
+            get
+            {
+                return _child != null ? 1 : 0;
+            }
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var x = (adornedElement.ActualWidth - _child.DesiredSize.Width) / 2;
+            _child.Arrange(new Rect(new Point(x, 0), _child.DesiredSize));
+            return finalSize;
+        }
+
+        protected override Visual GetVisualChild(int index)
+        {
+            if (index == 0 && _child != null) return _child;
+            return base.GetVisualChild(index);
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/Message/MessageListBox.cs b/src/WPFDevelopers.Shared/Controls/Message/MessageListBox.cs
new file mode 100644
index 00000000..6b6f208c
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Message/MessageListBox.cs
@@ -0,0 +1,19 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Controls
+{
+    public class MessageListBox : ListBox
+    {
+        protected override bool IsItemItsOwnContainerOverride(object item)
+        {
+            return item is MessageListBoxItem;
+        }
+
+        protected override DependencyObject GetContainerForItemOverride()
+        {
+            return new MessageListBoxItem();
+        }
+
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs b/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs
new file mode 100644
index 00000000..2f1f8ff6
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs
@@ -0,0 +1,27 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Controls
+{
+    public class MessageListBoxItem : ListBoxItem
+    {
+        public MessageBoxImage MessageType
+        {
+            get { return (MessageBoxImage)GetValue(MessageTypeProperty); }
+            set { SetValue(MessageTypeProperty, value); }
+        }
+        public static readonly DependencyProperty MessageTypeProperty =
+            DependencyProperty.Register("MessageType", typeof(MessageBoxImage), typeof(MessageListBoxItem), new PropertyMetadata(MessageBoxImage.Information));
+
+        public bool IsCenter
+        {
+            get { return (bool)GetValue(IsCenterProperty); }
+            set { SetValue(IsCenterProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsCenterProperty =
+            DependencyProperty.Register("IsCenter", typeof(bool), typeof(MessageListBoxItem), new PropertyMetadata(false));
+
+
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
index c3da4790..1c2d3212 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
@@ -48,9 +48,7 @@ private static MessageBoxResult GetWindow(WPFMessageBox msg, Window owner = null
             }
             else
             {
-                Window win = null;
-                if (Application.Current.Windows.Count > 0)
-                    win = Application.Current.Windows.OfType<Window>().FirstOrDefault(o => o.IsActive);
+                var win = ControlsHelper.GetDefaultWindow();
                 if (win != null)
                 {
                     if (win.WindowState == WindowState.Minimized)
diff --git a/src/WPFDevelopers.Shared/Helpers/ControlsHelper.cs b/src/WPFDevelopers.Shared/Helpers/ControlsHelper.cs
index 5b0c222f..b6e891e6 100644
--- a/src/WPFDevelopers.Shared/Helpers/ControlsHelper.cs
+++ b/src/WPFDevelopers.Shared/Helpers/ControlsHelper.cs
@@ -196,7 +196,6 @@ public static bool IsNumber(string text)
 
         public static BitmapSource Capture()
         {
-
             IntPtr hBitmap;
             var hDC = Win32.GetDC(Win32.GetDesktopWindow());
             var hMemDC = Win32.CreateCompatibleDC(hDC);
@@ -219,7 +218,33 @@ public static BitmapSource Capture()
             }
             return null;
         }
+        public static AdornerLayer GetAdornerLayer(Visual visual)
+        {
+            var decorator = visual as AdornerDecorator;
+            if (decorator != null)
+                return decorator.AdornerLayer;
+            var presenter = visual as ScrollContentPresenter;
+            if (presenter != null)
+                return presenter.AdornerLayer;
+            var visualContent = (visual as Window)?.Content as Visual;
+            return AdornerLayer.GetAdornerLayer(visualContent ?? visual);
+        }
+
+        public static Window GetDefaultWindow()
+        {
+            Window window = null;
+            if (Application.Current.Windows.Count > 0)
+            {
+                window = Application.Current.Windows.OfType<Window>().FirstOrDefault(o => o.IsActive);
+                if (window == null)
+                    window = Enumerable.FirstOrDefault(Application.Current.Windows.OfType<Window>());
+            }
+            return window;
+        }
+
     }
+
+
     #region 是否设计时模式
     public class DesignerHelper
     {
diff --git a/src/WPFDevelopers.Shared/Helpers/ListBoxItemExtensions.cs b/src/WPFDevelopers.Shared/Helpers/ListBoxItemExtensions.cs
new file mode 100644
index 00000000..868000d9
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Helpers/ListBoxItemExtensions.cs
@@ -0,0 +1,61 @@
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace WPFDevelopers.Helpers
+{
+    public static class ListBoxItemExtensions
+    {
+        public static readonly DependencyProperty AutoRemoveOnOpacityZeroProperty =
+        DependencyProperty.RegisterAttached("AutoRemoveOnOpacityZero", typeof(bool), typeof(ListBoxItemExtensions), new PropertyMetadata(false, OnAutoRemoveOnOpacityZeroChanged));
+
+        public static bool GetAutoRemoveOnOpacityZero(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(AutoRemoveOnOpacityZeroProperty);
+        }
+
+        public static void SetAutoRemoveOnOpacityZero(DependencyObject obj, bool value)
+        {
+            obj.SetValue(AutoRemoveOnOpacityZeroProperty, value);
+        }
+
+        private static void OnAutoRemoveOnOpacityZeroChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
+        {
+            ListBoxItem item = obj as ListBoxItem;
+            if (item != null)
+            {
+                if ((bool)e.NewValue)
+                    item.Loaded += Item_Loaded;
+                else
+                    item.Loaded -= Item_Loaded;
+            }
+        }
+
+        private static void Item_Loaded(object sender, RoutedEventArgs e)
+        {
+            var item = sender as ListBoxItem;
+            if (item != null)
+            {
+                var binding = new Binding("Opacity");
+                binding.Source = item;
+                binding.Mode = BindingMode.OneWay;
+
+                var dpd = DependencyPropertyDescriptor.FromProperty(UIElement.OpacityProperty, typeof(UIElement));
+                dpd.AddValueChanged(item, (s, args) =>
+                {
+                    if (item.Opacity < 0.1)
+                    {
+                        var parent = ItemsControl.ItemsControlFromItemContainer(item);
+                        if (parent != null)
+                        {
+                            object selectedItem = parent.ItemContainerGenerator.ItemFromContainer(item);
+                            parent.Items.Remove(selectedItem);
+                            parent.Items.Refresh();
+                        }
+                    }
+                });
+            }
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Helpers/WindowHelpers.cs b/src/WPFDevelopers.Shared/Helpers/WindowHelpers.cs
index bf1593de..29cf48fb 100644
--- a/src/WPFDevelopers.Shared/Helpers/WindowHelpers.cs
+++ b/src/WPFDevelopers.Shared/Helpers/WindowHelpers.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
+using System.Windows;
 using System.Windows.Media;
 using WPFDevelopers.Controls;
 using WPFDevelopers.Utilities;
@@ -22,10 +19,8 @@ public static void MaskShow(this Window outputWindow)
         }
         public static void CreateMask(this Window outputWindow)
         {
-            Visual parent = null;
-            if (Application.Current.Windows.Count > 0)
-                parent = Application.Current.Windows.OfType<Window>().FirstOrDefault(o => o.IsActive);
-            var _layer = GetAdornerLayer(parent);
+            Visual parent = ControlsHelper.GetDefaultWindow();
+            var _layer = ControlsHelper.GetAdornerLayer(parent);
             if (_layer == null) return;
             var _adornerContainer = new AdornerContainer(_layer)
             {
@@ -41,16 +36,5 @@ public static void CreateMask(this Window outputWindow)
                 };
             }
         }
-        static AdornerLayer GetAdornerLayer(Visual visual)
-        {
-            var decorator = visual as AdornerDecorator;
-            if (decorator != null)
-                return decorator.AdornerLayer;
-            var presenter = visual as ScrollContentPresenter;
-            if (presenter != null)
-                return presenter.AdornerLayer;
-            var visualContent = (visual as Window)?.Content as Visual;
-            return AdornerLayer.GetAdornerLayer(visualContent ?? visual);
-        }
     }
 }
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.CheckBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.CheckBox.xaml
index 4e92cee5..06a50fca 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.CheckBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.CheckBox.xaml
@@ -14,6 +14,9 @@
         <Setter Property="Padding" Value="4,0" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
@@ -27,8 +30,8 @@
                                     x:Name="PART_Border"
                                     Width="16"
                                     Height="16"
-                                    Background="{DynamicResource WD.WindowForegroundColorBrush}"
-                                    BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="1"
                                     CornerRadius="3">
                                     <controls:SmallPanel>
@@ -68,8 +71,7 @@
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Focusable="False"
                             RecognizesAccessKey="True"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Checked">
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
index 58aae9af..16c155df 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
@@ -100,6 +100,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
         <Setter Property="Padding" Value="14.5,3,30,3" />
         <Setter Property="Template">
             <Setter.Value>
@@ -297,6 +298,7 @@
         <Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
@@ -318,7 +320,7 @@
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
+                            TextElement.Foreground="{TemplateBinding Foreground}" />
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
index e05d65da..c97d63a7 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
@@ -195,20 +195,6 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Style.Triggers>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsSelected" Value="True" />
-                    <Condition Property="Selector.IsSelectionActive" Value="True" />
-                </MultiTrigger.Conditions>
-                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-                <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-                <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-            </Trigger>
-        </Style.Triggers>
     </Style>
     <!--  Style and template for the DataGridRow.  -->
     <Style
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
index 247ad959..1e16f213 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
@@ -6,7 +6,7 @@
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="WD.DefaultLabel" TargetType="{x:Type Label}">
+    <Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" 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.Shared/Styles/Styles.Loading.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Loading.xaml
index 878d5bdd..06e3a9f3 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Loading.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Loading.xaml
@@ -45,7 +45,10 @@
                             </Ellipse.RenderTransform>
                             <Ellipse.Triggers>
                                 <EventTrigger RoutedEvent="Loaded">
-                                    <BeginStoryboard Storyboard="{StaticResource StarStoryboard}" />
+                                    <BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+                                </EventTrigger>
+                                <EventTrigger RoutedEvent="Unloaded">
+                                    <StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
                                 </EventTrigger>
                             </Ellipse.Triggers>
                         </Ellipse>
@@ -91,7 +94,10 @@
                                 </Ellipse.RenderTransform>
                                 <Ellipse.Triggers>
                                     <EventTrigger RoutedEvent="Loaded">
-                                        <BeginStoryboard Storyboard="{StaticResource StarStoryboard}" />
+                                        <BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+                                    </EventTrigger>
+                                    <EventTrigger RoutedEvent="Unloaded">
+                                        <StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
                                     </EventTrigger>
                                 </Ellipse.Triggers>
                             </Ellipse>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.RadioButton.xaml b/src/WPFDevelopers.Shared/Styles/Styles.RadioButton.xaml
index 9d54f7bf..122a8c26 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.RadioButton.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.RadioButton.xaml
@@ -14,6 +14,8 @@
         TargetType="{x:Type RadioButton}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="4,0" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -28,7 +30,7 @@
                                     <Ellipse
                                         x:Name="PART_Border"
                                         Fill="{TemplateBinding Background}"
-                                        Stroke="{DynamicResource WD.BaseSolidColorBrush}"
+                                        Stroke="{TemplateBinding BorderBrush}"
                                         StrokeThickness="{TemplateBinding BorderThickness}" />
                                     <Ellipse
                                         x:Name="PART_Ellipse"
@@ -53,8 +55,7 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             Focusable="False"
                             RecognizesAccessKey="True"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Unchecked" />
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
index 6c311665..73f38ebf 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
@@ -57,4 +57,17 @@
         Color="{StaticResource WD.BlackColor}" />
     <BooleanToVisibilityConverter x:Key="WD.Bool2VisibilityConverter" />
     <Thickness x:Key="WD.TabItemBorderThickness">0,0,0,2</Thickness>
+
+    <Style TargetType="ToolTip">
+        <Setter Property="Visibility" Value="Visible" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml b/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml
index 285a855f..c23d1e4f 100644
--- a/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/BreadCrumbBar.xaml
@@ -13,8 +13,7 @@
         TargetType="{x:Type controls:BreadCrumbBarItem}">
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="6,0" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="FontSize" Value="{StaticResource WD.TitleFontSize}" />
+        <Setter Property="FontSize" Value="{StaticResource WD.MediumFontSize}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:BreadCrumbBarItem}">
diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
new file mode 100644
index 00000000..3e9b56f8
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -0,0 +1,178 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="WD.MessageListBoxItem"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:MessageListBoxItem}">
+        <Setter Property="FontSize" Value="{DynamicResource WD.NormalFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="helpers:ListBoxItemExtensions.AutoRemoveOnOpacityZero" Value="True" />
+        <Setter Property="Width" Value="300" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="Padding" Value="10" />
+        <Setter Property="Margin" Value="4,2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MessageListBoxItem}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Storyboard_Close">
+                            <DoubleAnimation
+                                Storyboard.TargetName="PART_SmallPanel"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                From="1"
+                                To="0"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                BeginTime="0:0:0.2"
+                                Storyboard.TargetProperty="Opacity"
+                                From="1"
+                                To="0"
+                                Duration="0:0:0" />
+                        </Storyboard>
+                        <Storyboard x:Key="Storyboard_Loaded">
+                            <DoubleAnimation
+                                Storyboard.TargetName="PART_SmallPanel"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                From="0"
+                                To="1"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="PART_SmallPanel"
+                                Storyboard.TargetProperty="Opacity"
+                                From=".1"
+                                To="1"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                BeginTime="0:0:10"
+                                Storyboard.TargetName="PART_SmallPanel"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                From="1"
+                                To="0"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                BeginTime="0:0:10"
+                                Storyboard.TargetProperty="Opacity"
+                                From="1"
+                                To="0"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel
+                        x:Name="PART_SmallPanel"
+                        Margin="{TemplateBinding Margin}"
+                        RenderTransformOrigin=".5,0">
+                        <controls:SmallPanel.RenderTransform>
+                            <ScaleTransform />
+                        </controls:SmallPanel.RenderTransform>
+                        <Border
+                            x:Name="PART_Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                            Effect="{StaticResource WD.NormalShadowDepth}"
+                            SnapsToDevicePixels="True"
+                            UseLayoutRounding="True" />
+                        <Border Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <DockPanel x:Name="PART_DockPanel" Grid.Column="0">
+                                    <Path
+                                        x:Name="PART_Path"
+                                        Width="15"
+                                        Height="15"
+                                        Data="{StaticResource WD.InformationGeometry}"
+                                        Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
+                                        Stretch="Fill" />
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Margin="5,0,0,0"
+                                        VerticalAlignment="Center"
+                                        FontSize="{TemplateBinding FontSize}"
+                                        Foreground="{TemplateBinding Foreground}"
+                                        Text="{TemplateBinding Content}"
+                                        TextWrapping="Wrap" />
+                                </DockPanel>
+                                <Button
+                                    x:Name="PART_CloseButton"
+                                    Grid.Column="2"
+                                    Width="30"
+                                    Height="28"
+                                    Padding="0"
+                                    HorizontalAlignment="Right"
+                                    Style="{StaticResource WD.PathButton}">
+                                    <Path
+                                        Width="10"
+                                        Height="10"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Data="{DynamicResource WD.WindowCloseGeometry}"
+                                        Fill="{DynamicResource WD.SecondaryTextSolidColorBrush}"
+                                        Stretch="Fill" />
+                                </Button>
+                            </Grid>
+                        </Border>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="MessageType" Value="Warning">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.WarningGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.WarningSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.WarningSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="MessageType" Value="Error">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ErrorGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.DangerSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.DangerSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="MessageType" Value="Information">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.InformationGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="MessageType" Value="Question">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.QuestionGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.NormalSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.NormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsCenter" Value="True">
+                            <Setter TargetName="PART_DockPanel" Property="HorizontalAlignment" Value="Center" />
+                        </Trigger>
+                        <EventTrigger RoutedEvent="Button.Click" SourceName="PART_CloseButton">
+                            <BeginStoryboard x:Name="BeginStoryboardClose" Storyboard="{StaticResource Storyboard_Close}" />
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard x:Name="BeginStoryboardLoaded" Storyboard="{StaticResource Storyboard_Loaded}" />
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Unloaded">
+                            <StopStoryboard BeginStoryboardName="BeginStoryboardLoaded" />
+                            <StopStoryboard BeginStoryboardName="BeginStoryboardClose" />
+                        </EventTrigger>
+                        <Trigger Property="Opacity" Value="0">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="WD.MessageListBox" TargetType="{x:Type controls:MessageListBox}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+    </Style>
+
+    <Style BasedOn="{StaticResource WD.MessageListBoxItem}" TargetType="{x:Type controls:MessageListBoxItem}" />
+    <Style BasedOn="{StaticResource WD.MessageListBox}" TargetType="{x:Type controls:MessageListBox}" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index f7f8c88c..eb896fd9 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -62,4 +62,5 @@ MultiSelectComboBox.xaml
 Mask.xaml
 MultiSelectSearchComboBox.xaml
 BreadCrumbBar.xaml
-CropImage.xaml
\ No newline at end of file
+CropImage.xaml
+Message.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index e6e1191e..1b6d021d 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -62,4 +62,5 @@ MultiSelectComboBox.xaml
 Mask.xaml
 MultiSelectSearchComboBox.xaml
 BreadCrumbBar.xaml
-CropImage.xaml
\ No newline at end of file
+CropImage.xaml
+Message.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Utilities/BaseControl.cs b/src/WPFDevelopers.Shared/Utilities/BaseControl.cs
index c92446f0..a96f310a 100644
--- a/src/WPFDevelopers.Shared/Utilities/BaseControl.cs
+++ b/src/WPFDevelopers.Shared/Utilities/BaseControl.cs
@@ -26,28 +26,5 @@ public object Child
         }
         public static readonly DependencyProperty ChildProperty =
             DependencyProperty.Register("Child", typeof(object), typeof(BaseControl), new PropertyMetadata(null));
-        public static object GetIsAddChild(UIElement element)
-        {
-            if (element == null) { throw new ArgumentNullException("element"); }
-
-            return (object)element.GetValue(IsAddChildProperty);
-        }
-
-        public static void SetIsAddChild(UIElement element, object child)
-        {
-            if (element == null) { throw new ArgumentNullException("element"); }
-
-            element.SetValue(IsAddChildProperty, child);
-        }
-
-        public bool IsAddChild
-        {
-            get { return (bool)GetValue(IsAddChildProperty); }
-            set { SetValue(IsAddChildProperty, value); }
-        }
-
-        public static readonly DependencyProperty IsAddChildProperty =
-            DependencyProperty.Register("IsAddChild", typeof(bool), typeof(BaseControl), new PropertyMetadata(false));
-
     }
 }
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 9898d4b1..70721387 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -14,11 +14,16 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBarItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CropImage\CropImage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Message\Message.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageAdorner.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageListBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageListBoxItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MultiSelectionSearchComboBox\MultiSelectListBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MultiSelectionSearchComboBox\MultiSelectSearchComboBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converts\BreadCrumbBarConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converts\DatePickerToCurrentConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\DatePickerHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\ListBoxItemExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\ScrollIntoView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\AnimationAudio\AnimationAudio.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\AnimationAudio\AudioWindow.cs" />
@@ -425,6 +430,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Message.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\MultiSelectComboBox.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>