diff --git a/Filtration.Common.Tests/Filtration.Common.Tests.csproj b/Filtration.Common.Tests/Filtration.Common.Tests.csproj
index 2371385..f5eaeec 100644
--- a/Filtration.Common.Tests/Filtration.Common.Tests.csproj
+++ b/Filtration.Common.Tests/Filtration.Common.Tests.csproj
@@ -35,12 +35,12 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Filtration.Common.Tests/packages.config b/Filtration.Common.Tests/packages.config
index ff08587..c5d64ff 100644
--- a/Filtration.Common.Tests/packages.config
+++ b/Filtration.Common.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview.Data.Tests/App.config b/Filtration.ItemFilterPreview.Data.Tests/App.config
index 9cac167..c7d9bb2 100644
--- a/Filtration.ItemFilterPreview.Data.Tests/App.config
+++ b/Filtration.ItemFilterPreview.Data.Tests/App.config
@@ -22,10 +22,10 @@
   <connectionStrings>
     <add name="FiltrationDbContext" connectionString="data source=&quot;D:\C# Projects\Filtration\Filtration.db&quot;" providerName="System.Data.SQLite.EF6" />
   </connectionStrings>
-  <system.data>
+  
+<system.data>
     <DbProviderFactories>
       <remove invariant="System.Data.SQLite.EF6" />
       <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
     <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
-  </system.data>
-</configuration>
\ No newline at end of file
+  </system.data></configuration>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj b/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
index 506fdf1..5869c8a 100644
--- a/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
+++ b/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
@@ -46,22 +46,22 @@
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.SQLite, Version=1.0.101.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.101.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.101.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.101.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.102.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.101.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.101.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.102.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -115,12 +115,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Filtration.ItemFilterPreview.Data.Tests/packages.config b/Filtration.ItemFilterPreview.Data.Tests/packages.config
index a96a087..5229672 100644
--- a/Filtration.ItemFilterPreview.Data.Tests/packages.config
+++ b/Filtration.ItemFilterPreview.Data.Tests/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
-  <package id="System.Data.SQLite" version="1.0.101.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.Core" version="1.0.101.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.EF6" version="1.0.101.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.Linq" version="1.0.101.0" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.EF6" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Linq" version="1.0.102.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj b/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj
index a0ec6c6..8b4461e 100644
--- a/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj
+++ b/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj
@@ -40,16 +40,16 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.101.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.101.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.101.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.101.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.102.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.101.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.101.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.102.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
@@ -78,12 +78,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.101.0\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Filtration.ItemFilterPreview.Data/packages.config b/Filtration.ItemFilterPreview.Data/packages.config
index 5744e16..72149fa 100644
--- a/Filtration.ItemFilterPreview.Data/packages.config
+++ b/Filtration.ItemFilterPreview.Data/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
-  <package id="System.Data.SQLite" version="1.0.101.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.Core" version="1.0.101.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.EF6" version="1.0.101.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.Linq" version="1.0.101.0" targetFramework="net461" />
+  <package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.EF6" version="1.0.102.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Linq" version="1.0.102.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
index 1ce6122..297c54e 100644
--- a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
+++ b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
@@ -46,20 +46,20 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.8.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.8.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Filtration.ItemFilterPreview.Tests/app.config b/Filtration.ItemFilterPreview.Tests/app.config
index 43e75bf..c1fa1bd 100644
--- a/Filtration.ItemFilterPreview.Tests/app.config
+++ b/Filtration.ItemFilterPreview.Tests/app.config
@@ -4,7 +4,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.2.3" newVersion="2.1.2.3" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Filtration.ItemFilterPreview.Tests/packages.config b/Filtration.ItemFilterPreview.Tests/packages.config
index e94dbc7..5330729 100644
--- a/Filtration.ItemFilterPreview.Tests/packages.config
+++ b/Filtration.ItemFilterPreview.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.8.0" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="4.13.0" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
   <package id="YamlDotNet" version="3.9.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
index 699e4a0..f78f69b 100644
--- a/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
+++ b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
@@ -60,8 +60,8 @@
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Filtration.ItemFilterPreview/packages.config b/Filtration.ItemFilterPreview/packages.config
index 2c51feb..7255210 100644
--- a/Filtration.ItemFilterPreview/packages.config
+++ b/Filtration.ItemFilterPreview/packages.config
@@ -3,6 +3,6 @@
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net461" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
index 0cdc727..0af02c0 100644
--- a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
+++ b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
@@ -35,12 +35,12 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
diff --git a/Filtration.ObjectModel.Tests/packages.config b/Filtration.ObjectModel.Tests/packages.config
index ff08587..c5d64ff 100644
--- a/Filtration.ObjectModel.Tests/packages.config
+++ b/Filtration.ObjectModel.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
index fe56cc3..e4d600c 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
@@ -4,9 +4,10 @@ using Filtration.ObjectModel.Extensions;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    public class ActionBlockItem : BlockItemBase
+    public sealed class ActionBlockItem : BlockItemBase
     {
         private BlockAction _action;
+        private bool _isDirty;
 
         public ActionBlockItem(BlockAction action)
         {
@@ -19,10 +20,11 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             set
             {
                 _action = value;
+                IsDirty = true;
                 OnPropertyChanged();
-                OnPropertyChanged("SummaryText");
-                OnPropertyChanged("SummaryBackgroundColor");
-                OnPropertyChanged("SummaryTextColor");
+                OnPropertyChanged(nameof(SummaryText));
+                OnPropertyChanged(nameof(SummaryBackgroundColor));
+                OnPropertyChanged(nameof(SummaryText));
             }
         }
 
@@ -42,6 +44,16 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
 
         public override int SortOrder => 0;
 
+        public override bool IsDirty
+        {
+            get { return _isDirty; }
+            protected set
+            {
+                _isDirty = value;
+                OnPropertyChanged();
+            }
+        }
+
         public void ToggleAction()
         {
             Action = Action == BlockAction.Show ? BlockAction.Hide : BlockAction.Show;
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs b/Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs
index 694b0d3..9e31481 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs
@@ -15,6 +15,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
         public abstract Color SummaryBackgroundColor { get; }
         public abstract Color SummaryTextColor { get; }
         public abstract int SortOrder { get; }
+        public abstract bool IsDirty { get; protected set; }
 
         public event PropertyChangedEventHandler PropertyChanged;
         
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
index 2863064..6059d40 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
@@ -24,6 +24,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
 
         public override string SummaryText => string.Empty;
 
+        public override bool IsDirty { get; protected set; }
+
         public ThemeComponent ThemeComponent
         {
             get { return _themeComponent; }
@@ -56,6 +58,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             set
             {
                 _color = value;
+                IsDirty = true;
                 OnPropertyChanged();
             }
         }
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/DualIntegerBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/DualIntegerBlockItem.cs
index c73392b..81c0a8d 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/DualIntegerBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/DualIntegerBlockItem.cs
@@ -23,12 +23,15 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
         public override Color SummaryBackgroundColor => Colors.Transparent;
         public override Color SummaryTextColor => Colors.Transparent;
 
+        public override bool IsDirty { get; protected set; }
+
         public int Value
         {
             get { return _value; }
             set
             {
                 _value = value;
+                IsDirty = true;
                 OnPropertyChanged();
             }
         }
@@ -39,6 +42,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             set
             {
                 _secondValue = value;
+                IsDirty = true;
                 OnPropertyChanged();
             }
         }
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs
index c0ad306..c16aabf 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs
@@ -24,12 +24,15 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
         public abstract int Minimum { get; }
         public abstract int Maximum { get; }
 
+        public override bool IsDirty { get; protected set; }
+
         public int Value
         {
             get { return _value; }
             set
             {
                 _value = value;
+                IsDirty = true;
                 OnPropertyChanged();
             }
         }
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/NumericFilterPredicateBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/NumericFilterPredicateBlockItem.cs
index 592f03d..2b88698 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/NumericFilterPredicateBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/NumericFilterPredicateBlockItem.cs
@@ -26,6 +26,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
         public abstract int Minimum { get; }
         public abstract int Maximum { get; }
 
+        public override bool IsDirty { get; protected set; }
+
         public NumericFilterPredicate FilterPredicate
         {
             get { return _filterPredicate; }
@@ -38,8 +40,9 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
 
         private void OnFilterPredicateChanged(object sender, EventArgs e)
         {
-            OnPropertyChanged("FilterPredicate");
-            OnPropertyChanged("SummaryText");
+            IsDirty = true;
+            OnPropertyChanged(nameof(FilterPredicate));
+            OnPropertyChanged(nameof(SummaryText));
         }
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/StringListBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/StringListBlockItem.cs
index 56c5f3e..dd33bbf 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/StringListBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/StringListBlockItem.cs
@@ -30,10 +30,13 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
 
         public ObservableCollection<string> Items { get; protected set; }
 
+        public override bool IsDirty { get; protected set; }
+
         private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged("Items");
-            OnPropertyChanged("SummaryText");
+            IsDirty = true;
+            OnPropertyChanged(nameof(Items));
+            OnPropertyChanged(nameof(SummaryText));
         }
     }
 }
diff --git a/Filtration.ObjectModel/IAudioVisualBlockItem.cs b/Filtration.ObjectModel/IAudioVisualBlockItem.cs
index 4dfb86b..d299d45 100644
--- a/Filtration.ObjectModel/IAudioVisualBlockItem.cs
+++ b/Filtration.ObjectModel/IAudioVisualBlockItem.cs
@@ -2,8 +2,7 @@
 
 namespace Filtration.ObjectModel
 {
-    public interface IAudioVisualBlockItem
+    public interface IAudioVisualBlockItem : IItemFilterBlockItem
     {
-        event PropertyChangedEventHandler PropertyChanged;
     }
 }
diff --git a/Filtration.ObjectModel/IItemFilterBlockItem.cs b/Filtration.ObjectModel/IItemFilterBlockItem.cs
index d438c15..021201e 100644
--- a/Filtration.ObjectModel/IItemFilterBlockItem.cs
+++ b/Filtration.ObjectModel/IItemFilterBlockItem.cs
@@ -5,6 +5,8 @@ namespace Filtration.ObjectModel
 {
     public interface IItemFilterBlockItem : INotifyPropertyChanged
     {
+        event PropertyChangedEventHandler PropertyChanged;
+
         string PrefixText { get; }
         string OutputText { get; }
         string DisplayHeading { get; }
@@ -13,5 +15,6 @@ namespace Filtration.ObjectModel
         Color SummaryTextColor { get; }
         int MaximumAllowed { get; }
         int SortOrder { get; }
+        bool IsDirty { get; }
     }
 }
diff --git a/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj b/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
index 3823438..b89b120 100644
--- a/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
+++ b/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
@@ -40,20 +40,20 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.8.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.8.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
diff --git a/Filtration.Parser.Tests/packages.config b/Filtration.Parser.Tests/packages.config
index 2d5e42c..2722d85 100644
--- a/Filtration.Parser.Tests/packages.config
+++ b/Filtration.Parser.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.8.0" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="4.13.0" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.Tests/Filtration.Tests.csproj b/Filtration.Tests/Filtration.Tests.csproj
index 71b76d1..1dd5a7a 100644
--- a/Filtration.Tests/Filtration.Tests.csproj
+++ b/Filtration.Tests/Filtration.Tests.csproj
@@ -35,20 +35,20 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.8.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.8.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
diff --git a/Filtration.Tests/app.config b/Filtration.Tests/app.config
index a59abc6..576244b 100644
--- a/Filtration.Tests/app.config
+++ b/Filtration.Tests/app.config
@@ -4,7 +4,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.2.3" newVersion="2.1.2.3" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Filtration.Tests/packages.config b/Filtration.Tests/packages.config
index 2d5e42c..2722d85 100644
--- a/Filtration.Tests/packages.config
+++ b/Filtration.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.8.0" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="4.13.0" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj b/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
index fe16532..da3c05f 100644
--- a/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
+++ b/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
@@ -35,12 +35,12 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
diff --git a/Filtration.ThemeEditor.Tests/packages.config b/Filtration.ThemeEditor.Tests/packages.config
index ff08587..c5d64ff 100644
--- a/Filtration.ThemeEditor.Tests/packages.config
+++ b/Filtration.ThemeEditor.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.9" targetFramework="net461" />
-  <package id="NUnit" version="3.2.1" targetFramework="net461" />
+  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="NUnit" version="3.4.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
index b0cbb74..7af0956 100644
--- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -58,7 +58,7 @@
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.4\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -78,28 +78,28 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Filtration.ThemeEditor/packages.config b/Filtration.ThemeEditor/packages.config
index cd9a707..5f23e20 100644
--- a/Filtration.ThemeEditor/packages.config
+++ b/Filtration.ThemeEditor/packages.config
@@ -4,7 +4,7 @@
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
-  <package id="Extended.Wpf.Toolkit" version="2.8" targetFramework="net461" />
+  <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.3.4" targetFramework="net461" />
+  <package id="NLog" version="4.3.7" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.db b/Filtration.db
index f6f138e..e79f87a 100644
Binary files a/Filtration.db and b/Filtration.db differ
diff --git a/Filtration/App.config b/Filtration/App.config
index c58865a..2d883c2 100644
--- a/Filtration/App.config
+++ b/Filtration/App.config
@@ -31,7 +31,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.2.3" newVersion="2.1.2.3" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index e478acd..2701c27 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -53,8 +53,8 @@
     <Reference Include="Castle.Windsor">
       <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="ControlzEx, Version=2.0.1.61, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.2.0.1.61\lib\net45\ControlzEx.dll</HintPath>
+    <Reference Include="ControlzEx, Version=2.1.2.3, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
+      <HintPath>..\packages\ControlzEx.2.1.2.3\lib\net45\ControlzEx.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Fluent, Version=4.0.3.394, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
@@ -79,7 +79,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.4\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -94,7 +94,7 @@
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\ControlzEx.2.1.2.3\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -113,32 +113,32 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2013, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libs\Xceed.Wpf.AvalonDock.Themes.VS2013.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Filtration/NLog.xsd b/Filtration/NLog.xsd
index dc821bc..c489255 100644
--- a/Filtration/NLog.xsd
+++ b/Filtration/NLog.xsd
@@ -232,7 +232,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="Layout"></xs:complexType>
   <xs:complexType name="Filter" abstract="true"></xs:complexType>
   <xs:complexType name="TimeSource" abstract="true"></xs:complexType>
   <xs:simpleType name="SimpleLayoutAttribute">
@@ -1020,8 +1019,8 @@
           <xs:element name="archiveFileName" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="archiveEvery" minOccurs="0" maxOccurs="1" type="NLog.Targets.FileArchivePeriod" />
           <xs:element name="archiveAboveSize" minOccurs="0" maxOccurs="1" type="xs:long" />
-          <xs:element name="maxArchiveFiles" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="enableArchiveFileCompression" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="maxArchiveFiles" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="forceManaged" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="cleanupFileName" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="fileName" minOccurs="0" maxOccurs="1" type="Layout" />
@@ -1093,16 +1092,16 @@
             <xs:documentation>Size in bytes above which log files will be automatically archived. Warning: combining this with  isn't supported. We cannot create multiple archive files, if they should have the same name. Choose: </xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="maxArchiveFiles" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum number of archive files that should be kept.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="enableArchiveFileCompression" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to compress archive files into the zip archive format.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxArchiveFiles" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum number of archive files that should be kept.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="forceManaged" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Gets or set a value indicating whether a managed file stream is forced, instead of used the native implementation.</xs:documentation>
@@ -2238,6 +2237,18 @@
       <xs:enumeration value="HttpGet" />
     </xs:restriction>
   </xs:simpleType>
+  <xs:complexType name="CompoundLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="layout" minOccurs="0" maxOccurs="unbounded" type="Layout" />
+        </xs:choice>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Layout">
+    <xs:choice minOccurs="0" maxOccurs="unbounded" />
+  </xs:complexType>
   <xs:complexType name="CsvLayout">
     <xs:complexContent>
       <xs:extension base="Layout">
@@ -2334,8 +2345,14 @@
       <xs:extension base="Layout">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
+          <xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
+        <xs:attribute name="renderEmptyObject" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to render the empty object value {}</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="suppressSpaces" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
index 0c8f9e9..8fe7e9f 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@@ -18,6 +18,7 @@ namespace Filtration.ViewModels
 {
     internal interface IItemFilterBlockViewModel
     {
+        event EventHandler BlockBecameDirty;
         void Initialise(IItemFilterBlock itemFilterBlock, ItemFilterScriptViewModel parentScriptViewModel);
         bool IsDirty { get; set; }
         bool IsExpanded { get; set; }
@@ -36,6 +37,7 @@ namespace Filtration.ViewModels
         private bool _displaySettingsPopupOpen;
         private bool _isExpanded;
         private bool _audioVisualBlockItemsGridVisible;
+        private bool _isDirty;
 
         public ItemFilterBlockViewModel(IStaticDataService staticDataService, IReplaceColorsViewModel replaceColorsViewModel)
         {
@@ -56,12 +58,13 @@ namespace Filtration.ViewModels
             ReplaceColorsCommand = new RelayCommand(OnReplaceColorsCommand);
             AddFilterBlockItemCommand = new RelayCommand<Type>(OnAddFilterBlockItemCommand);
             ToggleBlockActionCommand = new RelayCommand(OnToggleBlockActionCommand);
-            AddAudioVisualBlockItemCommand = new RelayCommand<Type>(OnAddAudioVisualBlockItemCommand);
             RemoveFilterBlockItemCommand = new RelayCommand<IItemFilterBlockItem>(OnRemoveFilterBlockItemCommand);
             SwitchBlockItemsViewCommand = new RelayCommand(OnSwitchBlockItemsViewCommand);
             PlaySoundCommand = new RelayCommand(OnPlaySoundCommand, () => HasSound);
         }
 
+        public event EventHandler BlockBecameDirty;
+
         public void Initialise(IItemFilterBlock itemFilterBlock, ItemFilterScriptViewModel parentScriptViewModel)
         {
             if (itemFilterBlock == null || parentScriptViewModel == null)
@@ -74,9 +77,9 @@ namespace Filtration.ViewModels
             Block = itemFilterBlock;
             itemFilterBlock.BlockItems.CollectionChanged += OnBlockItemsCollectionChanged;
 
-            foreach (var blockItem in itemFilterBlock.BlockItems.OfType<IAudioVisualBlockItem>())
+            foreach (var blockItem in itemFilterBlock.BlockItems)
             {
-                blockItem.PropertyChanged += OnAudioVisualBlockItemChanged;
+                blockItem.PropertyChanged += OnBlockItemChanged;
             }
         }
 
@@ -101,7 +104,19 @@ namespace Filtration.ViewModels
 
         public IItemFilterBlock Block { get; private set; }
 
-        public bool IsDirty { get; set; }
+        public bool IsDirty
+        {
+            get { return _isDirty; }
+            set
+            {
+                if (value != _isDirty)
+                {
+                    _isDirty = value;
+                    RaisePropertyChanged();
+                    BlockBecameDirty?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
 
         public bool IsExpanded
         {
@@ -241,34 +256,36 @@ namespace Filtration.ViewModels
         {
             if (!AddBlockItemAllowed(blockItemType)) return;
             var newBlockItem = (IItemFilterBlockItem) Activator.CreateInstance(blockItemType);
-        
+
+            newBlockItem.PropertyChanged += OnBlockItemChanged;
             BlockItems.Add(newBlockItem);
+            OnBlockItemChanged(this, EventArgs.Empty);
             IsDirty = true;
         }
 
         private void OnRemoveFilterBlockItemCommand(IItemFilterBlockItem blockItem)
         {
             BlockItems.Remove(blockItem);
+            blockItem.PropertyChanged -= OnBlockItemChanged;
 
             if (blockItem is IAudioVisualBlockItem)
             {
-                blockItem.PropertyChanged -= OnAudioVisualBlockItemChanged;
-                OnAudioVisualBlockItemChanged(this, EventArgs.Empty);
+                OnBlockItemChanged(this, EventArgs.Empty);
             }
 
             IsDirty = true;
         }
 
-        private void OnAddAudioVisualBlockItemCommand(Type blockItemType)
-        {
-            if (!AddBlockItemAllowed(blockItemType)) return;
-            var newBlockItem = (IItemFilterBlockItem) Activator.CreateInstance(blockItemType);
+        //private void OnAddAudioVisualBlockItemCommand(Type blockItemType)
+        //{
+        //    if (!AddBlockItemAllowed(blockItemType)) return;
+        //    var newBlockItem = (IItemFilterBlockItem) Activator.CreateInstance(blockItemType);
 
-            newBlockItem.PropertyChanged += OnAudioVisualBlockItemChanged;
-            BlockItems.Add(newBlockItem);
-            OnAudioVisualBlockItemChanged(this, EventArgs.Empty);
-            IsDirty = true;
-        }
+        //    newBlockItem.PropertyChanged += OnBlockItemChanged;
+        //    BlockItems.Add(newBlockItem);
+        //    OnBlockItemChanged(this, EventArgs.Empty);
+        //    IsDirty = true;
+        //}
 
         private void OnCopyBlockCommand()
         {
@@ -346,26 +363,35 @@ namespace Filtration.ViewModels
             _mediaPlayer.Play();
         }
 
-        private void OnAudioVisualBlockItemChanged(object sender, EventArgs e)
+        private void OnBlockItemChanged(object sender, EventArgs e)
         {
-            RefreshBlockPreview();
+            var itemFilterBlockItem = sender as IItemFilterBlockItem;
+            if ( itemFilterBlockItem != null && itemFilterBlockItem.IsDirty)
+            {
+                IsDirty = true;
+            }
+
+            if (sender is IAudioVisualBlockItem)
+            {
+                RefreshBlockPreview();
+            }
         }
 
         public void RefreshBlockPreview()
         {
-            RaisePropertyChanged("DisplayTextColor");
-            RaisePropertyChanged("DisplayBackgroundColor");
-            RaisePropertyChanged("DisplayBorderColor");
-            RaisePropertyChanged("DisplayFontSize");
-            RaisePropertyChanged("HasSound");
+            RaisePropertyChanged(nameof(DisplayTextColor));
+            RaisePropertyChanged(nameof(DisplayBackgroundColor));
+            RaisePropertyChanged(nameof(DisplayBorderColor));
+            RaisePropertyChanged(nameof(DisplayFontSize));
+            RaisePropertyChanged(nameof(HasSound));
         }
 
         private void OnBlockItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            RaisePropertyChanged("RegularBlockItems");
-            RaisePropertyChanged("SummaryBlockItems");
-            RaisePropertyChanged("AudioVisualBlockItems");
-            RaisePropertyChanged("HasAudioVisualBlockItems");
+            RaisePropertyChanged(nameof(RegularBlockItems));
+            RaisePropertyChanged(nameof(SummaryBlockItems));
+            RaisePropertyChanged(nameof(AudioVisualBlockItems));
+            RaisePropertyChanged(nameof(HasAudioVisualBlockItems));
         }
     }
 }
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 739241b..d66527d 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -324,6 +324,7 @@ namespace Filtration.ViewModels
             {
                 var vm = _itemFilterBlockViewModelFactory.Create();
                 vm.Initialise(block, this);
+                vm.BlockBecameDirty += OnBlockBecameDirty;
                 ItemFilterBlockViewModels.Add(vm);
             }
            
@@ -639,6 +640,8 @@ namespace Filtration.ViewModels
                     ItemFilterBlockViewModels.Add(vm);
                 }
 
+                vm.BlockBecameDirty += OnBlockBecameDirty;
+
                 SelectedBlockViewModel = vm;
                 IsDirty = true;
             }
@@ -757,11 +760,17 @@ namespace Filtration.ViewModels
                 ItemFilterBlockViewModels.Add(vm);
             }
 
+            vm.BlockBecameDirty += OnBlockBecameDirty;
             SelectedBlockViewModel = vm;
             vm.IsExpanded = true;
             IsDirty = true;
         }
 
+        private void OnBlockBecameDirty(object sender, EventArgs e)
+        {
+            SetDirtyFlag();
+        }
+
         private void OnAddSectionCommand()
         {
             AddSection(SelectedBlockViewModel);
@@ -816,6 +825,8 @@ namespace Filtration.ViewModels
                 ItemFilterBlockViewModels.Remove(targetBlockViewModel);
                 IsDirty = true;
 
+                targetBlockViewModel.BlockBecameDirty -= OnBlockBecameDirty;
+
                 if (isSection)
                 {
                     Messenger.Default.Send(new NotificationMessage("SectionsChanged"));
diff --git a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
index 6f78e2c..5bbd499 100644
--- a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
+++ b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
@@ -26,6 +26,7 @@
                              DocumentsSource="{Binding OpenDocuments}"
                              ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}" >
             <xcad:DockingManager.Theme>
+                
                 <xcad:Vs2013LightTheme />
             </xcad:DockingManager.Theme>
             <xcad:DockingManager.LayoutItemTemplateSelector>
diff --git a/Filtration/Views/Styles/CheckBox.xaml b/Filtration/Views/Styles/CheckBox.xaml
index 8efe84b..b3950c7 100644
--- a/Filtration/Views/Styles/CheckBox.xaml
+++ b/Filtration/Views/Styles/CheckBox.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:vsm ="clr-namespace:System.Windows;assembly=PresentationFramework">
     <Style TargetType="{x:Type CheckBox}">
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
@@ -70,28 +71,28 @@
                                   Fill="#808080" />
                             </Grid>
                         </BulletDecorator.Bullet>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Checked">
+                        <vsm:VisualStateManager.VisualStateGroups>
+                            <vsm:VisualStateGroup x:Name="CheckStates">
+                                <vsm:VisualState x:Name="Checked">
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetProperty="Opacity"
                                              Storyboard.TargetName="CheckMark" Duration="0:0:0.2" To="1" />
                                     </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Unchecked" >
+                                </vsm:VisualState>
+                                <vsm:VisualState x:Name="Unchecked" >
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetProperty="Opacity"
                                              Storyboard.TargetName="CheckMark" Duration="0:0:0.2" To="0" />
                                     </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Indeterminate">
+                                </vsm:VisualState>
+                                <vsm:VisualState x:Name="Indeterminate">
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetProperty="Opacity"
                                              Storyboard.TargetName="InderminateMark" Duration="0:0:0.2" To="1" />
                                     </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
+                                </vsm:VisualState>
+                            </vsm:VisualStateGroup>
+                        </vsm:VisualStateManager.VisualStateGroups>
                         <ContentPresenter Margin="4,0,4,0"
                         VerticalAlignment="Center"
                         HorizontalAlignment="Left"
diff --git a/Filtration/packages.config b/Filtration/packages.config
index d6683d3..da3f499 100644
--- a/Filtration/packages.config
+++ b/Filtration/packages.config
@@ -4,14 +4,14 @@
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
-  <package id="ControlzEx" version="2.0.1.61" targetFramework="net461" />
-  <package id="Extended.Wpf.Toolkit" version="2.8" targetFramework="net461" />
+  <package id="ControlzEx" version="2.1.2.3" targetFramework="net461" />
+  <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net461" />
   <package id="Fluent.Ribbon" version="4.0.3.394" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.2.4.0" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.3.4" targetFramework="net461" />
-  <package id="NLog.Config" version="4.3.4" targetFramework="net461" />
-  <package id="NLog.Schema" version="4.3.4" targetFramework="net461" />
+  <package id="NLog" version="4.3.7" targetFramework="net461" />
+  <package id="NLog.Config" version="4.3.7" targetFramework="net461" />
+  <package id="NLog.Schema" version="4.3.7" targetFramework="net461" />
   <package id="WpfAnimatedGif" version="1.4.14" targetFramework="net461" />
   <package id="WPFToolkit" version="3.5.50211.1" targetFramework="net451" />
 </packages>
\ No newline at end of file