* Removed old unused user settings

* Fixed prompt for filter directory selection appearing incorrectly on startup * Bumped version to 1.1.0-beta6
Removed test projects from SquirrelReleasify build config
2018-12-05 13:03:51 +00:00 · 2018-12-05 12:42:47 +00:00 · 2018-12-05 12:42:01 +00:00 · 2018-12-05 12:33:34 +00:00 · 2018-12-05 12:32:28 +00:00 · 2018-12-05 12:31:47 +00:00
266 changed files with 8875 additions and 4321 deletions
--- a/Filtration.Common.Tests/Filtration.Common.Tests.csproj
+++ b/Filtration.Common.Tests/Filtration.Common.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -31,18 +34,27 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
@@ -53,9 +65,16 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </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.
  <Target Name="BeforeBuild">
--- a/Filtration.Common.Tests/app.config
+++ b/Filtration.Common.Tests/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.Common.Tests/packages.config
+++ b/Filtration.Common.Tests/packages.config
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.30" targetFramework="net461" />
-  <package id="NUnit" version="3.6.1" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="Moq" version="4.10.0" targetFramework="net461" />
+  <package id="NUnit" version="3.11.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
--- a/Filtration.Common/Filtration.Common.csproj
+++ b/Filtration.Common/Filtration.Common.csproj
@@ -31,35 +31,33 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.4.1.1\lib\net45\Castle.Windsor.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation">
-      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web" />
    <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>
-      <Private>True</Private>
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
    </Reference>
    <Reference Include="System.Xaml" />
    <Reference Include="System.Xml.Linq" />
@@ -86,6 +84,7 @@
    <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
--- a/Filtration.Common/app.config
+++ b/Filtration.Common/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.Common/packages.config
+++ b/Filtration.Common/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
-  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
-  <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
-  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
 </packages>
--- a/Filtration.Interface/Filtration.Interface.csproj
+++ b/Filtration.Interface/Filtration.Interface.csproj
@@ -31,9 +31,24 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="System" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
@@ -46,6 +61,10 @@
    <Compile Include="IEditableDocument.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- 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.
--- a/Filtration.Interface/IDocument.cs
+++ b/Filtration.Interface/IDocument.cs
@@ -1,4 +1,6 @@
 using System.Threading.Tasks;
+using System.Windows.Input;
+using GalaSoft.MvvmLight.CommandWpf;

 namespace Filtration.Interface
 {
@@ -7,5 +9,6 @@ namespace Filtration.Interface
        bool IsScript { get; }
        bool IsTheme { get; }
        Task Close();
+        RelayCommand CloseCommand { get; }
    }
 }
--- a/Filtration.Interface/app.config
+++ b/Filtration.Interface/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.Interface/packages.config
+++ b/Filtration.Interface/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
+</packages>
--- a/Filtration.ItemFilterPreview.Data.Tests/App.config
+++ b/Filtration.ItemFilterPreview.Data.Tests/App.config
@@ -22,10 +22,18 @@
  <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>
+  </system.data>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
+++ b/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,29 +40,24 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
    </Reference>
    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <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 Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net46\System.Data.SQLite.dll</HintPath>
    </Reference>
-    <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 Include="System.Data.SQLite.EF6, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.109.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
    </Reference>
-    <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 Include="System.Data.SQLite.Linq, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.109.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
    </Reference>
  </ItemGroup>
  <Choose>
@@ -114,13 +110,14 @@
  </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.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.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'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets'))" />
  </Target>
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets')" />
  <!-- 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.
  <Target Name="BeforeBuild">
--- 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.6.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" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="NUnit" version="3.11.0" targetFramework="net461" />
+  <package id="System.Data.SQLite" version="1.0.109.2" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net461" />
+  <package id="System.Data.SQLite.EF6" version="1.0.109.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Linq" version="1.0.109.0" targetFramework="net461" />
 </packages>
--- a/Filtration.ItemFilterPreview.Data/App.config
+++ b/Filtration.ItemFilterPreview.Data/App.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
  </configSections>
  <entityFramework>
    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@@ -11,19 +11,28 @@
      </parameters>
    </defaultConnectionFactory>
    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
    </providers>
  </entityFramework>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
  </startup>
-  
-<connectionStrings>
-  <add name="FiltrationDbContext" connectionString="data source=&quot;D:\C# Projects\Filtration\Filtration.db&quot;" providerName="System.Data.SQLite.EF6" />
+  <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>
+  </system.data>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj
+++ b/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj
@@ -34,23 +34,22 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Core" />
-    <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 Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net46\System.Data.SQLite.dll</HintPath>
    </Reference>
-    <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 Include="System.Data.SQLite.EF6, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.109.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
    </Reference>
-    <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 Include="System.Data.SQLite.Linq, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.109.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Security" />
@@ -78,12 +77,12 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.109.2\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.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'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.109.2\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.
--- 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.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" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="System.Data.SQLite" version="1.0.109.2" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net461" />
+  <package id="System.Data.SQLite.EF6" version="1.0.109.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Linq" version="1.0.109.0" targetFramework="net461" />
 </packages>
--- a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
+++ b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -23,6 +24,8 @@
    <TestProjectType>CodedUITest</TestProjectType>
    <IsWindowsStoreCodedUITest>True</IsWindowsStoreCodedUITest>
    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -42,29 +45,31 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=5.5.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.5.5.3\lib\net45\FluentAssertions.dll</HintPath>
    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
-    <Reference Include="YamlDotNet, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.3.9.0\lib\net35\YamlDotNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -118,6 +123,12 @@
    <None Include="Resources\MuldiniFilterScript.txt" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </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.
  <Target Name="BeforeBuild">
--- a/Filtration.ItemFilterPreview.Tests/app.config
+++ b/Filtration.ItemFilterPreview.Tests/app.config
@@ -4,12 +4,36 @@
    <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.9.0.0" newVersion="2.9.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-2.2.0.4" newVersion="2.2.0.4" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/Filtration.ItemFilterPreview.Tests/packages.config
+++ b/Filtration.ItemFilterPreview.Tests/packages.config
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.19.2" targetFramework="net461" />
-  <package id="Moq" version="4.5.30" targetFramework="net461" />
-  <package id="NUnit" version="3.6.1" targetFramework="net461" />
-  <package id="YamlDotNet" version="3.9.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="5.5.3" targetFramework="net461" />
+  <package id="Moq" version="4.10.0" targetFramework="net461" />
+  <package id="NUnit" version="3.11.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
--- a/Filtration.ItemFilterPreview/App.config
+++ b/Filtration.ItemFilterPreview/App.config
@@ -1,6 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
--- a/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
+++ b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
@@ -36,37 +36,43 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.4.1.1\lib\net45\Castle.Windsor.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
    <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>
-      <Private>True</Private>
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="Microsoft.CSharp" />
--- a/Filtration.ItemFilterPreview/packages.config
+++ b/Filtration.ItemFilterPreview/packages.config
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
-  <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.30" targetFramework="net461" />
-  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
+  <package id="Moq" version="4.10.0" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
--- a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
+++ b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -31,19 +34,28 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
@@ -64,12 +76,19 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </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.
  <Target Name="BeforeBuild">
--- a/Filtration.ObjectModel.Tests/app.config
+++ b/Filtration.ObjectModel.Tests/app.config
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.ObjectModel.Tests/packages.config
+++ b/Filtration.ObjectModel.Tests/packages.config
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.30" targetFramework="net461" />
-  <package id="NUnit" version="3.6.1" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="Moq" version="4.10.0" targetFramework="net461" />
+  <package id="NUnit" version="3.11.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
@@ -27,8 +27,6 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
            }
        }

-        public string Comment { get; set; }
-
        public override string OutputText => Action.GetAttributeDescription();

        public override string PrefixText => string.Empty;
@@ -43,7 +41,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes

        public override Color SummaryTextColor => Action == BlockAction.Show ? Colors.Black : Colors.White;

-        public override int SortOrder => 0;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Action;

        public void ToggleAction()
        {
--- a/Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs
@@ -2,6 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Media;
 using Filtration.ObjectModel.Annotations;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
@@ -16,7 +17,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
        public abstract string SummaryText { get; }
        public abstract Color SummaryBackgroundColor { get; }
        public abstract Color SummaryTextColor { get; }
-        public abstract int SortOrder { get; }
+        public abstract BlockItemOrdering SortOrder { get; }
+        public string Comment { get; set; }

        public bool IsDirty
        {
--- a/Filtration.ObjectModel/BlockItemBaseTypes/BooleanBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/BooleanBlockItem.cs
@@ -27,7 +27,7 @@
        }

        public override string OutputText => PrefixText + " " + BooleanValue;
-        public override string SummaryText => PrefixText + " = " + BooleanValue;
+        public override string SummaryText => DisplayHeading + " = " + BooleanValue;
        public override int MaximumAllowed => 1;

        public void ToggleValue()
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
@@ -19,7 +19,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
        }

        public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " "
-                                             + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
+                                             + Color.B + (Color.A != 240 ? " " + Color.A : string.Empty) +
                                             (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);

        public override string SummaryText => string.Empty;
--- a/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs
@@ -1,4 +1,5 @@
 using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.BlockItemBaseTypes;

 namespace Filtration.ObjectModel.BlockItemTypes
@@ -7,6 +8,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
    {
        public BackgroundColorBlockItem()
        {
+            Color = new Color { A = 240, R = 0, G = 0, B = 0 };
        }

        public BackgroundColorBlockItem(Color color) : base(color)
@@ -16,6 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "SetBackgroundColor";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Background Color";
-        public override int SortOrder => 23;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.SetBackgroundColor;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -16,23 +17,23 @@ namespace Filtration.ObjectModel.BlockItemTypes
            {
                if (Items.Count > 0 && Items.Count < 4)
                {
-                    return "Item Base Types: " +
+                    return "Base Types: " +
                           Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
                }
                if (Items.Count >= 4)
                {
                    var remaining = Items.Count - 3;
-                    return "Item Base Types: " + Items.Take(3)
+                    return "Base Types: " + Items.Take(3)
                        .Aggregate(string.Empty, (current, i) => current + i + ", ")
                        .TrimEnd(' ')
                        .TrimEnd(',') + " (+" + remaining + " more)";
                }
-                return "Item Base Types: (none)";
+                return "Base Types: (none)";
            }
        }

        public override Color SummaryBackgroundColor => Colors.MediumTurquoise;
        public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 20;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.BaseType;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -7,6 +8,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
    {
        public BorderColorBlockItem()
        {
+            Color = new Color {A = 240, R = 0, G = 0, B = 0};
        }

        public BorderColorBlockItem(Color color) : base(color)
@@ -16,6 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "SetBorderColor";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Border Color";
-        public override int SortOrder => 24;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.SetBorderColor;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -16,23 +17,23 @@ namespace Filtration.ObjectModel.BlockItemTypes
            {
                if (Items.Count > 0 && Items.Count < 4)
                {
-                    return "Item Classes: " +
+                    return "Classes: " +
                           Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
                }
                if (Items.Count >= 4)
                {
                    var remaining = Items.Count - 3;
-                    return "Item Classes: " + Items.Take(3)
+                    return "Classes: " + Items.Take(3)
                        .Aggregate(string.Empty, (current, i) => current + i + ", ")
                        .TrimEnd(' ')
                        .TrimEnd(',') + " (+" + remaining + " more)";
                }
-                return "Item Classes: (none)";
+                return "Classes: (none)";
            }
        }

        public override Color SummaryBackgroundColor => Colors.MediumSeaGreen;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 19;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Class;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/CorruptedBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/CorruptedBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Corrupted";
        public override Color SummaryBackgroundColor => Colors.DarkRed;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 5;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Corrupted;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
@@ -1,4 +1,5 @@
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -16,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "CustomAlertSound";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Custom Alert Sound";
-        public override int SortOrder => 31;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.CustomAlertSound;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/DisableDropSoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/DisableDropSoundBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Disable Drop Sound";
        public override Color SummaryBackgroundColor => Colors.Transparent;
        public override Color SummaryTextColor => Colors.Transparent;
-        public override int SortOrder => 28;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.DisableDropSound;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Drop Level " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.DodgerBlue;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 15;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.DropLevel;
        public override int Minimum => 0;
        public override int Maximum => 100;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Elder Item";
        public override Color SummaryBackgroundColor => Colors.DarkGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 6;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.ElderItem;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/ElderMapBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ElderMapBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Elder Map";
        public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 10;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.ElderMap;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs
@@ -1,4 +1,5 @@
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -16,7 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "SetFontSize";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Font Size";
-        public override int SortOrder => 25;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.SetFontSize;
        public override int Minimum => 11;
        public override int Maximum => 45;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/GemLevelBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/GemLevelBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Gem Level " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 16;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.GemLevel;
        public override int Minimum => 0;
        public override int Maximum => 21;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/HasExplicitModBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/HasExplicitModBlockItem.cs
@@ -1,13 +1,14 @@
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
    public class HasExplicitModBlockItem : StringListBlockItem
    {
        public override string PrefixText => "HasExplicitMod";
-        public override int MaximumAllowed => 1;
+        public override int MaximumAllowed => 8;
        public override string DisplayHeading => "Has Explicit Mod";

        public override string SummaryText
@@ -16,23 +17,23 @@ namespace Filtration.ObjectModel.BlockItemTypes
            {
                if (Items.Count > 0 && Items.Count < 4)
                {
-                    return "Item Explicit Mods: " +
+                    return "Explicit Mods: " +
                           Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
                }
                if (Items.Count >= 4)
                {
                    var remaining = Items.Count - 3;
-                    return "Item Explicit Mods: " + Items.Take(3)
+                    return "Explicit Mods: " + Items.Take(3)
                        .Aggregate(string.Empty, (current, i) => current + i + ", ")
                        .TrimEnd(' ')
                        .TrimEnd(',') + " (+" + remaining + " more)";
                }
-                return "Item Explicit Mods: (none)";
+                return "Explicit Mods: (none)";
            }
        }

        public override Color SummaryBackgroundColor => Colors.MidnightBlue;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 21;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.HasExplicitMod;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Height " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.LightBlue;
        public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 12;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Height;
        public override int Minimum => 0;
        public override int Maximum => 6;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/IdentifiedBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/IdentifiedBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Identified";
        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 4;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Identified;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs
@@ -20,7 +20,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Item Level " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 14;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.ItemLevel;
        public override int Minimum => 0;
        public override int Maximum => 100;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Linked Sockets " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.Gold;
        public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 1;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.LinkedSockets;
        public override int Minimum => 0;
        public override int Maximum => 6;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/MapIconBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/MapIconBlockItem.cs
@@ -19,6 +19,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "MinimapIcon";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Minimap Icon";
-        public override int SortOrder => 29;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.MinimapIcon;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/MapTierBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/MapTierBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Map Tier " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 8;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.MapTier;
        public override int Minimum => 1;
        public override int Maximum => 16;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/PlayEffectBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/PlayEffectBlockItem.cs
@@ -18,6 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "PlayEffect";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Play Effect";
-        public override int SortOrder => 30;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.PlayEffect;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs
@@ -1,4 +1,5 @@
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,6 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "PlayAlertSoundPositional";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Play Positional Alert Sound";
-        public override int SortOrder => 27;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.PlayAlertSoundPositional;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/ProphecyBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ProphecyBlockItem.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class ProphecyBlockItem : StringListBlockItem
+    {
+        public override string PrefixText => "Prophecy";
+        public override int MaximumAllowed => 1;
+        public override string DisplayHeading => "Prophecy";
+
+        public override string SummaryText
+        {
+            get
+            {
+                if (Items.Count > 0 && Items.Count < 4)
+                {
+                    return "Prophecies: " +
+                           Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
+                }
+                if (Items.Count >= 4)
+                {
+                    var remaining = Items.Count - 3;
+                    return "Prophecies: " + Items.Take(3)
+                        .Aggregate(string.Empty, (current, i) => current + i + ", ")
+                        .TrimEnd(' ')
+                        .TrimEnd(',') + " (+" + remaining + " more)";
+                }
+                return "Prophecies: (none)";
+            }
+        }
+
+        public override Color SummaryBackgroundColor => Colors.DarkMagenta;
+        public override Color SummaryTextColor => Colors.White;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Prophecy;
+    }
+}
--- a/Filtration.ObjectModel/BlockItemTypes/QualityBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/QualityBlockItem.cs
@@ -21,8 +21,8 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Quality " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.DarkOrange;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 3;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Quality;
        public override int Minimum => 0;
-        public override int Maximum => 20;
+        public override int Maximum => 30;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs
@@ -30,7 +30,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
                                              ((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();
        public override Color SummaryBackgroundColor => Colors.LightCoral;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 18;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Rarity;
        public override int Minimum => 0;
        public override int Maximum => (int)ItemRarity.Unique;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Shaped Map";
        public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 9;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.ShapedMap;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,7 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string DisplayHeading => "Shaper Item";
        public override Color SummaryBackgroundColor => Colors.DimGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 7;
-
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.ShaperItem;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs
@@ -39,7 +39,7 @@ namespace Filtration.ObjectModel.BlockItemTypes

        public override Color SummaryBackgroundColor => Colors.GhostWhite;
        public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 11;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.SocketGroup;

        private SocketColor StringToSocketColor(char socketColorString)
        {
--- a/Filtration.ObjectModel/BlockItemTypes/SocketsBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/SocketsBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Sockets " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.LightGray;
        public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 2;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Sockets;
        public override int Minimum => 0;
        public override int Maximum => 6;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs
@@ -1,4 +1,5 @@
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -17,6 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "PlayAlertSound";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Play Alert Sound";
-        public override int SortOrder => 26;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.PlayAlertSound;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/StackSizeBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/StackSizeBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Stack Size " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 17;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.StackSize;
        public override int Minimum => 0;
        public override int Maximum => 1000;
    }
--- a/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -7,6 +8,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
    {
        public TextColorBlockItem()
        {
+            Color = PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
        }

        public TextColorBlockItem(Color color) : base(color)
@@ -16,6 +18,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string PrefixText => "SetTextColor";
        public override int MaximumAllowed => 1;
        public override string DisplayHeading => "Text Color";
-        public override int SortOrder => 22;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.SetTextColor;
    }
 }
--- a/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
        public override string SummaryText => "Width " + FilterPredicate;
        public override Color SummaryBackgroundColor => Colors.MediumPurple;
        public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 13;
+        public override BlockItemOrdering SortOrder => BlockItemOrdering.Width;
        public override int Minimum => 0;
        public override int Maximum => 2;
    }
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/AddBlockItemToBlocksCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/AddBlockItemToBlocksCommand.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.ObjectModel;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class AddBlockItemToBlocksCommand : IUndoableCommand
+    {
+        private readonly List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> _input;
+
+        public AddBlockItemToBlocksCommand(List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> input)
+        {
+            _input = input;
+        }
+
+        public void Execute()
+        {
+            foreach (var v in _input)
+            {
+                var blockItems = v.Item1;
+                var item = v.Item2;
+
+                blockItems.Add(item);
+            }
+        }
+
+        public void Undo()
+        {
+            foreach (var v in _input)
+            {
+                var blockItems = v.Item1;
+                var item = v.Item2;
+                blockItems.Remove(item);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockDownCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockDownCommand.cs
@@ -1,39 +0,0 @@
-using System;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlockDownCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly IItemFilterBlockBase _blockToMove;
-        private int _indexMovedFrom;
-
-        public MoveBlockDownCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
-        {
-            _itemFilterScript = itemFilterScript;
-            _blockToMove = blockToMove;
-        }
-
-        public void Execute()
-        {
-            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
-
-            if (_indexMovedFrom >= _itemFilterScript.ItemFilterBlocks.Count)
-            {
-                throw new InvalidOperationException("Cannot move the bottom block down");
-            }
-
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom + 1, _blockToMove);
-
-        }
-
-        public void Undo()
-        {
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToBottomCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToBottomCommand.cs
@@ -1,30 +0,0 @@
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlockToBottomCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly IItemFilterBlockBase _blockToMove;
-        private int _indexMovedFrom;
-
-        public MoveBlockToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
-        {
-            _itemFilterScript = itemFilterScript;
-            _blockToMove = blockToMove;
-        }
-        public void Execute()
-        {
-            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
-            
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Add(_blockToMove);
-        }
-
-        public void Undo()
-        {
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToTopCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToTopCommand.cs
@@ -1,30 +0,0 @@
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlockToTopCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly IItemFilterBlockBase _blockToMove;
-        private int _indexMovedFrom;
-
-        public MoveBlockToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
-        {
-            _itemFilterScript = itemFilterScript;
-            _blockToMove = blockToMove;
-        }
-        public void Execute()
-        {
-            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
-
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(0, _blockToMove);
-        }
-
-        public void Undo()
-        {
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockUpCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockUpCommand.cs
@@ -1,39 +0,0 @@
-using System;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlockUpCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly IItemFilterBlockBase _blockToMove;
-        private int _indexMovedFrom;
-
-        public MoveBlockUpCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
-        {
-            _itemFilterScript = itemFilterScript;
-            _blockToMove = blockToMove;
-        }
-
-        public void Execute()
-        {
-            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
-
-            if (_indexMovedFrom <= 0)
-            {
-                throw new InvalidOperationException("Cannot move the top block up");
-            }
-
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom-1, _blockToMove);
-
-        }
-
-        public void Undo()
-        {
-            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToBottomCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToBottomCommand.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlocksToBottomCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly List<int> _sourceIndexes;
+
+        public MoveBlocksToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
+        }
+
+        public MoveBlocksToBottomCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = sourceIndexes;
+            _sourceIndexes.Sort();
+        }
+
+        public void Execute()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
+            }
+
+            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
+            {
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
+            }
+
+            foreach (var block in blocksToMove)
+            {
+                _itemFilterScript.ItemFilterBlocks.Add(block);
+            }
+        }
+
+        public void Undo()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                var movedIndex = _itemFilterScript.ItemFilterBlocks.Count - _sourceIndexes.Count;
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[movedIndex]);
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(movedIndex);
+            }
+
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToIndexCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToIndexCommand.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlocksToIndexCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private List<int> _sourceIndexes;
+        private int _targetIndex;
+
+        public MoveBlocksToIndexCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block, int targetIndex)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
+            _targetIndex = targetIndex;
+        }
+
+        public MoveBlocksToIndexCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes, int targetIndex)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = sourceIndexes;
+            _sourceIndexes.Sort();
+            _targetIndex = targetIndex;
+        }
+
+        public void Execute()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
+            }
+
+            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
+            {
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
+            }
+
+            for (var i = 0; i < blocksToMove.Count; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_targetIndex + i, blocksToMove[i]);
+            }
+        }
+
+        public void Undo()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_targetIndex]);
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_targetIndex);
+            }
+
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToTopCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToTopCommand.cs
@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlocksToTopCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly List<int> _sourceIndexes;
+
+        public MoveBlocksToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
+        }
+
+        public MoveBlocksToTopCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = sourceIndexes;
+            _sourceIndexes.Sort();
+        }
+
+        public void Execute()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
+            }
+
+            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
+            {
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
+            }
+
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(i, blocksToMove[i]);
+            }
+        }
+
+        public void Undo()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[0]);
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(0);
+            }
+
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveSectionToIndexCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveSectionToIndexCommand.cs
@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveSectionToIndexCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private int _sectionStart;
-        private int _sectionSize;
-        private int _index;
-
-        public MoveSectionToIndexCommand(IItemFilterScript itemFilterScript, int sectionStart, int sectionSize, int index)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sectionStart = sectionStart;
-            _sectionSize = sectionSize;
-            _index = index;
-        }
-        public void Execute()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for(var i = 0; i < _sectionSize; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sectionStart]);
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sectionStart);
-            }
-            for (var i = 0; i < _sectionSize; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_index + i, blocksToMove[i]);
-            }
-        }
-
-        public void Undo()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sectionSize; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_index]);
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_index);
-            }
-            for (var i = 0; i < _sectionSize; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_sectionStart + i, blocksToMove[i]);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlockCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlockCommand.cs
@@ -1,37 +0,0 @@
-using System;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class PasteBlockCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly IItemFilterBlockBase _pastedItemFilterBlock;
-        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
-
-        public PasteBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase pastedItemFilterBlock, IItemFilterBlockBase addAfterItemFilterBlock)
-        {
-            _itemFilterScript = itemFilterScript;
-            _pastedItemFilterBlock = pastedItemFilterBlock;
-            _addAfterItemFilterBlock = addAfterItemFilterBlock;
-        }
-
-        public void Execute()
-        {
-            if (_addAfterItemFilterBlock != null)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _pastedItemFilterBlock);
-            }
-            else
-            {
-                _itemFilterScript.ItemFilterBlocks.Add(_pastedItemFilterBlock);
-            }
-        }
-
-        public void Undo()
-        {
-            _itemFilterScript.ItemFilterBlocks.Remove(_pastedItemFilterBlock);
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlocksCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlocksCommand.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class PasteBlocksCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly List<IItemFilterBlockBase> _pastedItemFilterBlocks;
+        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
+
+        public PasteBlocksCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block, IItemFilterBlockBase addAfterItemFilterBlock)
+        {
+            _itemFilterScript = itemFilterScript;
+            _pastedItemFilterBlocks = new List<IItemFilterBlockBase> { block };
+            _addAfterItemFilterBlock = addAfterItemFilterBlock;
+        }
+
+        public PasteBlocksCommand(IItemFilterScript itemFilterScript, List<IItemFilterBlockBase> pastedItemFilterBlocks, IItemFilterBlockBase addAfterItemFilterBlock)
+        {
+            _itemFilterScript = itemFilterScript;
+            _pastedItemFilterBlocks = pastedItemFilterBlocks;
+            _addAfterItemFilterBlock = addAfterItemFilterBlock;
+        }
+
+        public void Execute()
+        {
+            if (_addAfterItemFilterBlock != null)
+            {
+                var lastAddedBlock = _addAfterItemFilterBlock;
+                foreach (var block in _pastedItemFilterBlocks)
+                {
+                    _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(lastAddedBlock) + 1, block);
+                    lastAddedBlock = block;
+                }
+            }
+            else
+            {
+                foreach (var block in _pastedItemFilterBlocks)
+                {
+                    _itemFilterScript.ItemFilterBlocks.Add(block);
+                }
+            }
+        }
+
+        public void Undo()
+        {
+            foreach (var block in _pastedItemFilterBlocks)
+            {
+                _itemFilterScript.ItemFilterBlocks.Remove(block);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockCommand.cs
@@ -1,29 +0,0 @@
-using System;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class RemoveBlockCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private IItemFilterBlockBase _removedItemFilterBlock;
-        private int _indexRemovedFrom;
-
-        public RemoveBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase itemFilterBlockBase)
-        {
-            _itemFilterScript = itemFilterScript;
-            _removedItemFilterBlock = itemFilterBlockBase;
-        }
-        public void Execute()
-        {
-            _indexRemovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_removedItemFilterBlock);
-            _itemFilterScript.ItemFilterBlocks.Remove(_removedItemFilterBlock);
-        }
-
-        public void Undo()
-        {
-            _itemFilterScript.ItemFilterBlocks.Insert(_indexRemovedFrom, _removedItemFilterBlock);
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockItemFromBlocksCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockItemFromBlocksCommand.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.ObjectModel;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class RemoveBlockItemFromBlocksCommand : IUndoableCommand
+    {
+        private readonly List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> _input;
+
+        public RemoveBlockItemFromBlocksCommand(List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> input)
+        {
+            _input = input;
+        }
+
+        public void Execute()
+        {
+            foreach (var pair in _input)
+            {
+                var blockItems = pair.Item1;
+                var blockItem = pair.Item2;
+
+                for (var i = 0; i < blockItems.Count; i++)
+                {
+                    if (blockItems[i] == blockItem)
+                    {
+                        blockItems.RemoveAt(i--);
+                    }
+                }
+            }
+        }
+
+        public void Undo()
+        {
+            foreach (var pair in _input)
+            {
+                var blockItems = pair.Item1;
+                var blockItem = pair.Item2;
+                blockItems.Add(blockItem);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlocksCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlocksCommand.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class RemoveBlocksCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private List<IItemFilterBlockBase> _removedItemFilterBlocks;
+        private List<int> _sourceIndexes;
+
+        public RemoveBlocksCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
+            _removedItemFilterBlocks = new List<IItemFilterBlockBase> { block };
+        }
+
+        public RemoveBlocksCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sourceIndexes = sourceIndexes;
+            _sourceIndexes.Sort();
+            _removedItemFilterBlocks = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                _removedItemFilterBlocks.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
+            }
+        }
+
+        public void Execute()
+        {
+            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
+            {
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
+            }
+        }
+
+        public void Undo()
+        {
+            for (var i = 0; i < _sourceIndexes.Count; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], _removedItemFilterBlocks[i]);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}
--- a/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveSectionCommand.cs
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveSectionCommand.cs
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class RemoveSectionCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private List<IItemFilterBlockBase> _removedItemFilterBlocks;
-        private int _sectionStart;
-        private int _sectionSize;
-
-        public RemoveSectionCommand(IItemFilterScript itemFilterScript, int sectionStart, int sectionSize)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sectionStart = sectionStart;
-            _sectionSize = sectionSize;
-            _removedItemFilterBlocks = new List<IItemFilterBlockBase>();
-            for(var i = 0; i < _sectionSize; i++)
-            {
-                _removedItemFilterBlocks.Add(_itemFilterScript.ItemFilterBlocks[_sectionStart + i]);
-            }
-        }
-        public void Execute()
-        {
-            for (var i = 0; i < _sectionSize; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sectionStart);
-            }
-        }
-
-        public void Undo()
-        {
-            for (var i = 0; i < _sectionSize; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_sectionStart + i, _removedItemFilterBlocks[i]);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}
--- a/Filtration.ObjectModel/Enums/BlockItemOrdering.cs
+++ b/Filtration.ObjectModel/Enums/BlockItemOrdering.cs
@@ -0,0 +1,41 @@
+using System.ComponentModel;
+
+namespace Filtration.ObjectModel.Enums
+{
+    public enum BlockItemOrdering
+    {
+        Action,
+        LinkedSockets,
+        Sockets,
+        Quality,
+        Identified,
+        Corrupted,
+        ElderItem,
+        ShaperItem,
+        MapTier,
+        ShapedMap,
+        ElderMap,
+        SocketGroup,
+        Height,
+        Width,
+        ItemLevel,
+        DropLevel,
+        GemLevel,
+        StackSize,
+        Rarity,
+        Class,
+        BaseType,
+        Prophecy,
+        HasExplicitMod,
+        SetTextColor,
+        SetBackgroundColor,
+        SetBorderColor,
+        SetFontSize,
+        PlayAlertSound,
+        PlayAlertSoundPositional,
+        DisableDropSound,
+        MinimapIcon,
+        PlayEffect,
+        CustomAlertSound
+    }
+}
--- a/Filtration.ObjectModel/Enums/BlockItemType.cs
+++ b/Filtration.ObjectModel/Enums/BlockItemType.cs
@@ -8,6 +8,7 @@
        Rarity,
        Class,
        BaseType,
+        Prophecy,
        Sockets,
        LinkedSockets,
        SocketGroup,
--- a/Filtration.ObjectModel/Enums/IconColor.cs
+++ b/Filtration.ObjectModel/Enums/IconColor.cs
@@ -2,16 +2,22 @@

 namespace Filtration.ObjectModel.Enums
 {
-    public enum IconColor
+	/// <summary>
+	/// Each of the colors supported by the MinimapIcon block rule.
+	/// </summary>
+	/// <remarks>
+	/// The ordering here should match the ordering of the colors within the source image.
+	/// </remarks>
+	public enum IconColor
    {
-        [Description("Red")]
+		[Description("Blue")]
+		Blue,
+		[Description("Green")]
+		Green,
+		[Description("Brown")]
+		Brown,
+		[Description("Red")]
        Red,
-        [Description("Green")]
-        Green,
-        [Description("Blue")]
-        Blue,
-        [Description("Brown")]
-        Brown,
        [Description("White")]
        White,
        [Description("Yellow")]
--- a/Filtration.ObjectModel/Enums/IconShape.cs
+++ b/Filtration.ObjectModel/Enums/IconShape.cs
@@ -2,7 +2,13 @@

 namespace Filtration.ObjectModel.Enums
 {
-    public enum IconShape
+	/// <summary>
+	/// Each of the shapes supported by the MinimapIcon block rule.
+	/// </summary>
+	/// <remarks>
+	/// The ordering here should match the ordering of the shapes within the source image.
+	/// </remarks>
+	public enum IconShape
    {
        [Description("Circle")]
        Circle,
--- a/Filtration.ObjectModel/Enums/IconSize.cs
+++ b/Filtration.ObjectModel/Enums/IconSize.cs
@@ -2,7 +2,13 @@

 namespace Filtration.ObjectModel.Enums
 {
-    public enum IconSize
+	/// <summary>
+	/// Each of the sizes supported by the MinimapIcon block rule.
+	/// </summary>
+	/// <remarks>
+	/// The ordering here should match the ordering of the sizes within the source image.
+	/// </remarks>
+	public enum IconSize
    {
        [Description("Largest")]
        Largest,
--- a/Filtration.ObjectModel/FilteredItem.cs
+++ b/Filtration.ObjectModel/FilteredItem.cs
@@ -24,8 +24,8 @@ namespace Filtration.ObjectModel
            ItemFilterBlock = itemFilterBlock;

            BlockAction = itemFilterBlock?.Action ?? BlockAction.Show;
-            BackgroundColor = itemFilterBlock?.DisplayBackgroundColor ?? new Color { A = 255, R = 0, G = 0, B = 0 };
-            BorderColor = itemFilterBlock?.DisplayBorderColor ?? new Color {A = 255, R = 0, G = 0, B = 0};
+            BackgroundColor = itemFilterBlock?.DisplayBackgroundColor ?? new Color { A = 240, R = 0, G = 0, B = 0 };
+            BorderColor = itemFilterBlock?.DisplayBorderColor ?? new Color {A = 240, R = 0, G = 0, B = 0};
            FontSize = (itemFilterBlock?.DisplayFontSize ?? 34) / 1.8;

            SetTextColor();
--- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj
+++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
@@ -31,31 +31,34 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.4.1.1\lib\net45\Castle.Windsor.dll</HintPath>
    </Reference>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web" />
    <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\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -89,6 +92,7 @@
    <Compile Include="BlockItemTypes\GemLevelBlockItem.cs" />
    <Compile Include="BlockItemTypes\HasExplicitModBlockItem.cs" />
    <Compile Include="BlockItemTypes\MapIconBlockItem.cs" />
+    <Compile Include="BlockItemTypes\ProphecyBlockItem.cs" />
    <Compile Include="BlockItemTypes\ShapedMapBlockItem.cs" />
    <Compile Include="BlockItemTypes\ShaperItemBlockItem.cs" />
    <Compile Include="BlockItemTypes\ElderItemBlockItem.cs" />
@@ -110,20 +114,19 @@
    <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
    <Compile Include="Commands\CommandManager.cs" />
    <Compile Include="Commands\ICommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveSectionToIndexCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\PasteBlockCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlockToBottomCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\AddBlockItemToBlocksCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlocksToIndexCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlocksToBottomCommand.cs" />
    <Compile Include="Commands\ItemFilterScript\AddCommentBlockCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlockDownCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlockUpCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlockToTopCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\PasteSectionCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\RemoveSectionCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlocksToTopCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\PasteBlocksCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveBlockItemFromBlocksCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveBlocksCommand.cs" />
    <Compile Include="Commands\ItemFilterScript\SetScriptDescriptionCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\RemoveBlockCommand.cs" />
    <Compile Include="Commands\ItemFilterScript\AddBlockCommand.cs" />
    <Compile Include="Commands\IUndoableCommand.cs" />
    <Compile Include="Enums\BlockAction.cs" />
+    <Compile Include="Enums\BlockItemOrdering.cs" />
    <Compile Include="Enums\BlockItemType.cs" />
    <Compile Include="Enums\EffectColor.cs" />
    <Compile Include="Enums\FilterPredicateOperator.cs" />
@@ -168,6 +171,7 @@
    <Compile Include="WindsorInstallers\ModelsInstaller.cs" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
--- a/Filtration.ObjectModel/IBlockItemWithTheme.cs
+++ b/Filtration.ObjectModel/IBlockItemWithTheme.cs
@@ -4,6 +4,6 @@ namespace Filtration.ObjectModel
 {
    public interface IBlockItemWithTheme : IItemFilterBlockItem
    {
-        ThemeComponent ThemeComponent { get; }
+        ThemeComponent ThemeComponent { get; set; }
    }
 }
--- a/Filtration.ObjectModel/IItemFilterBlockItem.cs
+++ b/Filtration.ObjectModel/IItemFilterBlockItem.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Windows.Media;
+using Filtration.ObjectModel.Enums;

 namespace Filtration.ObjectModel
 {
@@ -12,7 +13,8 @@ namespace Filtration.ObjectModel
        Color SummaryBackgroundColor { get; }
        Color SummaryTextColor { get; }
        int MaximumAllowed { get; }
-        int SortOrder { get; }
+        BlockItemOrdering SortOrder { get; }
        bool IsDirty { get; }
+        string Comment { get; set; }
    }
 }
--- a/Filtration.ObjectModel/ItemFilterBlock.cs
+++ b/Filtration.ObjectModel/ItemFilterBlock.cs
@@ -14,6 +14,7 @@ namespace Filtration.ObjectModel
    public interface IItemFilterBlock : IItemFilterBlockBase
    {
        bool Enabled { get; set; }
+        event EventHandler EnabledStatusChanged;
        string Description { get; set; }
        ItemFilterBlockGroup BlockGroup { get; set; }
        BlockAction Action { get; set; }
@@ -88,6 +89,7 @@ namespace Filtration.ObjectModel
        {
            BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
            BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
+            ActionBlockItem.PropertyChanged += OnActionBlockItemChanged;
            _enabled = true;
        }

@@ -95,6 +97,7 @@ namespace Filtration.ObjectModel
        {
            BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
            BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
+            ActionBlockItem.PropertyChanged += OnActionBlockItemChanged;
            _enabled = true;
        }

@@ -105,8 +108,16 @@ namespace Filtration.ObjectModel
            {
                _enabled = value;
                IsEdited = true;
+                EnabledStatusChanged?.Invoke(null, null);
+                if(BlockGroup != null && BlockGroup.IsEnableChecked != value)
+                {
+                    BlockGroup.IsEnableChecked = value;
+                }
            }
        }
+
+        public event EventHandler EnabledStatusChanged;
+
        public string Description
        {
            get { return _description; }
@@ -165,6 +176,13 @@ namespace Filtration.ObjectModel
        {
            IsEdited = true;
        }
+        private void OnActionBlockItemChanged(object sender, EventArgs e)
+        {
+            if (BlockGroup != null && BlockGroup.IsShowChecked != (Action == BlockAction.Show))
+            {
+                BlockGroup.IsShowChecked = (Action == BlockAction.Show);
+            }
+        }

        public bool AddBlockItemAllowed(Type type)
        {
@@ -198,14 +216,23 @@ namespace Filtration.ObjectModel
        
        private void OnBlockGroupStatusChanged(object sender, EventArgs e)
        {
-            if (BlockGroup.IsChecked == false && Action == BlockAction.Show)
+            if (BlockGroup.IsShowChecked == false && Action == BlockAction.Show)
            {
                Action = BlockAction.Hide;
            }
-            else if (BlockGroup.IsChecked && Action == BlockAction.Hide)
+            else if (BlockGroup.IsShowChecked == true && Action == BlockAction.Hide)
            {
                Action = BlockAction.Show;
            }
+
+            if (BlockGroup.IsEnableChecked == false && Enabled)
+            {
+                Enabled = false;
+            }
+            else if (BlockGroup.IsEnableChecked == true && !Enabled)
+            {
+                Enabled = true;
+            }
        }

        public Color DisplayTextColor
@@ -243,7 +270,7 @@ namespace Filtration.ObjectModel
            get
            {
                var backgroundColorBlockItem = BlockItems.OfType<BackgroundColorBlockItem>().FirstOrDefault();
-                return backgroundColorBlockItem?.Color ?? new Color { A = 255, R = 0, G = 0, B = 0 };
+                return backgroundColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 };
            }
        }

@@ -252,7 +279,7 @@ namespace Filtration.ObjectModel
            get
            {
                var borderColorBlockItem = BlockItems.OfType<BorderColorBlockItem>().FirstOrDefault();
-                return borderColorBlockItem?.Color ?? new Color { A = 255, R = 0, G = 0, B = 0 };
+                return borderColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 };
            }
        }

--- a/Filtration.ObjectModel/ItemFilterBlockGroup.cs
+++ b/Filtration.ObjectModel/ItemFilterBlockGroup.cs
@@ -5,31 +5,34 @@ namespace Filtration.ObjectModel
 {
    public class ItemFilterBlockGroup
    {
-        private bool _isChecked;
+        private bool? _isShowChecked;
+        private bool? _isEnableChecked;

-        public ItemFilterBlockGroup(string groupName, ItemFilterBlockGroup parent, bool advanced = false)
+        public ItemFilterBlockGroup(string groupName, ItemFilterBlockGroup parent, bool advanced = false, bool isLeafNode = false)
        {
            GroupName = groupName;
            ParentGroup = parent;
            Advanced = advanced;
            ChildGroups = new List<ItemFilterBlockGroup>();
+            IsLeafNode = isLeafNode;
        }

+        public string GroupName { get; }
+        public ItemFilterBlockGroup ParentGroup { get; set; }
+        public List<ItemFilterBlockGroup> ChildGroups { get; }
+        public bool Advanced { get; }
+        public bool IsLeafNode { get; }
+
        public event EventHandler BlockGroupStatusChanged;

-        public string GroupName { get; }
-        public ItemFilterBlockGroup ParentGroup { get; }
-        public List<ItemFilterBlockGroup> ChildGroups { get; }
-        public bool Advanced { get; }
-
-        public bool IsChecked
+        public bool? IsShowChecked
        {
-            get { return _isChecked; }
+            get { return _isShowChecked; }
            set
            {
-                if (value != _isChecked)
+                if (value != _isShowChecked)
                {
-                    _isChecked = value;
+                    _isShowChecked = value;
                    // Raise an event to let blocks that have this block group assigned that
                    // they might need to change their Action due to the block group status changing.
                    BlockGroupStatusChanged?.Invoke(null, null);
@@ -37,20 +40,85 @@ namespace Filtration.ObjectModel
            }
        }

+        public bool? IsEnableChecked
+        {
+            get { return _isEnableChecked; }
+            set
+            {
+                if (value != _isEnableChecked)
+                {
+                    _isEnableChecked = value;
+                    // Raise an event to let blocks that have this block group assigned that
+                    // they might need to change their Enabled due to the block group status changing.
+                    BlockGroupStatusChanged?.Invoke(null, null);
+                }
+            }
+        }
+
+        public void ClearStatusChangeSubscribers()
+        {
+            BlockGroupStatusChanged = null;
+        }
+
+        public void AddOrJoinBlockGroup(ItemFilterBlockGroup blockGroup)
+        {
+            var childIndex = ChildGroups.FindIndex(item => item.GroupName.Equals(blockGroup.GroupName));
+            if (!blockGroup.IsLeafNode && childIndex >= 0)
+            {
+                while(blockGroup.ChildGroups.Count > 0)
+                {
+                    ChildGroups[childIndex].AddOrJoinBlockGroup(blockGroup.ChildGroups[0]);
+                }
+            }
+            else
+            {
+                if(blockGroup.ParentGroup != null)
+                {
+                    blockGroup.ParentGroup.ChildGroups.Remove(blockGroup);
+                }
+                blockGroup.ParentGroup = this;
+                ChildGroups.Add(blockGroup);
+            }
+        }
+
+        public void DetachSelf(bool keepChildren)
+        {
+            if(ParentGroup == null)
+                return;
+
+            if(IsLeafNode && ParentGroup.ParentGroup != null && ParentGroup.ChildGroups.Count < 2)
+            {
+                ParentGroup.DetachSelf(false);
+            }
+            else
+            {
+                ParentGroup.ChildGroups.Remove(this);
+
+                if (keepChildren)
+                {
+                    foreach(var child in ChildGroups)
+                    {
+                        ParentGroup.AddOrJoinBlockGroup(child);
+                    }
+                }
+
+                ParentGroup = null;
+            }
+        }
+
        public override string ToString()
        {
-            var currentBlockGroup = this;
+            if(ParentGroup == null)
+            {
+                return string.Empty;
+            }

            var outputString = (Advanced ? "~" : string.Empty) + GroupName;

-            // TODO: This is retarded, fix this.
-            if (currentBlockGroup.ParentGroup != null)
+            var parentOutput = ParentGroup.ToString();
+            if(!string.IsNullOrWhiteSpace(parentOutput))
            {
-                while (currentBlockGroup.ParentGroup.ParentGroup != null)
-                {
-                    outputString = (currentBlockGroup.ParentGroup.Advanced ? "~" : string.Empty) + currentBlockGroup.ParentGroup.GroupName + " - " + outputString;
-                    currentBlockGroup = currentBlockGroup.ParentGroup;
-                }
+                outputString = parentOutput + (IsLeafNode ? string.Empty : " - " + outputString);
            }

            return outputString;
--- a/Filtration.ObjectModel/PathOfExileNamedColors.cs
+++ b/Filtration.ObjectModel/PathOfExileNamedColors.cs
@@ -8,36 +8,36 @@ namespace Filtration.ObjectModel
    {
        public static Dictionary<PathOfExileNamedColor, Color> Colors => new Dictionary<PathOfExileNamedColor, Color>
        {
-            {PathOfExileNamedColor.Default, new Color {A = 255, R = 127, G = 127, B = 127}},
-            {PathOfExileNamedColor.ValueDefault, new Color {A = 255, R = 255, G = 255, B = 255}},
-            {PathOfExileNamedColor.Pink, new Color {A = 255, R = 255, G = 192, B = 203}},
-            {PathOfExileNamedColor.DodgerBlue, new Color {A = 255, R = 30, G = 144, B = 255}},
-            {PathOfExileNamedColor.Fire, new Color {A = 255, R = 150, G = 0, B = 0}},
-            {PathOfExileNamedColor.Cold, new Color {A = 255, R = 54, G = 100, B = 146}},
-            {PathOfExileNamedColor.Lightning, new Color {A = 255, R = 255, G = 215, B = 0}},
-            {PathOfExileNamedColor.Chaos, new Color {A = 255, R = 208, G = 32, B = 144}},
-            {PathOfExileNamedColor.Augmented, new Color {A = 255, R = 136, G = 136, B = 255}},
-            {PathOfExileNamedColor.Crafted, new Color {A = 255, R = 184, G = 218, B = 242}},
-            {PathOfExileNamedColor.Unmet, new Color {A = 255, R = 210, G = 0, B = 0}},
-            {PathOfExileNamedColor.UniqueItem, new Color {A = 255, R = 175, G = 96, B = 37}},
-            {PathOfExileNamedColor.RareItem, new Color {A = 255, R = 255, G = 255, B = 119}},
-            {PathOfExileNamedColor.MagicItem, new Color {A = 255, R = 136, G = 136, B = 255}},
-            {PathOfExileNamedColor.WhiteItem, new Color {A = 255, R = 200, G = 200, B = 200}},
-            {PathOfExileNamedColor.GemItem, new Color {A = 255, R = 27, G = 162, B = 155}},
-            {PathOfExileNamedColor.CurrencyItem, new Color {A = 255, R = 170, G = 158, B = 130}},
-            {PathOfExileNamedColor.QuestItem, new Color {A = 255, R = 74, G = 230, B = 58}},
-            {PathOfExileNamedColor.NemesisMod, new Color {A = 255, R = 255, G = 200, B = 0}},
+            {PathOfExileNamedColor.Default, new Color {A = 240, R = 127, G = 127, B = 127}},
+            {PathOfExileNamedColor.ValueDefault, new Color {A = 240, R = 255, G = 255, B = 255}},
+            {PathOfExileNamedColor.Pink, new Color {A = 240, R = 255, G = 192, B = 203}},
+            {PathOfExileNamedColor.DodgerBlue, new Color {A = 240, R = 30, G = 144, B = 255}},
+            {PathOfExileNamedColor.Fire, new Color {A = 240, R = 150, G = 0, B = 0}},
+            {PathOfExileNamedColor.Cold, new Color {A = 240, R = 54, G = 100, B = 146}},
+            {PathOfExileNamedColor.Lightning, new Color {A = 240, R = 255, G = 215, B = 0}},
+            {PathOfExileNamedColor.Chaos, new Color {A = 240, R = 208, G = 32, B = 144}},
+            {PathOfExileNamedColor.Augmented, new Color {A = 240, R = 136, G = 136, B = 255}},
+            {PathOfExileNamedColor.Crafted, new Color {A = 240, R = 184, G = 218, B = 242}},
+            {PathOfExileNamedColor.Unmet, new Color {A = 240, R = 210, G = 0, B = 0}},
+            {PathOfExileNamedColor.UniqueItem, new Color {A = 240, R = 175, G = 96, B = 37}},
+            {PathOfExileNamedColor.RareItem, new Color {A = 240, R = 255, G = 255, B = 119}},
+            {PathOfExileNamedColor.MagicItem, new Color {A = 240, R = 136, G = 136, B = 255}},
+            {PathOfExileNamedColor.WhiteItem, new Color {A = 240, R = 200, G = 200, B = 200}},
+            {PathOfExileNamedColor.GemItem, new Color {A = 240, R = 27, G = 162, B = 155}},
+            {PathOfExileNamedColor.CurrencyItem, new Color {A = 240, R = 170, G = 158, B = 130}},
+            {PathOfExileNamedColor.QuestItem, new Color {A = 240, R = 74, G = 230, B = 58}},
+            {PathOfExileNamedColor.NemesisMod, new Color {A = 240, R = 255, G = 200, B = 0}},
            {PathOfExileNamedColor.NemesisModOutline, new Color {A = 220, R = 255, G = 40, B = 0}},
-            {PathOfExileNamedColor.Title, new Color {A = 255, R = 231, G = 180, B = 120}},
-            {PathOfExileNamedColor.Corrupted, new Color {A = 255, R = 210, G = 0, B = 0}},
-            {PathOfExileNamedColor.Favour, new Color {A = 255, R = 170, G = 158, B = 130}},
-            {PathOfExileNamedColor.SupporterPackNewItem, new Color {A = 255, R = 180, G = 96, B = 0}},
-            {PathOfExileNamedColor.SupporterPackItem, new Color {A = 255, R = 163, G = 141, B = 109}},
-            {PathOfExileNamedColor.BloodlineMod, new Color {A = 255, R = 210, G = 0, B = 220}},
+            {PathOfExileNamedColor.Title, new Color {A = 240, R = 231, G = 180, B = 120}},
+            {PathOfExileNamedColor.Corrupted, new Color {A = 240, R = 210, G = 0, B = 0}},
+            {PathOfExileNamedColor.Favour, new Color {A = 240, R = 170, G = 158, B = 130}},
+            {PathOfExileNamedColor.SupporterPackNewItem, new Color {A = 240, R = 180, G = 96, B = 0}},
+            {PathOfExileNamedColor.SupporterPackItem, new Color {A = 240, R = 163, G = 141, B = 109}},
+            {PathOfExileNamedColor.BloodlineMod, new Color {A = 240, R = 210, G = 0, B = 220}},
            {PathOfExileNamedColor.BloodlineModOutline, new Color {A = 200, R = 74, G = 0, B = 160}},
-            {PathOfExileNamedColor.TormentMod, new Color {A = 255, R = 50, G = 230, B = 100}},
+            {PathOfExileNamedColor.TormentMod, new Color {A = 240, R = 50, G = 230, B = 100}},
            {PathOfExileNamedColor.TormentModOutline, new Color {A = 200, R = 0, G = 100, B = 150}},
-            {PathOfExileNamedColor.CantTradeorModify, new Color {A = 255, R = 210, G = 0, B = 0}},
+            {PathOfExileNamedColor.CantTradeorModify, new Color {A = 240, R = 210, G = 0, B = 0}},
        };

    }
--- a/Filtration.ObjectModel/ThemeEditor/ColorThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/ColorThemeComponent.cs
@@ -9,6 +9,10 @@ namespace Filtration.ObjectModel.ThemeEditor
    {
        private Color _color;

+        private ColorThemeComponent()
+        {
+        }
+
        public ColorThemeComponent(ThemeComponentType componentType, string componentName, Color componentColor)
        {
            if (componentName == null || componentColor == null)
@@ -23,7 +27,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public Color Color
        {
-            get { return _color; }
+            get => _color;
            set
            {
                _color = value;
--- a/Filtration.ObjectModel/ThemeEditor/EffectColorThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/EffectColorThemeComponent.cs
@@ -9,22 +9,21 @@ namespace Filtration.ObjectModel.ThemeEditor
        private EffectColor _effectColor;
        private bool _temporary;

+        private EffectColorThemeComponent()
+        {
+        }
+
        public EffectColorThemeComponent(ThemeComponentType componentType, string componentName, EffectColor componentEffectColor, bool componentTemporary)
        {
-            if (componentName == null)
-            {
-                throw new ArgumentException("Null parameters not allowed in EffectColorThemeComponent constructor");
-            }
-
            ComponentType = componentType;
-            ComponentName = componentName;
+            ComponentName = componentName ?? throw new ArgumentException("Null parameters not allowed in EffectColorThemeComponent constructor");
            EffectColor = componentEffectColor;
            Temporary = componentTemporary;
        }

        public EffectColor EffectColor
        {
-            get { return _effectColor; }
+            get => _effectColor;
            set
            {
                _effectColor = value;
@@ -35,7 +34,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public bool Temporary
        {
-            get { return _temporary; }
+            get => _temporary;
            set
            {
                _temporary = value;
--- a/Filtration.ObjectModel/ThemeEditor/IconThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/IconThemeComponent.cs
@@ -10,6 +10,10 @@ namespace Filtration.ObjectModel.ThemeEditor
        private IconColor _iconColor;
        private IconShape _iconShape;

+        private IconThemeComponent()
+        {
+        }
+
        public IconThemeComponent(ThemeComponentType componentType, string componentName, IconSize componentIconSize, IconColor componentIconColor, IconShape componentIconShape)
        {
            if (componentName == null)
@@ -26,7 +30,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public IconSize IconSize
        {
-            get { return _iconSize; }
+            get => _iconSize;
            set
            {
                _iconSize = value;
@@ -37,7 +41,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public IconColor IconColor
        {
-            get { return _iconColor; }
+            get => _iconColor;
            set
            {
                _iconColor = value;
@@ -48,7 +52,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public IconShape IconShape
        {
-            get { return _iconShape; }
+            get => _iconShape;
            set
            {
                _iconShape = value;
--- a/Filtration.ObjectModel/ThemeEditor/IntegerThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/IntegerThemeComponent.cs
@@ -9,6 +9,10 @@ namespace Filtration.ObjectModel.ThemeEditor
    {
        private int _value;

+        private IntegerThemeComponent()
+        {
+        }
+
        public IntegerThemeComponent(ThemeComponentType componentType, string componentName, int componentValue)
        {
            if (componentName == null)
@@ -23,7 +27,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public int Value
        {
-            get { return _value; }
+            get => _value;
            set
            {
                _value = value;
--- a/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
@@ -9,6 +9,10 @@ namespace Filtration.ObjectModel.ThemeEditor
        private string _value;
        private int _secondValue;

+        private StrIntThemeComponent()
+        {
+        }
+
        public StrIntThemeComponent(ThemeComponentType componentType, string componentName, string componentValue, int componentSecondValue)
        {
            if (componentName == null || componentValue == null)
@@ -24,7 +28,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public string Value
        {
-            get { return _value; }
+            get => _value;
            set
            {
                _value = value;
@@ -35,7 +39,7 @@ namespace Filtration.ObjectModel.ThemeEditor

        public int SecondValue
        {
-            get { return _secondValue; }
+            get => _secondValue;
            set
            {
                _secondValue = value;
--- a/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Linq;
+using System.Xml.Serialization;
 using Filtration.ObjectModel.Enums;
 using GalaSoft.MvvmLight.Command;
 using Microsoft.Win32;
@@ -12,6 +14,10 @@ namespace Filtration.ObjectModel.ThemeEditor
        private string _value;
        public static ObservableCollection<string> _customSoundsAvailable;

+        private StringThemeComponent()
+        {
+        }
+
        public StringThemeComponent(ThemeComponentType componentType, string componentName, string componentValue)
        {
            if (componentName == null || componentValue == null)
@@ -25,13 +31,34 @@ namespace Filtration.ObjectModel.ThemeEditor

            if (_customSoundsAvailable == null || _customSoundsAvailable.Count < 1)
            {
-                _customSoundsAvailable = new ObservableCollection<string> {
-                    "1maybevaluable.mp3", "2currency.mp3", "3uniques.mp3", "4maps.mp3", "5highmaps.mp3",
-                    "6veryvaluable.mp3", "7chancing.mp3", "12leveling.mp3", "placeholder.mp3"
-                };
+
+                _customSoundsAvailable = new ObservableCollection<string>();
+
+                var poeFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+                if(System.IO.Directory.Exists(poeFolderPath))
+                {
+                    var poeFolderFiles = System.IO.Directory.GetFiles(poeFolderPath).Where(
+                        s => s.EndsWith(".mp3")
+                        || s.EndsWith(".wav")
+                        || s.EndsWith(".wma")
+                        || s.EndsWith(".3gp")
+                        || s.EndsWith(".aag")
+                        || s.EndsWith(".m4a")
+                        || s.EndsWith(".ogg")
+                    ).OrderBy(f => f);
+
+                    foreach (var file in poeFolderFiles)
+                    {
+                        _customSoundsAvailable.Add(file.Replace(poeFolderPath, ""));
+                    }
+                }
            }

-            if (_customSoundsAvailable.IndexOf(Value) < 0)
+            if(string.IsNullOrWhiteSpace(Value))
+            {
+                Value = _customSoundsAvailable.Count > 0 ? _customSoundsAvailable[0] : "";
+            }
+            else if (_customSoundsAvailable.IndexOf(Value) < 0)
            {
                _customSoundsAvailable.Add(Value);
            }
@@ -39,13 +66,14 @@ namespace Filtration.ObjectModel.ThemeEditor
            CustomSoundFileDialogCommand = new RelayCommand(OnCustomSoundFileDialog);
        }

+        [XmlIgnore]
        public RelayCommand CustomSoundFileDialogCommand { get; set; }

        public ObservableCollection<string> CustomSoundsAvailable => _customSoundsAvailable;

        public string Value
        {
-            get { return _value; }
+            get => _value;
            set
            {
                _value = value;
@@ -56,12 +84,11 @@ namespace Filtration.ObjectModel.ThemeEditor

        private void OnCustomSoundFileDialog()
        {
-            OpenFileDialog fileDialog = new OpenFileDialog();
-            fileDialog.DefaultExt = ".mp3";
-            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            OpenFileDialog fileDialog = new OpenFileDialog {DefaultExt = ".mp3"};
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\My Games\Path of Exile\";
            fileDialog.InitialDirectory = poePath;

-            Nullable<bool> result = fileDialog.ShowDialog();
+            bool? result = fileDialog.ShowDialog();
            if (result == true)
            {
                var fileName = fileDialog.FileName;
--- a/Filtration.ObjectModel/ThemeEditor/Theme.cs
+++ b/Filtration.ObjectModel/ThemeEditor/Theme.cs
@@ -7,13 +7,17 @@ using Filtration.ObjectModel.Enums;
 namespace Filtration.ObjectModel.ThemeEditor
 {
    [Serializable]
+    [XmlInclude(typeof(ColorThemeComponent))]
+    [XmlInclude(typeof(EffectColorThemeComponent))]
+    [XmlInclude(typeof(IconThemeComponent))]
+    [XmlInclude(typeof(IntegerThemeComponent))]
+    [XmlInclude(typeof(StringThemeComponent))]
+    [XmlInclude(typeof(StrIntThemeComponent))]
    public class Theme
    {
-        private readonly ThemeComponentCollection _components; 
-
        public Theme()
        {
-            _components = new ThemeComponentCollection { IsMasterCollection = false};
+            Components = new ThemeComponentCollection { IsMasterCollection = false};
        }

        public string Name { get; set; }
@@ -21,28 +25,28 @@ namespace Filtration.ObjectModel.ThemeEditor
        [XmlIgnore]
        public string FilePath { get; set; }

-        public ThemeComponentCollection Components => _components;
+        public ThemeComponentCollection Components { get; set; }

        public bool ComponentExists(ThemeComponentType componentType, string componentName)
        {
            var componentCount =
-                _components.Count(c => c.ComponentName == componentName && c.ComponentType == componentType);
+                Components.Count(c => c.ComponentName == componentName && c.ComponentType == componentType);
            return componentCount > 0;
        }

        public void AddComponent(ThemeComponentType componentType, string componentName, Color componentColor)
        {
-            _components.Add(new ColorThemeComponent(componentType, componentName, componentColor));
+            Components.Add(new ColorThemeComponent(componentType, componentName, componentColor));
        }

        public void AddComponent(ThemeComponentType componentType, string componentName, int componentValue)
        {
-            _components.Add(new IntegerThemeComponent(componentType, componentName, componentValue));
+            Components.Add(new IntegerThemeComponent(componentType, componentName, componentValue));
        }

        public void AddComponent(ThemeComponentType componentType, string componentName, string componentValue, int componentSecondValue)
        {
-            _components.Add(new StrIntThemeComponent(componentType, componentName, componentValue, componentSecondValue));
+            Components.Add(new StrIntThemeComponent(componentType, componentName, componentValue, componentSecondValue));
        }
    }
 }
--- a/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
+++ b/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
@@ -93,5 +93,10 @@ namespace Filtration.ObjectModel.ThemeEditor
                Items.Count(c => c.ComponentName == componentName && c.ComponentType == componentType);
            return componentCount > 0;
        }
+
+        public bool ComponentExists(ThemeComponent themeComponent)
+        {
+            return ComponentExists(themeComponent.ComponentType, themeComponent.ComponentName);
+        }
    }
 }
--- a/Filtration.ObjectModel/app.config
+++ b/Filtration.ObjectModel/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Filtration.ObjectModel/packages.config
+++ b/Filtration.ObjectModel/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.0" targetFramework="net461" />
-  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net461" />
-  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
+  <package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
 </packages>
--- a/Filtration.Parser.Interface/Filtration.Parser.Interface.csproj
+++ b/Filtration.Parser.Interface/Filtration.Parser.Interface.csproj
@@ -46,7 +46,9 @@
    <Compile Include="Services\IItemFilterBlockTranslator.cs" />
    <Compile Include="Services\IItemFilterScriptTranslator.cs" />
  </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
--- a/Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs
+++ b/Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs
@@ -7,6 +7,6 @@ namespace Filtration.Parser.Interface.Services
    {
        void Initialise(ItemFilterBlockGroup rootBlockGroup);
        void Cleanup();
-        ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings);
+        ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings, bool show, bool enabled);
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Wallis	892b2f15f2	* Removed old unused user settings * Fixed prompt for filter directory selection appearing incorrectly on startup * Bumped version to 1.1.0-beta6	2018-12-05 13:03:51 +00:00
Ben Wallis	042e5b41f9	Removed test projects from SquirrelReleasify build config	2018-12-05 12:42:47 +00:00
Ben Wallis	5fc260dbb2	Bumped version to 1.1.0-beta5	2018-12-05 12:42:01 +00:00
Ben Wallis	3de33e9447	Added .log as excluded filetype for installer	2018-12-05 12:33:34 +00:00
Ben Wallis	37ad9ac42e	Fixed AlertSounds not being included in installer	2018-12-05 12:32:28 +00:00
Glen M	fbd02702b0	Add enable/disable DropSound buttons. (#112 ) * Add enable/disable DropSound buttons. * Add undo/redo support for the DisableSound commands.	2018-12-05 12:31:47 +00:00
Ben Wallis	a20c988380	Bumped version to 1.1.0-beta4	2018-12-05 07:04:35 +00:00
Glen M	7ce5aaa861	Support for Path of Exile 3.5 and Betrayal league. (#108 ) * Fix #107 by pulling SortOrder form an enum. * Add initial support for the Prophecy block item. * Update the static data. * Hook Prophecy data into the static data service. * Fill out the initial prophecy data.	2018-12-05 06:59:10 +00:00
Glen M	4b6cee9d94	Add a few missing item classes. (#106 )	2018-12-04 19:30:25 +00:00
Ben Wallis	6fb0ec8084	Fixed EditableListBoxControl mouse wheel scrolling	2018-12-03 17:41:44 +00:00
Ben Wallis	a13dc44a7d	Added comments	2018-12-03 16:31:19 +00:00
Ben Wallis	05b729edf8	Fixed ScrollViewer in ItemFilterBlockView handling mouse wheel events (#105 )	2018-12-03 16:28:22 +00:00
Ben Wallis	876e98437e	Shortened/fixed SummaryText for several block items	2018-12-02 21:51:19 +00:00
Ben Wallis	30e76e333c	* Bumped version to 1.1.0-beta3 * Fixed Switch to Appearance/Regular Block Items text overlapping block item controls * Added Enable/Disable toggle button to Appearance block items control * Added horizontal scrollbar to block items view * Moved Enable/Disable toggle button to separate user control(previously it was only visible when viewing Regular block items) * Added DesignTimeItemFilterBlockViewModel	2018-12-02 21:36:01 +00:00
Glen M	f840fb69ad	Throttle selections to improve Select All performance. (#104 ) Throttle selections to improve Select All performance in ItemFilterScriptViewModel.	2018-12-02 16:30:50 +00:00
Ben Wallis	ae98c2d5de	Bumped version to 1.1.0-beta2	2018-11-28 22:29:52 +00:00
Ben Wallis	ba6d50cf45	* Added auto-expand sections on open setting * Changed all sections to be expanded unless the new setting is disabled * Tidied up some casting in ItemFilterScriptViewModel by using pattern matching	2018-11-28 22:28:21 +00:00
Ben Wallis	6838cb12a8	Fixed a crash when loading filters with custom sounds	2018-11-28 22:03:27 +00:00
Ben Wallis	fd2023598b	#83 - Fixed theme serialization	2018-11-28 21:50:42 +00:00
Ben Wallis	e3b1a5dba7	Updated nuspec release notes	2018-11-27 21:56:20 +00:00
Ben Wallis	25c25c2a1d	* Removed incorrect use of async method in MainWindowViewModel constructor * Moved script/theme loading code to new ScriptLoadingService class	2018-11-27 21:48:36 +00:00
Ben Wallis	e5386132c3	Updated Squirrel from 1.8.0 to 1.9.0	2018-11-27 21:34:58 +00:00
Ben Wallis	784f0227ee	Updated NuGet packages	2018-11-27 21:26:04 +00:00
Ben Wallis	fb37faa7bc	* Moved item filter script directory handling code to new ItemFilterScriptDirectorySerivce class * Fixed issue #94 where the user was prompted to select their Path of Exile data directory after every upgrade. * The default Path of Exile data directory is now automatically chosen on first run if it exists * Moved CommonOpenFileDialog usage to new DialogService class * Changed Custom Sounds code in ItemFilterScriptViewModel to use ItemFilterScriptDirectory instead of DefaultPathOfExileDirectory * Moved Custom Sounds code from constructor to Initialise method to prevent the files being enumerated before the directory is set during startup	2018-11-27 20:40:00 +00:00
azakhi	63236769aa	Add clear styles button (#99 )	2018-11-26 21:26:04 +00:00
azakhi	05a994f562	Remember all open scripts (#100 )	2018-11-26 21:25:10 +00:00
azakhi	124786dd0d	Fix block group changes not affecting script (#101 )	2018-11-26 21:24:27 +00:00
Ben Wallis	e516ded476	Bumped version to 1.1.0-beta1	2018-09-30 14:06:33 +01:00
Ben Wallis	f238bbf856	Fixed a crash on exit caused by a null SelectedBlockViewModel	2018-09-30 14:02:47 +01:00
Ben Wallis	a0191576f0	Update README.md	2018-09-30 13:57:35 +01:00
Ben Wallis	1d96b69800	Update README.md	2018-09-30 12:51:47 +01:00
Ben Wallis	99abb276af	Merge branch 'bugfix/FixBlockOutputPreview'	2018-09-30 12:49:35 +01:00
Ben Wallis	073fe553ea	Made block output preview pane text selectable	2018-09-30 12:48:24 +01:00
Ben Wallis	0d81d0ef54	Fixed block output preview	2018-09-30 12:38:26 +01:00
Ben Wallis	f04f9c20ed	Update README.md	2018-09-30 11:57:40 +01:00
Ben Wallis	f71ba74425	Update README.md	2018-09-30 11:57:24 +01:00
Ben Wallis	04cbf218f3	Bumped version to 1.0.0	2018-09-30 11:43:22 +01:00
Ben Wallis	6007306346	Added 1.0.0 release notes	2018-09-28 20:44:25 +01:00
Ben Wallis	992bd21570	Fixed UpdateService which was erroneously using the local update manager instead of the GitHub update manager for several parts of the update process	2018-09-28 20:24:09 +01:00
Ben Wallis	7d8b32b2e7	Fixup after merging missed commit from master	2018-09-28 17:58:16 +01:00
Ben Wallis	ac904c31ff	* Added default colours for TextColor, BorderColor and BackgroundColor block items (previously the default color was completely transparent) * Bumped version to 1.0.0-beta3	2018-09-28 17:47:23 +01:00
Ben Wallis	f51fe315ad	Updated Filtration.nuspec for 1.0.0-beta2	2018-09-28 17:27:07 +01:00
Ben Wallis	3ce2e12f56	Disabled setting themes for MinimapIcon, PlayEffect and SetFontSize blocks (temporary fix for issue #68 )	2018-09-28 17:20:42 +01:00
Ben Wallis	43e5b30080	Merge pull request #88 from GlenCFL/validate-lists Audit and Validate the Data Files	2018-09-27 12:38:58 +01:00
GlenCFL	bc99339390	Audit the static data files.	2018-09-27 07:21:32 -04:00
Ben Wallis	781faae85d	Merge pull request #87 from GlenCFL/mod-completions Provide autocompletions for item mods.	2018-09-27 07:08:47 +01:00
GlenCFL	c926808878	Remove the now irrelevant static data test.	2018-09-26 23:40:34 -04:00
GlenCFL	24d9f97717	Provide autocompletions for item mods.	2018-09-26 23:35:39 -04:00
Ben Wallis	7e4e6fe42e	Refactored StaticDataService to use local resources for ItemBaseTypes.txt and ItemClasses.txt instead of the old files in APPDATA that aren't used anymore. Bumped develop version to 1.0.0-beta2	2018-09-26 19:12:31 +01:00
Ben Wallis	c6d75cfff6	Implemented auto-update using Squirrel Reworked SettingsPageView to not need a Save Button and added a folder browser control	2018-09-26 18:40:54 +01:00
Ben Wallis	2f30eade7c	Merge pull request #84 from azakhi/bugfix/fix-child-firing-block-selection-event Fix block items firing blocklist selectionchanged	2018-09-21 17:43:07 +01:00
azakhi	e719f0bce0	Fix block items firing blocklist selectionchanged	2018-09-21 19:28:37 +03:00
Ben Wallis	dffbbf3591	Merge pull request #82 from azakhi/bugfix/81-increase-maximum-explicit-mod-rule Increase HasExplicitMod limit to 8	2018-09-17 12:13:26 +01:00
azakhi	07a7e8d05c	Increase HasExplicitMod limit to 8	2018-09-17 10:37:25 +03:00
Ben Wallis	1ba224906c	Merge pull request #80 from azakhi/feature/improve-section-wide-actions Improve commands & add multiple selection feature	2018-09-16 19:19:24 +01:00
azakhi	32523787d2	Improve commands & add multiple selection feature	2018-09-13 17:34:16 +03:00
Ben Wallis	ac6943d73b	Replaced AlertSound .wav files with .mp3 files (reduces installer size by 50%~)	2018-09-08 22:34:41 +01:00
Ben Wallis	36c0aaea17	Bumped version to 0.21	2018-09-08 10:26:45 +01:00
Ben Wallis	4b38a6a4e0	Bumped version to 0.20	2018-09-08 10:14:56 +01:00
Ben Wallis	9c44dd7e7d	Merge pull request #79 from azakhi/feature/12-13-preserve-user-ui-choices Preserve UI states and last active document	2018-09-08 10:13:36 +01:00
Ben Wallis	18c878e350	Merge pull request #75 from azakhi/feature/40-add-enable-disable-to-group-browser Feature/40 add enable disable to group browser	2018-09-08 10:12:04 +01:00
Ben Wallis	5d30888597	Merge pull request #72 from azakhi/feature/improve-pasting-multiple-blocks Improve pasting to support different copy sources	2018-09-08 09:56:14 +01:00
azakhi	bfd722d362	Add add/delete block group support to blocks	2018-09-07 20:36:27 +03:00
azakhi	d23741555a	Fix tests	2018-09-07 20:36:27 +03:00
azakhi	820aa5499e	Fix block group creation	2018-09-07 20:36:27 +03:00
azakhi	1ee38b4c0e	Fix block group output & expand/collapse all	2018-09-07 20:36:27 +03:00
azakhi	4bed777427	Improve parent group status logic	2018-09-07 20:36:27 +03:00
azakhi	1f6cbeec86	Add enable/disable checkbox to group browser	2018-09-07 20:36:27 +03:00
azakhi	550a2d8f25	Preserve UI states and last active document	2018-09-07 19:57:32 +03:00
Ben Wallis	ae38197052	Merge pull request #77 from GlenCFL/save-state Set the state to dirty on using editing commands.	2018-09-07 15:05:43 +01:00
GlenCFL	4fd4ffc520	Set the state to dirty on using editing commands.	2018-09-07 04:59:57 -04:00
Ben Wallis	e15efe4e15	Merge pull request #76 from GlenCFL/transparency_rework Make the minimap icons transparent. Take 2.	2018-09-07 08:13:27 +01:00
GlenCFL	196db4c730	Use Enum.IsDefined as suggested.	2018-09-07 03:01:45 -04:00
GlenCFL	910b2b8c7f	Make the minimap icons transparent.	2018-09-06 20:01:16 -04:00
Ben Wallis	b31ce1d843	Merge pull request #74 from azakhi/feature/19-add-buttons-to-group-browser Add clear all button & missing functions	2018-09-05 16:01:46 +01:00
azakhi	99a011c78c	Add clear all button & missing functions	2018-09-05 17:55:16 +03:00
azakhi	69ce542c1a	Improve pasting to support different copy sources	2018-09-04 14:18:11 +03:00
Ben Wallis	2ff9ebf242	Merge pull request #71 from azakhi/bugfix/70-fix-max-quality Increase maximum quality to 30	2018-09-04 06:45:18 +01:00
azakhi	0eff63d706	Increase maximum quality to 30	2018-09-04 08:34:26 +03:00
Ben Wallis	1b8f37ca3a	Merge pull request #65 from azakhi/bugfix/64-fix-group-browser-filter Fix block group browser not filtering	2018-09-03 18:55:19 +01:00
Ben Wallis	b4f02f872e	Merge pull request #67 from azakhi/bugfix/10-fix-default-opacity Change default alpha value to 240	2018-09-03 18:53:09 +01:00
azakhi	cfef82e53a	Change default alpha value to 240	2018-09-03 15:37:10 +03:00
azakhi	bdd121f48c	Fix block group browser not filtering	2018-09-03 11:26:13 +03:00
Ben Wallis	0209de3817	Update README.md	2018-09-01 10:15:38 +01:00
Ben Wallis	1e26a2ae3e	Merge pull request #62 from GlenCFL/fix-reopen Fix the reading of CustomAlertSounds containing path separators.	2018-09-01 09:57:54 +01:00
GlenCFL	54b72e44b0	Reposition the new custom sound tests.	2018-08-31 21:06:51 -04:00
GlenCFL	24df1d7687	Fix the reading of CustomAlertSounds containing path separators.	2018-08-31 20:01:21 -04:00
Ben Wallis	7162e16b49	Merge pull request #59 from azakhi/improvements Improvements	2018-08-31 15:28:18 +01:00
azakhi	324ce4d0b3	Fix binding problem	2018-08-31 17:05:21 +03:00
azakhi	de489e8b2c	Fix folder bug	2018-08-31 16:54:24 +03:00
azakhi	341b1d1eb2	Make section header parsing more generic	2018-08-31 16:13:57 +03:00
azakhi	6be29dbd28	Add tests and fix theme bug	2018-08-31 16:02:17 +03:00
azakhi	3851ad51e1	Add support for comments between rules	2018-08-31 14:22:26 +03:00
azakhi	65d3e07156	Add comment support for all rule types	2018-08-31 11:21:43 +03:00
azakhi	a86ab3ec8d	Use available sounds as combobox source	2018-08-31 09:40:48 +03:00
azakhi	41722e8a57	Update icons	2018-08-31 09:00:31 +03:00
Ben Wallis	3cb0a041d7	Update README.md	2018-08-30 19:31:45 +01:00
Ben Wallis	c8778bb1eb	bumped version to 0.19	2018-08-30 19:28:32 +01:00
Ben Wallis	8e849d6a8f	Merge pull request #57 from azakhi/master Fix play effect parsing bug	2018-08-30 19:26:37 +01:00
azakhi	0d3f01a856	Update item classes	2018-08-30 21:23:34 +03:00
azakhi	178ff579c6	Fix PlayEffect parsing	2018-08-30 21:22:20 +03:00
Ben Wallis	30aa52e788	updated Delve Socketable Currency in ItemClasses	2018-08-30 19:20:44 +01:00