diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml
new file mode 100644
index 0000000..2127810
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml
@@ -0,0 +1,19 @@
+<Application x:Class="Enterwell.Clients.Wpf.Notifications.Sample.Net5.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Enterwell.Clients.Wpf.Notifications.Sample.Net5"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+                <!-- Theme setting -->
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style BasedOn="{StaticResource {x:Type ProgressBar}}"
+                   TargetType="{x:Type ProgressBar}" />
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml.cs
new file mode 100644
index 0000000..08dedff
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Enterwell.Clients.Wpf.Notifications.Sample.Net5
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/AssemblyInfo.cs b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/AssemblyInfo.cs
new file mode 100644
index 0000000..8b5504e
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/Enterwell.Clients.Wpf.Notifications.Sample.Net5.csproj b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/Enterwell.Clients.Wpf.Notifications.Sample.Net5.csproj
new file mode 100644
index 0000000..a5888b1
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/Enterwell.Clients.Wpf.Notifications.Sample.Net5.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MahApps.Metro" Version="2.3.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Enterwell.Clients.Wpf.Notifications\Enterwell.Clients.Wpf.Notifications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml
new file mode 100644
index 0000000..74651ed
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml
@@ -0,0 +1,96 @@
+<mahapps:MetroWindow x:Class="Enterwell.Clients.Wpf.Notifications.Sample.Net5.MainWindow"
+                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:controls="clr-namespace:Enterwell.Clients.Wpf.Notifications.Controls;assembly=Enterwell.Clients.Wpf.Notifications"
+                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                     Title="MainWindow"
+                     Width="900"
+                     Height="600"
+                     BorderThickness="0"
+                     GlowBrush="Black"
+                     ResizeMode="CanResizeWithGrip"
+                     ShowTitleBar="False"
+                     WindowStartupLocation="CenterScreen"
+                     WindowTransitionsEnabled="False"
+                     mc:Ignorable="d">
+    <mahapps:MetroWindow.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Enterwell.Clients.Wpf.Notifications;component/Themes/Generic.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </mahapps:MetroWindow.Resources>
+    <mahapps:MetroWindow.WindowButtonCommands>
+        <mahapps:WindowButtonCommands Style="{DynamicResource MahApps.Metro.Styles.WindowButtonCommands.Win10}" />
+    </mahapps:MetroWindow.WindowButtonCommands>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="3*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Border Grid.Column="1">
+            <controls:NotificationMessageContainer Manager="{Binding Manager}" />
+        </Border>
+
+        <WrapPanel Grid.Row="1"
+                   Grid.Column="0"
+                   Grid.ColumnSpan="3"
+                   VerticalAlignment="Bottom"
+                   Orientation="Horizontal">
+
+            <Button Margin="8"
+                    Padding="12,8"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="#1751C3"
+                    Click="ButtonBaseInfoOnClick"
+                    Content="Info message"
+                    Style="{StaticResource NotificationMessageButtonStyle}" />
+
+            <Button Margin="8"
+                    Padding="12,8"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="#E0A030"
+                    Click="ButtonBaseWarningOnClick"
+                    Content="Warning (with header)"
+                    Style="{StaticResource NotificationMessageButtonStyle}" />
+
+            <Button Margin="8"
+                    Padding="12,8"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="#F15B19"
+                    Click="ButtonBaseErrorOnClick"
+                    Content="Error message"
+                    Style="{StaticResource NotificationMessageButtonStyle}" />
+
+            <Button Margin="8"
+                    Padding="12,8"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="#1751C3"
+                    Click="ButtonBaseInfoDelayOnClick"
+                    Content="Animated info message with delayed dismiss (5s)"
+                    Style="{StaticResource NotificationMessageButtonStyle}" />
+
+            <Button Margin="8"
+                    Padding="12,8"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="#1751C3"
+                    Click="ButtonBaseAdditionalContentOnClick"
+                    Content="Additional Content Areas"
+                    Style="{StaticResource NotificationMessageButtonStyle}" />
+
+        </WrapPanel>
+    </Grid>
+</mahapps:MetroWindow>
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml.cs
new file mode 100644
index 0000000..0c19920
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications.Sample.Net5/MainWindow.xaml.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Enterwell.Clients.Wpf.Notifications.Sample.Net5
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainWindow"/> class.
+        /// </summary>
+        public MainWindow()
+        {
+            this.InitializeComponent();
+            this.DataContext = this;
+        }
+
+        private void ButtonBaseErrorOnClick(object sender, RoutedEventArgs e)
+        {
+            this.Manager
+                .CreateMessage()
+                .Accent("#F15B19")
+                .Background("#F15B19")
+                .HasHeader("Lost connection to server")
+                .HasMessage("Reconnecting...")
+                .WithOverlay(new ProgressBar
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Height = 3,
+                    BorderThickness = new Thickness(0),
+                    Foreground = new SolidColorBrush(Color.FromArgb(128, 255, 255, 255)),
+                    Background = Brushes.Transparent,
+                    IsIndeterminate = true,
+                    IsHitTestVisible = false
+                })
+                .Queue();
+        }
+
+        private void ButtonBaseWarningOnClick(object sender, RoutedEventArgs e)
+        {
+            this.Manager
+                .CreateMessage()
+                .Accent("#E0A030")
+                .Background("#333")
+                .HasBadge("Warn")
+                .HasHeader("Error")
+                .HasMessage("Failed to retrieve data.")
+                .WithButton("Try again", button => { })
+                .Dismiss().WithButton("Ignore", button => { })
+                .Queue();
+        }
+
+        private void ButtonBaseInfoOnClick(object sender, RoutedEventArgs e)
+        {
+            this.Manager
+                .CreateMessage()
+                .Accent("#1751C3")
+                .Background("#333")
+                .HasBadge("Info")
+                .HasMessage("Update will be installed on next application restart.")
+                .Dismiss().WithButton("Update now", button => { })
+                .Dismiss().WithButton("Release notes", button => { })
+                .Dismiss().WithButton("Later", button => { })
+                .Queue();
+        }
+
+        private void ButtonBaseInfoDelayOnClick(object sender, RoutedEventArgs e)
+        {
+            this.Manager
+                .CreateMessage()
+                .Accent("#1751C3")
+                .Animates(true)
+                .AnimationInDuration(0.75)
+                .AnimationOutDuration(2)
+                .Background("#333")
+                .HasBadge("Info")
+                .HasMessage("Update will be installed on next application restart. This message will be dismissed after 5 seconds.")
+                .Dismiss().WithButton("Update now", button => { })
+                .Dismiss().WithButton("Release notes", button => { })
+                .Dismiss().WithDelay(TimeSpan.FromSeconds(5))
+                .Queue();
+        }
+
+        private void ButtonBaseAdditionalContentOnClick(object sender, RoutedEventArgs e)
+        {
+            this.Manager
+                .CreateMessage()
+                .Accent("#1751C3")
+                .Background("#333")
+                .Foreground("#333")
+                .HasBadge("Info")
+                .HasHeader("Header")
+                .HasMessage("This is the message!")
+                .WithAdditionalContent(ContentLocation.Top, new Border
+                {
+                    Height = 25,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Background = Brushes.Red
+                })
+                .WithAdditionalContent(ContentLocation.Bottom, new Border
+                {
+                    Height = 25,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Background = Brushes.Green
+                })
+                .WithAdditionalContent(ContentLocation.Left, new Border
+                {
+                    Width = 25,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Background = Brushes.Yellow
+                })
+                .WithAdditionalContent(ContentLocation.Right, new Border
+                {
+                    Width = 25,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Background = Brushes.Violet
+                })
+                .WithAdditionalContent(ContentLocation.Main, new Border
+                {
+                    MinHeight = 50,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Background = Brushes.Orange
+                })
+                .WithAdditionalContent(ContentLocation.AboveBadge, new Border
+                {
+                    Height = 40,
+                    Width = 40,
+                    Background = Brushes.Indigo
+                })
+                .Dismiss().WithButton("Dismiss", button => { })
+                .Queue();
+        }
+
+        /// <summary>
+        /// Gets the notification message manager.
+        /// </summary>
+        /// <value>
+        /// The notification message manager.
+        /// </value>
+        public INotificationMessageManager Manager { get; } = new NotificationMessageManager();
+    }
+}
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj b/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj
index f30ca15..f52ea95 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/Enterwell.Clients.Wpf.Notifications.Sample.csproj
@@ -34,14 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MahApps.Metro, Version=1.4.3.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.4.3\lib\net45\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -91,7 +85,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -106,5 +99,10 @@
       <Name>Enterwell.Clients.Wpf.Notifications</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MahApps.Metro">
+      <Version>1.4.3</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/packages.config b/Enterwell.Clients.Wpf.Notifications.Sample/packages.config
deleted file mode 100644
index 7777517..0000000
--- a/Enterwell.Clients.Wpf.Notifications.Sample/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MahApps.Metro" version="1.4.3" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/Enterwell.Clients.Wpf.Notifications.sln b/Enterwell.Clients.Wpf.Notifications.sln
index c1e9554..0f912c9 100644
--- a/Enterwell.Clients.Wpf.Notifications.sln
+++ b/Enterwell.Clients.Wpf.Notifications.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26206.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30709.132
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Enterwell.Clients.Wpf.Notifications", "Enterwell.Clients.Wpf.Notifications\Enterwell.Clients.Wpf.Notifications.csproj", "{CFA27B27-9231-4F6D-804A-C0AE33FA5237}"
 EndProject
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Readme.md = Readme.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Enterwell.Clients.Wpf.Notifications.Sample.Net5", "Enterwell.Clients.Wpf.Notifications.Sample.Net5\Enterwell.Clients.Wpf.Notifications.Sample.Net5.csproj", "{1F1B08F8-6BAA-4805-A703-93242F2DDB4F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{4B47659C-0B1D-4273-B03F-D335F9B5E802}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B47659C-0B1D-4273-B03F-D335F9B5E802}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B47659C-0B1D-4273-B03F-D335F9B5E802}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F1B08F8-6BAA-4805-A703-93242F2DDB4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F1B08F8-6BAA-4805-A703-93242F2DDB4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F1B08F8-6BAA-4805-A703-93242F2DDB4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F1B08F8-6BAA-4805-A703-93242F2DDB4F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
index 130cdea..188092d 100644
--- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
+++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
@@ -1,94 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{CFA27B27-9231-4F6D-804A-C0AE33FA5237}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <RootNamespace>Enterwell.Clients.Wpf.Notifications</RootNamespace>
-    <AssemblyName>Enterwell.Clients.Wpf.Notifications</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFrameworks>net5-windows;netcoreapp3.1;net451</TargetFrameworks>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
+    <AssemblyTitle>Enterwell.Clients.Wpf.Notifications</AssemblyTitle>
+    <Company>Enterwell d.o.o.</Company>
+    <Product>Enterwell.Clients.Wpf.Notifications</Product>
+    <Description>Enterwell WPF Notifications library</Description>
+    <Copyright>Copyright (c) Enterwell d.o.o. 2017-2020</Copyright>
+    <Version>1.4.2.0</Version>
+    <AssemblyVersion>1.4.2.0</AssemblyVersion>
+    <FileVersion>1.4.2.0</FileVersion>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+    <Authors>Enterwell d.o.o.</Authors>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/Enterwell/Wpf.Notifications/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/Enterwell/Wpf.Notifications</PackageProjectUrl>
+    <PackageReleaseNotes>Fixed messages would not dismiss</PackageReleaseNotes>
+    <PackageTags>wpf notifications</PackageTags>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ContentLocation.cs" />
-    <Compile Include="Controls\NotificationMessage.cs" />
-    <Compile Include="Controls\NotificationMessageButton.cs" />
-    <Compile Include="Controls\NotificationMessageContainer.cs" />
-    <Compile Include="INotificationMessage.cs" />
-    <Compile Include="INotificationAnimation.cs" />
-    <Compile Include="INotificationMessageButton.cs" />
-    <Compile Include="INotificationMessageFactory.cs" />
-    <Compile Include="INotificationMessageManager.cs" />
-    <Compile Include="NotificationMessageBuilder.cs" />
-    <Compile Include="NotificationMessageBuilderLinq.cs" />
-    <Compile Include="NotificationMessageFactory.cs" />
-    <Compile Include="NotificationMessageManager.cs" />
-    <Compile Include="NotificationMessageManagerEventArgs.cs" />
-    <Compile Include="NotificationMessageManagerEventHandler.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec
deleted file mode 100644
index 49989ef..0000000
--- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://raw.githubusercontent.com/Enterwell/Wpf.Notifications/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Enterwell/Wpf.Notifications</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <releaseNotes>Fixed messages would not dismiss</releaseNotes>
-    <copyright>Copyright (c) Enterwell d.o.o. 2017-2018</copyright>
-    <tags>wpf notifications</tags>
-  </metadata>
-</package>
diff --git a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
index 971b935..46c1b0a 100644
--- a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
@@ -2,18 +2,6 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Enterwell.Clients.Wpf.Notifications")]
-[assembly: AssemblyDescription("Enterwell WPF Notifications library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Enterwell d.o.o.")]
-[assembly: AssemblyProduct("Enterwell.Clients.Wpf.Notifications")]
-[assembly: AssemblyCopyright("Copyright © Enterwell d.o.o. 2017-2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
@@ -37,17 +25,3 @@
                                       //(used if a resource is not found in the page,
                                       // app, or any theme specific resource dictionaries)
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]