diff --git a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs
index 8815da97..2c886173 100644
--- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using GalaSoft.MvvmLight.Messaging;
diff --git a/src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/GrowlDemoViewModel.cs
index 1dc4ea54..567367a5 100644
--- a/src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/GrowlDemoViewModel.cs
+++ b/src/Core_30/HandyControlDemo_Core_30/ViewModel/Controls/GrowlDemoViewModel.cs
@@ -58,7 +58,7 @@ namespace HandyControlDemo.ViewModel
             }))).Value;
 
         public RelayCommand ClearCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Clear())).Value;
+            new RelayCommand(() => Growl.Clear(_token))).Value;
 
         public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
index 7df6ea78..88da46d1 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
@@ -15,6 +15,7 @@
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
         <Setter Property="MaxWidth" Value="320"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="8"/>
         <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -34,7 +35,7 @@
                             <RowDefinition/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="8" Width="320"/>
+                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Width="320"/>
                         <Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
                         <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
                             <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
diff --git a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs
index 8815da97..2c886173 100644
--- a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using GalaSoft.MvvmLight.Messaging;
diff --git a/src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/GrowlDemoViewModel.cs
index ee269359..fe3ae8f7 100644
--- a/src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/GrowlDemoViewModel.cs
+++ b/src/Net_40/HandyControlDemo_Net_40/ViewModel/Controls/GrowlDemoViewModel.cs
@@ -58,7 +58,7 @@ namespace HandyControlDemo.ViewModel
             }))).Value;
 
         public RelayCommand ClearCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Clear())).Value;
+            new RelayCommand(() => Growl.Clear(_token))).Value;
 
         public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
index 7df6ea78..88da46d1 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
@@ -15,6 +15,7 @@
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
         <Setter Property="MaxWidth" Value="320"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="8"/>
         <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -34,7 +35,7 @@
                             <RowDefinition/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="8" Width="320"/>
+                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Width="320"/>
                         <Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
                         <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
                             <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
index 8815da97..2c886173 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using GalaSoft.MvvmLight.Messaging;
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/GrowlDemoViewModel.cs
index 1dc4ea54..567367a5 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/GrowlDemoViewModel.cs
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/ViewModel/Controls/GrowlDemoViewModel.cs
@@ -58,7 +58,7 @@ namespace HandyControlDemo.ViewModel
             }))).Value;
 
         public RelayCommand ClearCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Clear())).Value;
+            new RelayCommand(() => Growl.Clear(_token))).Value;
 
         public RelayCommand NewWindowCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(() => new GrowlDemoWindow().Show())).Value;
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
index 91fe4035..88da46d1 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
@@ -15,7 +15,7 @@
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
         <Setter Property="MaxWidth" Value="320"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="8"/>
         <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -35,7 +35,7 @@
                             <RowDefinition/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource Mode=TemplatedParent}}" Width="320"/>
+                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Width="320"/>
                         <Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
                         <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
                             <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>