Merge branch 'master' of https://github.com/ben-wallis/Filtration.git

Style tweaks inc. block selection style

Filtration.Common.Tests/Filtration.Common.Tests.csproj

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.Common.Tests</RootNamespace>
+    <AssemblyName>Filtration.Common.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.2.1506.2515\lib\net40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.Common.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.Common.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.Common.Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("23ba4e1b-1cb6-47fc-9a8b-6ce61fc3eb32")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Filtration.Common.Tests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.2.1506.2515" targetFramework="net451" />
+  <package id="NUnit" version="2.6.4" targetFramework="net451" />
+</packages>

Filtration.Common/Filtration.Common.csproj

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8CB44F28-2956-4C2A-9314-72727262EDD4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.Common</RootNamespace>
+    <AssemblyName>Filtration.Common</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.Core">
+      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Windsor">
+      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\GalaSoft.MvvmLight.Platform.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>
+    <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.1.1.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\FileSystemService.cs" />
+    <Compile Include="ViewModels\FiltrationViewModelBase.cs" />
+    <Compile Include="ViewModels\PaneViewModel.cs" />
+    <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+      <Project>{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}</Project>
+      <Name>Filtration.ObjectModel</Name>
+    </ProjectReference>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.Common/Properties/AssemblyInfo.cs

@@ -0,0 +1,40 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.Common")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.Common")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("36a40512-35b4-489c-8e20-f431b9e92dc1")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: InternalsVisibleTo("Filtration.Tests")]
+[assembly: InternalsVisibleTo("Filtration.Common.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

Filtration.Common/Services/FileSystemService.cs

@@ -1,9 +1,9 @@
 using System;
 using System.IO;
 
-namespace Filtration.Services
+namespace Filtration.Common.Services
 {
-    internal interface IFileSystemService
+    public interface IFileSystemService
     {
         string ReadFileAsString(string filePath);
         void WriteFileFromString(string filePath, string inputString);

Filtration.Common/ViewModels/FiltrationViewModelBase.cs

@@ -1,15 +1,14 @@
 using System.Runtime.CompilerServices;
-using Filtration.Annotations;
+using Filtration.ObjectModel.Annotations;
 using GalaSoft.MvvmLight;
 
-namespace Filtration.ViewModels
+namespace Filtration.Common.ViewModels
 {
-    internal class FiltrationViewModelBase : ViewModelBase
+    public class FiltrationViewModelBase : ViewModelBase
     {
         /// This gives us the ReSharper option to transform an autoproperty into a property with change notification
         /// Also leverages .net 4.5 callermembername attribute
         [NotifyPropertyChangedInvocator]
-
         protected override void RaisePropertyChanged([CallerMemberName]string property = "")
         {
             base.RaisePropertyChanged(property);

Filtration.Common/ViewModels/PaneViewModel.cs

@@ -0,0 +1,65 @@
+using System.Windows.Media;
+
+namespace Filtration.Common.ViewModels
+{
+    public class PaneViewModel : FiltrationViewModelBase
+    {
+        private string _title;
+        public string Title
+        {
+            get { return _title; }
+            set
+            {
+                if (_title != value)
+                {
+                    _title = value;
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public ImageSource IconSource { get; protected set; }
+
+        private string _contentId;
+        public string ContentId
+        {
+            get { return _contentId; }
+            set
+            {
+                if (_contentId != value)
+                {
+                    _contentId = value;
+                    RaisePropertyChanged();
+                }
+            }
+        }
+        
+        private bool _isSelected;
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set
+            {
+                if (_isSelected != value)
+                {
+                    _isSelected = value;
+                    RaisePropertyChanged();
+                }
+            }
+        }
+        
+        private bool _isActive;
+        public bool IsActive
+        {
+            get { return _isActive; }
+            set
+            {
+                if (_isActive != value)
+                {
+                    _isActive = value;
+                    RaisePropertyChanged();
+                }
+            }
+        }
+    }
+}

Filtration.Common/WindsorInstallers/ServicesInstaller.cs

@@ -0,0 +1,18 @@
+using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+using Filtration.Common.Services;
+
+namespace Filtration.Common.WindsorInstallers
+{
+    public class ServicesInstaller :IWindsorInstaller
+    {
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+            container.Register(
+                Component.For<IFileSystemService>()
+                    .ImplementedBy<FileSystemService>()
+                    .LifeStyle.Singleton);
+        }
+    }
+}

Filtration.Common/packages.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Castle.Core" version="3.3.0" targetFramework="net451" />
+  <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
+  <package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net451" />
+</packages>

Filtration.Interface/Filtration.Interface.csproj

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0F333344-7695-47B2-B0E6-172E4DE74819}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.Interface</RootNamespace>
+    <AssemblyName>Filtration.Interface</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="IDocument.cs" />
+    <Compile Include="IEditableDocument.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.Interface/IDocument.cs

@@ -0,0 +1,9 @@
+namespace Filtration.Interface
+{
+    public interface IDocument
+    {
+        bool IsScript { get; }
+        bool IsTheme { get; }
+        void Close();
+    }
+}

Filtration.Interface/IEditableDocument.cs

@@ -0,0 +1,9 @@
+namespace Filtration.Interface
+{
+    public interface IEditableDocument : IDocument
+    {
+        bool IsDirty { get; }
+        void Save();
+        void SaveAs();
+    }
+}

Filtration.Interface/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.Interface")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.Interface")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f21659a3-839a-41ca-97b9-78cc6f6af353")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{537BE676-2FF6-4995-B05B-9CFACE852EC9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.ObjectModel.Tests</RootNamespace>
+    <AssemblyName>Filtration.ObjectModel.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.2.1506.2016\lib\net40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestItemFilterBlock.cs" />
+    <Compile Include="TestItemFilterBlockGroup.cs" />
+    <Compile Include="TestItemFilterScript.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+      <Name>Filtration.ObjectModel</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.ObjectModel.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.ObjectModel.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.ObjectModel.Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7ed27cde-6bc5-4d11-b45d-8823de2077ce")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Filtration.ObjectModel.Tests/TestItemFilterBlock.cs

@@ -0,0 +1,71 @@
+using Filtration.ObjectModel.BlockItemTypes;
+using NUnit.Framework;
+
+namespace Filtration.ObjectModel.Tests
+{
+    [TestFixture]
+    public class TestItemFilterBlock
+    {
+        [Test]
+        public void ItemFilterBlock_BlockCount_ReturnsCorrectNumber()
+        {
+            // Arrange
+            var block = new ItemFilterBlock();
+            block.BlockItems.Add(new ItemLevelBlockItem());
+            block.BlockItems.Add(new ItemLevelBlockItem());
+            block.BlockItems.Add(new ItemLevelBlockItem());
+            block.BlockItems.Add(new ItemLevelBlockItem());
+
+            // Act
+            var count = block.BlockCount(typeof (ItemLevelBlockItem));
+
+            // Assert
+            Assert.AreEqual(4, count);
+        }
+
+        [Test]
+        public void ItemFilterBlock_AddBlockItemAllowed_LessThanMaximum_ReturnsTrue()
+        {
+            // Arrange
+            var block = new ItemFilterBlock();
+            block.BlockItems.Add(new ItemLevelBlockItem());
+
+            // Act
+            bool result = block.AddBlockItemAllowed(typeof (ItemLevelBlockItem));
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void ItemFilterBlock_AddBlockItemAllowed_MoreThanMaximum_ReturnsFalse()
+        {
+            // Arrange
+            var block = new ItemFilterBlock();
+            block.BlockItems.Add(new SoundBlockItem());
+
+            // Act
+            bool result = block.AddBlockItemAllowed(typeof (SoundBlockItem));
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void HasParentInBlockGroupHierarchy_ReturnsCorrectResult()
+        {
+            // Arrange
+            var testInputRootBlockGroup = new ItemFilterBlockGroup("Root Block Group", null);
+            var testInputSubBlockGroup = new ItemFilterBlockGroup("Sub Block Group", testInputRootBlockGroup);
+            var testInputSubSubBlockGroup = new ItemFilterBlockGroup("Sub Sub Block Group", testInputSubBlockGroup);
+
+            var block = new ItemFilterBlock {BlockGroup = testInputSubSubBlockGroup};
+
+            // Act
+
+            // Assert
+            Assert.AreEqual(true, block.HasBlockGroupInParentHierarchy(testInputRootBlockGroup, block.BlockGroup));
+            Assert.AreEqual(true, block.HasBlockGroupInParentHierarchy(testInputSubBlockGroup, block.BlockGroup));
+        }
+    }
+}

Filtration.ObjectModel.Tests/TestItemFilterBlockGroup.cs

@@ -0,0 +1,42 @@
+using NUnit.Framework;
+
+namespace Filtration.ObjectModel.Tests
+{
+    [TestFixture]
+    public class TestItemFilterBlockGroup
+    {
+        [Test]
+        public void ToString_ReturnsFullBlockHierarchy()
+        {
+            // Arrange
+            const string ExpectedResult = "Child 1 Block Group - Child 2 Block Group";
+
+            var rootBlockGroup = new ItemFilterBlockGroup("Root Block Group", null);
+            var child1BlockGroup = new ItemFilterBlockGroup("Child 1 Block Group", rootBlockGroup);
+            var child2BlockGroup = new ItemFilterBlockGroup("Child 2 Block Group", child1BlockGroup);
+            
+            // Act
+            var result = child2BlockGroup.ToString();
+
+            // Assert
+            Assert.AreEqual(ExpectedResult, result);
+        }
+        
+        [Test]
+        public void ToString_AddsTildeForAdvancedBlock()
+        {
+            // Arrange
+            const string ExpectedResult = "~Child 1 Block Group - Child 2 Block Group";
+
+            var rootBlockGroup = new ItemFilterBlockGroup("Root Block Group", null);
+            var child1BlockGroup = new ItemFilterBlockGroup("Child 1 Block Group", rootBlockGroup, true);
+            var child2BlockGroup = new ItemFilterBlockGroup("Child 2 Block Group", child1BlockGroup);
+
+            // Act
+            var result = child2BlockGroup.ToString();
+
+            // Assert
+            Assert.AreEqual(ExpectedResult, result);
+        }
+    }
+}

Filtration.ObjectModel.Tests/TestItemFilterScript.cs

@@ -1,25 +1,19 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Media;
-using Filtration.Models;
+using Filtration.ObjectModel.BlockItemTypes;
-using Filtration.Models.BlockItemTypes;
 using NUnit.Framework;
 
-namespace Filtration.Tests.Models
+namespace Filtration.ObjectModel.Tests
 {
     [TestFixture]
-    public class TestLootFilterScript
+    public class TestItemFilterScript
     {
         [Test]
         public void Validate_AtLeastOneBlock_Fail_ReturnsListWithCorrectError()
         {
             // Arrange
 
-            var script = new LootFilterScript();
+            var script = new ItemFilterScript();
 
             // Act
             var result = script.Validate();
@@ -33,10 +27,8 @@ namespace Filtration.Tests.Models
         {
             // Arrange
 
-            var script = new LootFilterScript
+            var script = new ItemFilterScript();
-            {
+            script.ItemFilterBlocks.Add(new ItemFilterBlock());
-                LootFilterBlocks = new ObservableCollection<LootFilterBlock> {new LootFilterBlock()}
-            };
 
             // Act
             var result = script.Validate();
@@ -59,22 +51,19 @@ namespace Filtration.Tests.Models
                 ReplaceBackgroundColor = true
             };
 
-            var testInputBlock1 = new LootFilterBlock();
+            var testInputBlock1 = new ItemFilterBlock();
             testInputBlock1.BlockItems.Add(new BackgroundColorBlockItem(new Color {A = 255, R = 255, G = 0, B = 0}));
-            var testInputBlock2 = new LootFilterBlock();
+            var testInputBlock2 = new ItemFilterBlock();
             testInputBlock2.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 255, R = 255, G = 1, B = 0 }));
-            var testInputBlock3 = new LootFilterBlock();
+            var testInputBlock3 = new ItemFilterBlock();
             testInputBlock3.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 255, R = 255, G = 0, B = 0 }));
 
-            var script = new LootFilterScript()
+            var script = new ItemFilterScript();
-            {
+
-                LootFilterBlocks = new ObservableCollection<LootFilterBlock>
+            script.ItemFilterBlocks.Add(testInputBlock1);
-                {
+            script.ItemFilterBlocks.Add(testInputBlock2);
-                    testInputBlock1,
+            script.ItemFilterBlocks.Add(testInputBlock3);
-                    testInputBlock2,
+                
-                    testInputBlock3
-                }
-            };
 
             // Act
             script.ReplaceColors(testInputReplaceColors);
@@ -105,21 +94,16 @@ namespace Filtration.Tests.Models
                 ReplaceTextColor = true
             };
 
-            var testInputBlock1 = new LootFilterBlock();
+            var testInputBlock1 = new ItemFilterBlock();
             testInputBlock1.BlockItems.Add(new BackgroundColorBlockItem(oldBackgroundColor));
             testInputBlock1.BlockItems.Add(new TextColorBlockItem(oldTextColor));
-            var testInputBlock2 = new LootFilterBlock();
+            var testInputBlock2 = new ItemFilterBlock();
             testInputBlock2.BlockItems.Add(new BackgroundColorBlockItem(oldBackgroundColor));
             testInputBlock2.BlockItems.Add(new TextColorBlockItem(new Color {A = 1, R = 2, G = 3, B = 4}));
 
-            var script = new LootFilterScript
+            var script = new ItemFilterScript();
-            {
+            script.ItemFilterBlocks.Add(testInputBlock1);
-                LootFilterBlocks = new ObservableCollection<LootFilterBlock>
+            script.ItemFilterBlocks.Add(testInputBlock2);
-                {
-                    testInputBlock1,
-                    testInputBlock2
-                }
-            };
 
             // Act
             script.ReplaceColors(testInputReplaceColors);
@@ -135,3 +119,4 @@ namespace Filtration.Tests.Models
         }
     }
 }
+

Filtration.ObjectModel.Tests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.2.1506.2016" targetFramework="net451" />
+  <package id="NUnit" version="2.6.4" targetFramework="net451" />
+</packages>

Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs

@@ -1,12 +1,10 @@
-using System.ComponentModel;
+using System.Windows.Media;
-using System.Runtime.CompilerServices;
+using Filtration.ObjectModel.Enums;
-using System.Windows.Media;
+using Filtration.ObjectModel.Extensions;
-using Filtration.Annotations;
-using Filtration.Enums;
 
-namespace Filtration.Models.BlockItemBaseTypes
+namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    internal class ActionBlockItem : ILootFilterBlockItem
+    public class ActionBlockItem : BlockItemBase
     {
         private BlockAction _action;
 
@@ -28,17 +26,22 @@ namespace Filtration.Models.BlockItemBaseTypes
             }
         }
 
-        public string PrefixText
+        public override string OutputText
+        {
+            get { return Action.GetAttributeDescription(); }
+        }
+
+        public override string PrefixText
         {
             get { return string.Empty; }
         }
 
-        public int MaximumAllowed
+        public override int MaximumAllowed
         {
             get { return 1; }
         }
 
-        public string DisplayHeading
+        public override string DisplayHeading
         {
             get
             {
@@ -46,7 +49,7 @@ namespace Filtration.Models.BlockItemBaseTypes
             }
         }
 
-        public string SummaryText
+        public override string SummaryText
         {
             get
             {
@@ -54,7 +57,7 @@ namespace Filtration.Models.BlockItemBaseTypes
             }
         }
 
-        public Color SummaryBackgroundColor
+        public override Color SummaryBackgroundColor
         {
             get
             {
@@ -62,7 +65,7 @@ namespace Filtration.Models.BlockItemBaseTypes
             }
         }
 
-        public Color SummaryTextColor
+        public override Color SummaryTextColor
         {
             get
             {
@@ -70,15 +73,11 @@ namespace Filtration.Models.BlockItemBaseTypes
             }
         }
 
-        public int SortOrder { get { return 0; } }
+        public override int SortOrder { get { return 0; } }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public void ToggleAction()
-
-        [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            var handler = PropertyChanged;
+            Action = Action == BlockAction.Show ? BlockAction.Hide : BlockAction.Show;
-            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }

Filtration.ObjectModel/BlockItemBaseTypes/BlockItembase.cs

@@ -1,37 +1,23 @@
-using System.Collections.ObjectModel;
+using System.ComponentModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows.Media;
-using Filtration.Annotations;
+using Filtration.ObjectModel.Annotations;
 
-namespace Filtration.Models.BlockItemBaseTypes
+namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    internal abstract class StringListBlockItem : ILootFilterBlockItem
+    public abstract class BlockItemBase : IItemFilterBlockItem
     {
-        protected StringListBlockItem()
-        {
-            Items = new ObservableCollection<string>();
-            Items.CollectionChanged += OnItemsCollectionChanged;
-        }
-
         public abstract string PrefixText { get; }
+        public abstract string OutputText { get; }
         public abstract int MaximumAllowed { get; }
         public abstract string DisplayHeading { get; }
-
         public abstract string SummaryText { get; }
         public abstract Color SummaryBackgroundColor { get; }
         public abstract Color SummaryTextColor { get; }
         public abstract int SortOrder { get; }
-        public ObservableCollection<string> Items { get; protected set; }
-
-        private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            OnPropertyChanged("Items");
-            OnPropertyChanged("SummaryText");
-        }
 
         public event PropertyChangedEventHandler PropertyChanged;
+        
         [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {

Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs

@@ -0,0 +1,49 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class ColorBlockItem : BlockItemBase, IAudioVisualBlockItem
+    {
+        private Color _color;
+
+        protected ColorBlockItem()
+        {
+        }
+        
+        protected ColorBlockItem(Color color)
+        {
+            Color = color;
+        }
+
+        public override string OutputText
+        {
+            get
+            {
+                return PrefixText + " " + +Color.R + " " + Color.G + " "
+                       + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
+                       (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
+            }
+        }
+
+        public override string SummaryText
+        {
+            get { return string.Empty; }
+        }
+
+        public ThemeComponent ThemeComponent { get; set; }
+
+        public override Color SummaryBackgroundColor { get { return Colors.Transparent; } }
+        public override Color SummaryTextColor { get { return Colors.Transparent; } }
+
+        public Color Color
+        {
+            get { return _color; }
+            set
+            {
+                _color = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+}

Filtration.ObjectModel/BlockItemBaseTypes/DualIntegerBlockItem.cs

@@ -0,0 +1,49 @@
+using System.Windows.Media;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class DualIntegerBlockItem : BlockItemBase, IAudioVisualBlockItem
+    {
+        private int _value;
+        private int _secondValue;
+
+        protected DualIntegerBlockItem()
+        {
+        }
+
+        protected DualIntegerBlockItem(int value, int secondValue)
+        {
+            Value = value;
+            SecondValue = secondValue;
+        }
+
+        public override string OutputText
+        {
+            get { return PrefixText + " " + Value + " " + SecondValue; }
+        }
+        
+        public override string SummaryText { get { return string.Empty; } }
+        public override Color SummaryBackgroundColor { get { return Colors.Transparent; } }
+        public override Color SummaryTextColor { get { return Colors.Transparent; } }
+
+        public int Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public int SecondValue
+        {
+            get { return _secondValue; }
+            set
+            {
+                _secondValue = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+}

Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs

@@ -0,0 +1,40 @@
+using System.Windows.Media;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class IntegerBlockItem : BlockItemBase, IAudioVisualBlockItem
+    {
+        private int _value;
+
+        protected IntegerBlockItem()
+        {
+        }
+
+        protected IntegerBlockItem(int value)
+        {
+            Value = value;
+        }
+
+        public override string OutputText
+        {
+            get { return PrefixText + " " + Value; }
+        }
+
+        public override string SummaryText { get { return string.Empty; } }
+        public override Color SummaryBackgroundColor { get { return Colors.Transparent; } }
+        public override Color SummaryTextColor { get { return Colors.Transparent; } }
+
+        public abstract int Minimum { get; }
+        public abstract int Maximum { get; }
+
+        public int Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+}

Filtration.ObjectModel/BlockItemBaseTypes/NumericFilterPredicateBlockItem.cs

@@ -1,13 +1,10 @@
 using System;
-using System.ComponentModel;
+using Filtration.ObjectModel.Enums;
-using System.Runtime.CompilerServices;
+using Filtration.ObjectModel.Extensions;
-using System.Windows.Media;
-using Filtration.Annotations;
-using Filtration.Enums;
 
-namespace Filtration.Models.BlockItemBaseTypes
+namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    internal abstract class NumericFilterPredicateBlockItem : ILootFilterBlockItem
+    public abstract class NumericFilterPredicateBlockItem : BlockItemBase
     {
         private NumericFilterPredicate _filterPredicate;
 
@@ -23,13 +20,14 @@ namespace Filtration.Models.BlockItemBaseTypes
             FilterPredicate.PropertyChanged += OnFilterPredicateChanged;
         }
 
-        public abstract string PrefixText { get; }
+        public override string OutputText
-        public abstract int MaximumAllowed { get; }
+        {
-        public abstract string DisplayHeading { get; }
+            get
-        public abstract string SummaryText { get; }
+            {
-        public abstract Color SummaryBackgroundColor { get; }
+                return PrefixText + " " + FilterPredicate.PredicateOperator.GetAttributeDescription() +
-        public abstract Color SummaryTextColor { get; }
+                       " " + FilterPredicate.PredicateOperand;
-        public abstract int SortOrder { get; }
+            }
+        }
 
         public abstract int Minimum { get; }
         public abstract int Maximum { get; }
@@ -49,13 +47,5 @@ namespace Filtration.Models.BlockItemBaseTypes
             OnPropertyChanged("FilterPredicate");
             OnPropertyChanged("SummaryText");
         }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            var handler = PropertyChanged;
-            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
-        }
     }
 }

Filtration.ObjectModel/BlockItemBaseTypes/StringListBlockItem.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class StringListBlockItem : BlockItemBase
+    {
+        protected StringListBlockItem()
+        {
+            Items = new ObservableCollection<string>();
+            Items.CollectionChanged += OnItemsCollectionChanged;
+        }
+
+        public override string OutputText
+        {
+            get
+            {
+                var enumerable = Items as IList<string> ?? Items.ToList();
+                if (enumerable.Count > 0)
+                {
+                    return PrefixText + " " +
+                           string.Format("\"{0}\"",
+                               string.Join("\" \"", enumerable.ToArray()));
+                }
+
+                return string.Empty;
+            }
+        }
+
+        public ObservableCollection<string> Items { get; protected set; }
+
+        private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            OnPropertyChanged("Items");
+            OnPropertyChanged("SummaryText");
+        }
+    }
+}

Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs

@@ -1,9 +1,9 @@
 using System.Windows.Media;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class BackgroundColorBlockItem : ColorBlockItem
+    public class BackgroundColorBlockItem : ColorBlockItem
     {
         public BackgroundColorBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using System.Windows.Media;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class BaseTypeBlockItem : StringListBlockItem
+    public class BaseTypeBlockItem : StringListBlockItem
     {
         public override string PrefixText { get { return "BaseType"; } }
 

Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs

@@ -1,9 +1,9 @@
 using System.Windows.Media;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class BorderColorBlockItem : ColorBlockItem
+    public class BorderColorBlockItem : ColorBlockItem
     {
         public BorderColorBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using System.Windows.Media;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class ClassBlockItem : StringListBlockItem
+    public class ClassBlockItem : StringListBlockItem
     {
         public override string PrefixText { get { return "Class"; } }
 

Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class DropLevelBlockItem : NumericFilterPredicateBlockItem
+    public class DropLevelBlockItem : NumericFilterPredicateBlockItem
     {
         public DropLevelBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs

@@ -1,11 +1,12 @@
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class FontSizeBlockItem : IntegerBlockItem
+    public class FontSizeBlockItem : IntegerBlockItem
     {
         public FontSizeBlockItem()
         {
+            Value = 35;
         }
 
         public FontSizeBlockItem(int value) : base(value)

Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class HeightBlockItem : NumericFilterPredicateBlockItem
+    public class HeightBlockItem : NumericFilterPredicateBlockItem
     {
         public HeightBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class ItemLevelBlockItem : NumericFilterPredicateBlockItem
+    public class ItemLevelBlockItem : NumericFilterPredicateBlockItem
     {
         public ItemLevelBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class LinkedSocketsBlockItem : NumericFilterPredicateBlockItem
+    public class LinkedSocketsBlockItem : NumericFilterPredicateBlockItem
     {
         public LinkedSocketsBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/QualityBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class QualityBlockItem : NumericFilterPredicateBlockItem
+    public class QualityBlockItem : NumericFilterPredicateBlockItem
     {
         public QualityBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs

@@ -1,11 +1,11 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Extensions;
+using Filtration.ObjectModel.Enums;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Extensions;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class RarityBlockItem : NumericFilterPredicateBlockItem
+    public class RarityBlockItem : NumericFilterPredicateBlockItem
     {
         public RarityBlockItem()
         {
@@ -21,6 +21,18 @@ namespace Filtration.Models.BlockItemTypes
             get { return "Rarity"; }
         }
 
+        public override string OutputText
+        {
+            get
+            {
+                return PrefixText + " " + FilterPredicate.PredicateOperator
+                    .GetAttributeDescription() +
+                       " " +
+                       ((ItemRarity) FilterPredicate.PredicateOperand)
+                           .GetAttributeDescription();
+            }
+        }
+
         public override int MaximumAllowed
         {
             get { return 2; }

Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using System.Windows.Media;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class SocketGroupBlockItem : StringListBlockItem
+    public class SocketGroupBlockItem : StringListBlockItem
     {
         public override string PrefixText
         {

Filtration.ObjectModel/BlockItemTypes/SocketsBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class SocketsBlockItem : NumericFilterPredicateBlockItem
+    public class SocketsBlockItem : NumericFilterPredicateBlockItem
     {
         public SocketsBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs

@@ -1,8 +1,8 @@
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class SoundBlockItem : DualIntegerBlockItem
+    public class SoundBlockItem : DualIntegerBlockItem
     {
         public SoundBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs

@@ -1,9 +1,9 @@
 using System.Windows.Media;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemBaseTypes;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class TextColorBlockItem : ColorBlockItem
+    public class TextColorBlockItem : ColorBlockItem
     {
         public TextColorBlockItem()
         {

Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
-using Filtration.Enums;
+using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.Models.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
-namespace Filtration.Models.BlockItemTypes
+namespace Filtration.ObjectModel.BlockItemTypes
 {
-    internal class WidthBlockItem : NumericFilterPredicateBlockItem
+    public class WidthBlockItem : NumericFilterPredicateBlockItem
     {
         public WidthBlockItem()
         {

Filtration.ObjectModel/Enums/BlockAction.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace Filtration.Enums
+namespace Filtration.ObjectModel.Enums
 {
-    internal enum BlockAction
+    public enum BlockAction
     {
         [Description("Show")]
         Show,

Filtration.ObjectModel/Enums/BlockItemType.cs

@@ -1,6 +1,6 @@
-namespace Filtration.Enums
+namespace Filtration.ObjectModel.Enums
 {
-    internal enum BlockItemType
+    public enum BlockItemType
     {
         ItemLevel,
         DropLevel,

Filtration.ObjectModel/Enums/FilterPredicateOperator.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace Filtration.Enums
+namespace Filtration.ObjectModel.Enums
 {
-    internal enum FilterPredicateOperator
+    public enum FilterPredicateOperator
     {
         [Description("=")]
         Equal,

Filtration.ObjectModel/Enums/FilterType.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace Filtration.Enums
+namespace Filtration.ObjectModel.Enums
 {
-    internal enum FilterType
+    public enum FilterType
     {
         [Description("Show")]
         Show,

Filtration.ObjectModel/Enums/ItemRarity.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace Filtration.Enums
+namespace Filtration.ObjectModel.Enums
 {
-    internal enum ItemRarity
+    public enum ItemRarity
     {
         [Description("Normal")]
         Normal,

Filtration.ObjectModel/Enums/SocketColor.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace Filtration.Enums
+namespace Filtration.ObjectModel.Enums
 {
-    internal enum SocketColor
+    public enum SocketColor
     {
         [Description("R")]
         Red,

Filtration.ObjectModel/Enums/ThemeComponentType.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel;
+
+namespace Filtration.ObjectModel.Enums
+{
+    public enum ThemeComponentType
+    {
+        [Description("Text")]
+        TextColor,
+        [Description("Background")]
+        BackgroundColor,
+        [Description("Border")]
+        BorderColor
+    }
+}

Filtration.ObjectModel/Extensions/EnumHelper.cs

@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel;
 
-namespace Filtration.Extensions
+namespace Filtration.ObjectModel.Extensions
 {
-    internal static class EnumHelper
+    public static class EnumHelper
     {
         public static T GetAttributeOfType<T>(this Enum enumVal) where T : Attribute
         {

Filtration.ObjectModel/Filtration.ObjectModel.csproj

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.ObjectModel</RootNamespace>
+    <AssemblyName>Filtration.ObjectModel</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BlockItemBaseTypes\ActionBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\BlockItembase.cs" />
+    <Compile Include="BlockItemBaseTypes\ColorBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\DualIntegerBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\IntegerBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\NumericFilterPredicateBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\StringListBlockItem.cs" />
+    <Compile Include="BlockItemTypes\BackgroundColorBlockItem.cs" />
+    <Compile Include="BlockItemTypes\BaseTypeBlockItem.cs" />
+    <Compile Include="BlockItemTypes\BorderColorBlockItem.cs" />
+    <Compile Include="BlockItemTypes\ClassBlockItem.cs" />
+    <Compile Include="BlockItemTypes\DropLevelBlockItem.cs" />
+    <Compile Include="BlockItemTypes\FontSizeBlockItem.cs" />
+    <Compile Include="BlockItemTypes\HeightBlockItem.cs" />
+    <Compile Include="BlockItemTypes\ItemLevelBlockItem.cs" />
+    <Compile Include="BlockItemTypes\LinkedSocketsBlockItem.cs" />
+    <Compile Include="BlockItemTypes\QualityBlockItem.cs" />
+    <Compile Include="BlockItemTypes\RarityBlockItem.cs" />
+    <Compile Include="BlockItemTypes\SocketGroupBlockItem.cs" />
+    <Compile Include="BlockItemTypes\SocketsBlockItem.cs" />
+    <Compile Include="BlockItemTypes\SoundBlockItem.cs" />
+    <Compile Include="BlockItemTypes\TextColorBlockItem.cs" />
+    <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
+    <Compile Include="Enums\BlockAction.cs" />
+    <Compile Include="Enums\BlockItemType.cs" />
+    <Compile Include="Enums\FilterPredicateOperator.cs" />
+    <Compile Include="Enums\FilterType.cs" />
+    <Compile Include="Enums\ItemRarity.cs" />
+    <Compile Include="Enums\SocketColor.cs" />
+    <Compile Include="Enums\ThemeComponentType.cs" />
+    <Compile Include="Extensions\EnumHelper.cs" />
+    <Compile Include="IAudioVisualBlockItem.cs" />
+    <Compile Include="IItemFilterBlockItem.cs" />
+    <Compile Include="ItemFilterBlock.cs" />
+    <Compile Include="ItemFilterBlockGroup.cs" />
+    <Compile Include="ItemFilterScript.cs" />
+    <Compile Include="ItemFilterSection.cs" />
+    <Compile Include="NumericFilterPredicate.cs" />
+    <Compile Include="Properties\Annotations.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReplaceColorsParameterSet.cs" />
+    <Compile Include="ThemeEditor\Theme.cs" />
+    <Compile Include="ThemeEditor\ThemeComponent.cs" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.ObjectModel/IAudioVisualBlockItem.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace Filtration.Models
+namespace Filtration.ObjectModel
 {
-    internal interface IAudioVisualBlockItem
+    public interface IAudioVisualBlockItem
     {
         event PropertyChangedEventHandler PropertyChanged;
     }

Filtration.ObjectModel/IItemFilterBlockItem.cs

@@ -1,16 +1,17 @@
 using System.ComponentModel;
 using System.Windows.Media;
 
-namespace Filtration.Models
+namespace Filtration.ObjectModel
 {
-    internal interface ILootFilterBlockItem : INotifyPropertyChanged
+    public interface IItemFilterBlockItem : INotifyPropertyChanged
     {
         string PrefixText { get; }
-        int MaximumAllowed { get; }
+        string OutputText { get; }
         string DisplayHeading { get; }
         string SummaryText { get; }
         Color SummaryBackgroundColor { get; }
         Color SummaryTextColor { get; }
+        int MaximumAllowed { get; }
         int SortOrder { get; }
     }
 }

Filtration.ObjectModel/ItemFilterBlock.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel
+{
+    public class ItemFilterBlock
+    {
+        private ItemFilterBlockGroup _blockGroup;
+
+        public ItemFilterBlock()
+        {
+            BlockItems = new ObservableCollection<IItemFilterBlockItem> {new ActionBlockItem(BlockAction.Show)};
+        }
+        
+        public string Description { get; set; }
+
+        public ItemFilterBlockGroup BlockGroup
+        {
+            get { return _blockGroup; }
+            set
+            {
+                var oldBlockGroup = _blockGroup;
+                _blockGroup = value;
+
+                if (_blockGroup != null)
+                {
+                    _blockGroup.BlockGroupStatusChanged += OnBlockGroupStatusChanged;
+                    if (oldBlockGroup != null)
+                    {
+                        oldBlockGroup.BlockGroupStatusChanged -= OnBlockGroupStatusChanged;
+                    }
+                }
+                else
+                {
+                    if (oldBlockGroup != null)
+                    {
+                        oldBlockGroup.BlockGroupStatusChanged -= OnBlockGroupStatusChanged;
+                    }
+                }
+            }
+        }
+
+        public BlockAction Action
+        {
+            get
+            {
+                var actionBlock = BlockItems.OfType<ActionBlockItem>().First();
+                return actionBlock.Action;
+            }
+            set
+            {
+                var actionBlock = BlockItems.OfType<ActionBlockItem>().First();
+                actionBlock.Action = value;
+            }
+        }
+
+        public ObservableCollection<IItemFilterBlockItem> BlockItems { get; private set; }
+
+        public int BlockCount(Type type)
+        {
+            return BlockItems != null ? BlockItems.Count(b => b.GetType() == type) : 0;
+        }
+
+        public bool AddBlockItemAllowed(Type type)
+        {
+            var blockItem = (IItemFilterBlockItem)Activator.CreateInstance(type);
+            return BlockCount(type) < blockItem.MaximumAllowed;
+        }
+
+        public bool HasBlockItemOfType<T>()
+        {
+            return BlockItems.Count(b => b is T) > 0; 
+        }
+
+        public bool HasBlockGroupInParentHierarchy(ItemFilterBlockGroup targetBlockGroup, ItemFilterBlockGroup startingBlockGroup)
+        {
+            if (startingBlockGroup == targetBlockGroup)
+            {
+                return true;
+            }
+            if (BlockGroup == null)
+            {
+                return false;
+            }
+
+            if (startingBlockGroup.ParentGroup != null)
+            {
+                return HasBlockGroupInParentHierarchy(targetBlockGroup, startingBlockGroup.ParentGroup);
+            }
+
+            return false;
+        }
+        
+        private void OnBlockGroupStatusChanged(object sender, EventArgs e)
+        {
+            if (BlockGroup.IsChecked == false && Action == BlockAction.Show)
+            {
+                Action = BlockAction.Hide;
+            }
+            else if (BlockGroup.IsChecked && Action == BlockAction.Hide)
+            {
+                Action = BlockAction.Show;
+            }
+        }
+    }
+}

Filtration.ObjectModel/ItemFilterBlockGroup.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel
+{
+    public class ItemFilterBlockGroup
+    {
+        private bool _isChecked;
+
+        public ItemFilterBlockGroup(string groupName, ItemFilterBlockGroup parent, bool advanced = false)
+        {
+            GroupName = groupName;
+            ParentGroup = parent;
+            Advanced = advanced;
+            ChildGroups = new List<ItemFilterBlockGroup>();
+        }
+
+        public event EventHandler BlockGroupStatusChanged;
+
+        public string GroupName { get; private set; }
+        public ItemFilterBlockGroup ParentGroup { get; private set; }
+        public List<ItemFilterBlockGroup> ChildGroups { get; private set; }
+        public bool Advanced { get; private set; }
+
+        public bool IsChecked
+        {
+            get { return _isChecked; }
+            set
+            {
+                if (value != _isChecked)
+                {
+                    _isChecked = 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.
+                    if (BlockGroupStatusChanged != null)
+                    {
+                        BlockGroupStatusChanged.Invoke(null, null);
+                    }
+                }
+            }
+        }
+
+        public override string ToString()
+        {
+            var currentBlockGroup = this;
+
+            var outputString = (Advanced ? "~" : string.Empty) + GroupName;
+
+            // TODO: This is retarded, fix this.
+            if (currentBlockGroup.ParentGroup != null)
+            {
+                while (currentBlockGroup.ParentGroup.ParentGroup != null)
+                {
+                    outputString = (currentBlockGroup.ParentGroup.Advanced ? "~" : string.Empty) + currentBlockGroup.ParentGroup.GroupName + " - " + outputString;
+                    currentBlockGroup = currentBlockGroup.ParentGroup;
+                }
+            }
+
+            return outputString;
+        }
+    }
+}

Filtration.ObjectModel/ItemFilterScript.cs

@@ -2,18 +2,28 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Filtration.Models.BlockItemTypes;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.ThemeEditor;
 
-namespace Filtration.Models
+namespace Filtration.ObjectModel
 {
-    internal class LootFilterScript
+    public class ItemFilterScript
     {
-        public LootFilterScript()
+        public ItemFilterScript()
         {
-            LootFilterBlocks = new ObservableCollection<LootFilterBlock>();
+            ItemFilterBlocks = new ObservableCollection<ItemFilterBlock>();
+            ItemFilterBlockGroups = new ObservableCollection<ItemFilterBlockGroup>
+            {
+                new ItemFilterBlockGroup("Root", null)
+            };
+            ThemeComponents = new List<ThemeComponent>();
         }
 
-        public ObservableCollection<LootFilterBlock> LootFilterBlocks { get; set; }
+        public ObservableCollection<ItemFilterBlock> ItemFilterBlocks { get; private set; }
+        public ObservableCollection<ItemFilterBlockGroup> ItemFilterBlockGroups { get; private set; }
+
+        public List<ThemeComponent> ThemeComponents { get; set; } 
+
         public string FilePath { get; set; }
         public string Description { get; set; }
         public DateTime DateModified { get; set; }
@@ -22,7 +32,7 @@ namespace Filtration.Models
         {
             var validationErrors = new List<string>();
 
-            if (LootFilterBlocks.Count == 0)
+            if (ItemFilterBlocks.Count == 0)
             {
                 validationErrors.Add("A script must have at least one block");
             }
@@ -32,10 +42,9 @@ namespace Filtration.Models
 
         public void ReplaceColors(ReplaceColorsParameterSet replaceColorsParameterSet)
         {
-
             foreach (
                 var block in
-                    LootFilterBlocks.Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b)))
+                    ItemFilterBlocks.Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b)))
             {
                 if (replaceColorsParameterSet.ReplaceTextColor)
                 {
@@ -53,10 +62,9 @@ namespace Filtration.Models
                     borderColorBlockItem.Color = replaceColorsParameterSet.NewBorderColor;
                 }
             }
-
         }
 
-        private bool BlockIsColorReplacementCandidate(ReplaceColorsParameterSet replaceColorsParameterSet, LootFilterBlock block)
+        private bool BlockIsColorReplacementCandidate(ReplaceColorsParameterSet replaceColorsParameterSet, ItemFilterBlock block)
         {
             var textColorItem = block.HasBlockItemOfType<TextColorBlockItem>()
                 ? block.BlockItems.OfType<TextColorBlockItem>().First()

Filtration.ObjectModel/ItemFilterSection.cs

@@ -0,0 +1,6 @@
+namespace Filtration.ObjectModel
+{
+    public class ItemFilterSection : ItemFilterBlock
+    {
+    }
+}

Filtration.ObjectModel/NumericFilterPredicate.cs

@@ -1,12 +1,12 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using Filtration.Annotations;
+using Filtration.ObjectModel.Annotations;
-using Filtration.Enums;
+using Filtration.ObjectModel.Enums;
-using Filtration.Extensions;
+using Filtration.ObjectModel.Extensions;
 
-namespace Filtration.Models
+namespace Filtration.ObjectModel
 {
-    internal class NumericFilterPredicate : INotifyPropertyChanged
+    public class NumericFilterPredicate : INotifyPropertyChanged
     {
         private FilterPredicateOperator _predicateOperator;
         private int _predicateOperand;

Filtration.ObjectModel/Properties/Annotations.cs

@@ -0,0 +1,937 @@
+using System;
+
+#pragma warning disable 1591
+// ReSharper disable UnusedMember.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable IntroduceOptionalParameters.Global
+// ReSharper disable MemberCanBeProtected.Global
+// ReSharper disable InconsistentNaming
+// ReSharper disable CheckNamespace
+
+namespace Filtration.ObjectModel.Annotations
+{
+  /// <summary>
+  /// Indicates that the value of the marked element could be <c>null</c> sometimes,
+  /// so the check for <c>null</c> is necessary before its usage.
+  /// </summary>
+  /// <example><code>
+  /// [CanBeNull] public object Test() { return null; }
+  /// public void UseTest() {
+  ///   var p = Test();
+  ///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
+  /// }
+  /// </code></example>
+  [AttributeUsage(
+    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event)]
+  public sealed class CanBeNullAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that the value of the marked element could never be <c>null</c>.
+  /// </summary>
+  /// <example><code>
+  /// [NotNull] public object Foo() {
+  ///   return null; // Warning: Possible 'null' assignment
+  /// }
+  /// </code></example>
+  [AttributeUsage(
+    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event)]
+  public sealed class NotNullAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that collection or enumerable value does not contain null elements.
+  /// </summary>
+  [AttributeUsage(
+    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+    AttributeTargets.Delegate | AttributeTargets.Field)]
+  public sealed class ItemNotNullAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that collection or enumerable value can contain null elements.
+  /// </summary>
+  [AttributeUsage(
+    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+    AttributeTargets.Delegate | AttributeTargets.Field)]
+  public sealed class ItemCanBeNullAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that the marked method builds string by format pattern and (optional) arguments.
+  /// Parameter, which contains format string, should be given in constructor. The format string
+  /// should be in <see cref="string.Format(IFormatProvider,string,object[])"/>-like form.
+  /// </summary>
+  /// <example><code>
+  /// [StringFormatMethod("message")]
+  /// public void ShowError(string message, params object[] args) { /* do something */ }
+  /// public void Foo() {
+  ///   ShowError("Failed: {0}"); // Warning: Non-existing argument in format string
+  /// }
+  /// </code></example>
+  [AttributeUsage(
+    AttributeTargets.Constructor | AttributeTargets.Method |
+    AttributeTargets.Property | AttributeTargets.Delegate)]
+  public sealed class StringFormatMethodAttribute : Attribute
+  {
+    /// <param name="formatParameterName">
+    /// Specifies which parameter of an annotated method should be treated as format-string
+    /// </param>
+    public StringFormatMethodAttribute(string formatParameterName)
+    {
+      FormatParameterName = formatParameterName;
+    }
+
+    public string FormatParameterName { get; private set; }
+  }
+
+  /// <summary>
+  /// For a parameter that is expected to be one of the limited set of values.
+  /// Specify fields of which type should be used as values for this parameter.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field)]
+  public sealed class ValueProviderAttribute : Attribute
+  {
+    public ValueProviderAttribute(string name)
+    {
+      Name = name;
+    }
+
+    [NotNull] public string Name { get; private set; }
+  }
+
+  /// <summary>
+  /// Indicates that the function argument should be string literal and match one
+  /// of the parameters of the caller function. For example, ReSharper annotates
+  /// the parameter of <see cref="System.ArgumentNullException"/>.
+  /// </summary>
+  /// <example><code>
+  /// public void Foo(string param) {
+  ///   if (param == null)
+  ///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
+  /// }
+  /// </code></example>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class InvokerParameterNameAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that the method is contained in a type that implements
+  /// <c>System.ComponentModel.INotifyPropertyChanged</c> interface and this method
+  /// is used to notify that some property value changed.
+  /// </summary>
+  /// <remarks>
+  /// The method should be non-static and conform to one of the supported signatures:
+  /// <list>
+  /// <item><c>NotifyChanged(string)</c></item>
+  /// <item><c>NotifyChanged(params string[])</c></item>
+  /// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
+  /// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
+  /// <item><c>SetProperty{T}(ref T, T, string)</c></item>
+  /// </list>
+  /// </remarks>
+  /// <example><code>
+  /// public class Foo : INotifyPropertyChanged {
+  ///   public event PropertyChangedEventHandler PropertyChanged;
+  ///   [NotifyPropertyChangedInvocator]
+  ///   protected virtual void NotifyChanged(string propertyName) { ... }
+  ///
+  ///   private string _name;
+  ///   public string Name {
+  ///     get { return _name; }
+  ///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
+  ///   }
+  /// }
+  /// </code>
+  /// Examples of generated notifications:
+  /// <list>
+  /// <item><c>NotifyChanged("Property")</c></item>
+  /// <item><c>NotifyChanged(() =&gt; Property)</c></item>
+  /// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
+  /// <item><c>SetProperty(ref myField, value, "Property")</c></item>
+  /// </list>
+  /// </example>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
+  {
+    public NotifyPropertyChangedInvocatorAttribute() { }
+    public NotifyPropertyChangedInvocatorAttribute(string parameterName)
+    {
+      ParameterName = parameterName;
+    }
+
+    public string ParameterName { get; private set; }
+  }
+
+  /// <summary>
+  /// Describes dependency between method input and output.
+  /// </summary>
+  /// <syntax>
+  /// <p>Function Definition Table syntax:</p>
+  /// <list>
+  /// <item>FDT      ::= FDTRow [;FDTRow]*</item>
+  /// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
+  /// <item>Input    ::= ParameterName: Value [, Input]*</item>
+  /// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
+  /// <item>Value    ::= true | false | null | notnull | canbenull</item>
+  /// </list>
+  /// If method has single input parameter, it's name could be omitted.<br/>
+  /// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same)
+  /// for method output means that the methos doesn't return normally.<br/>
+  /// <c>canbenull</c> annotation is only applicable for output parameters.<br/>
+  /// You can use multiple <c>[ContractAnnotation]</c> for each FDT row,
+  /// or use single attribute with rows separated by semicolon.<br/>
+  /// </syntax>
+  /// <examples><list>
+  /// <item><code>
+  /// [ContractAnnotation("=> halt")]
+  /// public void TerminationMethod()
+  /// </code></item>
+  /// <item><code>
+  /// [ContractAnnotation("halt &lt;= condition: false")]
+  /// public void Assert(bool condition, string text) // regular assertion method
+  /// </code></item>
+  /// <item><code>
+  /// [ContractAnnotation("s:null => true")]
+  /// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
+  /// </code></item>
+  /// <item><code>
+  /// // A method that returns null if the parameter is null,
+  /// // and not null if the parameter is not null
+  /// [ContractAnnotation("null => null; notnull => notnull")]
+  /// public object Transform(object data) 
+  /// </code></item>
+  /// <item><code>
+  /// [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")]
+  /// public bool TryParse(string s, out Person result)
+  /// </code></item>
+  /// </list></examples>
+  [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+  public sealed class ContractAnnotationAttribute : Attribute
+  {
+    public ContractAnnotationAttribute([NotNull] string contract)
+      : this(contract, false) { }
+
+    public ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates)
+    {
+      Contract = contract;
+      ForceFullStates = forceFullStates;
+    }
+
+    public string Contract { get; private set; }
+    public bool ForceFullStates { get; private set; }
+  }
+
+  /// <summary>
+  /// Indicates that marked element should be localized or not.
+  /// </summary>
+  /// <example><code>
+  /// [LocalizationRequiredAttribute(true)]
+  /// public class Foo {
+  ///   private string str = "my string"; // Warning: Localizable string
+  /// }
+  /// </code></example>
+  [AttributeUsage(AttributeTargets.All)]
+  public sealed class LocalizationRequiredAttribute : Attribute
+  {
+    public LocalizationRequiredAttribute() : this(true) { }
+    public LocalizationRequiredAttribute(bool required)
+    {
+      Required = required;
+    }
+
+    public bool Required { get; private set; }
+  }
+
+  /// <summary>
+  /// Indicates that the value of the marked type (or its derivatives)
+  /// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
+  /// should be used instead. However, using '==' or '!=' for comparison
+  /// with <c>null</c> is always permitted.
+  /// </summary>
+  /// <example><code>
+  /// [CannotApplyEqualityOperator]
+  /// class NoEquality { }
+  /// class UsesNoEquality {
+  ///   public void Test() {
+  ///     var ca1 = new NoEquality();
+  ///     var ca2 = new NoEquality();
+  ///     if (ca1 != null) { // OK
+  ///       bool condition = ca1 == ca2; // Warning
+  ///     }
+  ///   }
+  /// }
+  /// </code></example>
+  [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Struct)]
+  public sealed class CannotApplyEqualityOperatorAttribute : Attribute { }
+
+  /// <summary>
+  /// When applied to a target attribute, specifies a requirement for any type marked
+  /// with the target attribute to implement or inherit specific type or types.
+  /// </summary>
+  /// <example><code>
+  /// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
+  /// public class ComponentAttribute : Attribute { }
+  /// [Component] // ComponentAttribute requires implementing IComponent interface
+  /// public class MyComponent : IComponent { }
+  /// </code></example>
+  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+  [BaseTypeRequired(typeof(Attribute))]
+  public sealed class BaseTypeRequiredAttribute : Attribute
+  {
+    public BaseTypeRequiredAttribute([NotNull] Type baseType)
+    {
+      BaseType = baseType;
+    }
+
+    [NotNull] public Type BaseType { get; private set; }
+  }
+
+  /// <summary>
+  /// Indicates that the marked symbol is used implicitly (e.g. via reflection, in external library),
+  /// so this symbol will not be marked as unused (as well as by other usage inspections).
+  /// </summary>
+  [AttributeUsage(AttributeTargets.All)]
+  public sealed class UsedImplicitlyAttribute : Attribute
+  {
+    public UsedImplicitlyAttribute()
+      : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
+
+    public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
+      : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
+
+    public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
+      : this(ImplicitUseKindFlags.Default, targetFlags) { }
+
+    public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags)
+    {
+      UseKindFlags = useKindFlags;
+      TargetFlags = targetFlags;
+    }
+
+    public ImplicitUseKindFlags UseKindFlags { get; private set; }
+    public ImplicitUseTargetFlags TargetFlags { get; private set; }
+  }
+
+  /// <summary>
+  /// Should be used on attributes and causes ReSharper to not mark symbols marked with such attributes
+  /// as unused (as well as by other usage inspections)
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class | AttributeTargets.GenericParameter)]
+  public sealed class MeansImplicitUseAttribute : Attribute
+  {
+    public MeansImplicitUseAttribute()
+      : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
+
+    public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
+      : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
+
+    public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
+      : this(ImplicitUseKindFlags.Default, targetFlags) { }
+
+    public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags)
+    {
+      UseKindFlags = useKindFlags;
+      TargetFlags = targetFlags;
+    }
+
+    [UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; private set; }
+    [UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; private set; }
+  }
+
+  [Flags]
+  public enum ImplicitUseKindFlags
+  {
+    Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
+    /// <summary>Only entity marked with attribute considered used.</summary>
+    Access = 1,
+    /// <summary>Indicates implicit assignment to a member.</summary>
+    Assign = 2,
+    /// <summary>
+    /// Indicates implicit instantiation of a type with fixed constructor signature.
+    /// That means any unused constructor parameters won't be reported as such.
+    /// </summary>
+    InstantiatedWithFixedConstructorSignature = 4,
+    /// <summary>Indicates implicit instantiation of a type.</summary>
+    InstantiatedNoFixedConstructorSignature = 8,
+  }
+
+  /// <summary>
+  /// Specify what is considered used implicitly when marked
+  /// with <see cref="MeansImplicitUseAttribute"/> or <see cref="UsedImplicitlyAttribute"/>.
+  /// </summary>
+  [Flags]
+  public enum ImplicitUseTargetFlags
+  {
+    Default = Itself,
+    Itself = 1,
+    /// <summary>Members of entity marked with attribute are considered used.</summary>
+    Members = 2,
+    /// <summary>Entity marked with attribute and all its members considered used.</summary>
+    WithMembers = Itself | Members
+  }
+
+  /// <summary>
+  /// This attribute is intended to mark publicly available API
+  /// which should not be removed and so is treated as used.
+  /// </summary>
+  [MeansImplicitUse(ImplicitUseTargetFlags.WithMembers)]
+  public sealed class PublicAPIAttribute : Attribute
+  {
+    public PublicAPIAttribute() { }
+    public PublicAPIAttribute([NotNull] string comment)
+    {
+      Comment = comment;
+    }
+
+    public string Comment { get; private set; }
+  }
+
+  /// <summary>
+  /// Tells code analysis engine if the parameter is completely handled when the invoked method is on stack.
+  /// If the parameter is a delegate, indicates that delegate is executed while the method is executed.
+  /// If the parameter is an enumerable, indicates that it is enumerated while the method is executed.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class InstantHandleAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that a method does not make any observable state changes.
+  /// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>.
+  /// </summary>
+  /// <example><code>
+  /// [Pure] private int Multiply(int x, int y) { return x * y; }
+  /// public void Foo() {
+  ///   const int a = 2, b = 2;
+  ///   Multiply(a, b); // Waring: Return value of pure method is not used
+  /// }
+  /// </code></example>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class PureAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that a parameter is a path to a file or a folder within a web project.
+  /// Path can be relative or absolute, starting from web root (~).
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class PathReferenceAttribute : Attribute
+  {
+    public PathReferenceAttribute() { }
+    public PathReferenceAttribute([PathReference] string basePath)
+    {
+      BasePath = basePath;
+    }
+
+    public string BasePath { get; private set; }
+  }
+
+  /// <summary>
+  /// An extension method marked with this attribute is processed by ReSharper code completion
+  /// as a 'Source Template'. When extension method is completed over some expression, it's source code
+  /// is automatically expanded like a template at call site.
+  /// </summary>
+  /// <remarks>
+  /// Template method body can contain valid source code and/or special comments starting with '$'.
+  /// Text inside these comments is added as source code when the template is applied. Template parameters
+  /// can be used either as additional method parameters or as identifiers wrapped in two '$' signs.
+  /// Use the <see cref="MacroAttribute"/> attribute to specify macros for parameters.
+  /// </remarks>
+  /// <example>
+  /// In this example, the 'forEach' method is a source template available over all values
+  /// of enumerable types, producing ordinary C# 'foreach' statement and placing caret inside block:
+  /// <code>
+  /// [SourceTemplate]
+  /// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; xs) {
+  ///   foreach (var x in xs) {
+  ///      //$ $END$
+  ///   }
+  /// }
+  /// </code>
+  /// </example>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class SourceTemplateAttribute : Attribute { }
+
+  /// <summary>
+  /// Allows specifying a macro for a parameter of a <see cref="SourceTemplateAttribute">source template</see>.
+  /// </summary>
+  /// <remarks>
+  /// You can apply the attribute on the whole method or on any of its additional parameters. The macro expression
+  /// is defined in the <see cref="MacroAttribute.Expression"/> property. When applied on a method, the target
+  /// template parameter is defined in the <see cref="MacroAttribute.Target"/> property. To apply the macro silently
+  /// for the parameter, set the <see cref="MacroAttribute.Editable"/> property value = -1.
+  /// </remarks>
+  /// <example>
+  /// Applying the attribute on a source template method:
+  /// <code>
+  /// [SourceTemplate, Macro(Target = "item", Expression = "suggestVariableName()")]
+  /// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; collection) {
+  ///   foreach (var item in collection) {
+  ///     //$ $END$
+  ///   }
+  /// }
+  /// </code>
+  /// Applying the attribute on a template method parameter:
+  /// <code>
+  /// [SourceTemplate]
+  /// public static void something(this Entity x, [Macro(Expression = "guid()", Editable = -1)] string newguid) {
+  ///   /*$ var $x$Id = "$newguid$" + x.ToString();
+  ///   x.DoSomething($x$Id); */
+  /// }
+  /// </code>
+  /// </example>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, AllowMultiple = true)]
+  public sealed class MacroAttribute : Attribute
+  {
+    /// <summary>
+    /// Allows specifying a macro that will be executed for a <see cref="SourceTemplateAttribute">source template</see>
+    /// parameter when the template is expanded.
+    /// </summary>
+    public string Expression { get; set; }
+
+    /// <summary>
+    /// Allows specifying which occurrence of the target parameter becomes editable when the template is deployed.
+    /// </summary>
+    /// <remarks>
+    /// If the target parameter is used several times in the template, only one occurrence becomes editable;
+    /// other occurrences are changed synchronously. To specify the zero-based index of the editable occurrence,
+    /// use values >= 0. To make the parameter non-editable when the template is expanded, use -1.
+    /// </remarks>>
+    public int Editable { get; set; }
+
+    /// <summary>
+    /// Identifies the target parameter of a <see cref="SourceTemplateAttribute">source template</see> if the
+    /// <see cref="MacroAttribute"/> is applied on a template method.
+    /// </summary>
+    public string Target { get; set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class AspMvcAreaMasterLocationFormatAttribute : Attribute
+  {
+    public AspMvcAreaMasterLocationFormatAttribute(string format)
+    {
+      Format = format;
+    }
+
+    public string Format { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class AspMvcAreaPartialViewLocationFormatAttribute : Attribute
+  {
+    public AspMvcAreaPartialViewLocationFormatAttribute(string format)
+    {
+      Format = format;
+    }
+
+    public string Format { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class AspMvcAreaViewLocationFormatAttribute : Attribute
+  {
+    public AspMvcAreaViewLocationFormatAttribute(string format)
+    {
+      Format = format;
+    }
+
+    public string Format { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class AspMvcMasterLocationFormatAttribute : Attribute
+  {
+    public AspMvcMasterLocationFormatAttribute(string format)
+    {
+      Format = format;
+    }
+
+    public string Format { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class AspMvcPartialViewLocationFormatAttribute : Attribute
+  {
+    public AspMvcPartialViewLocationFormatAttribute(string format)
+    {
+      Format = format;
+    }
+
+    public string Format { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class AspMvcViewLocationFormatAttribute : Attribute
+  {
+    public AspMvcViewLocationFormatAttribute(string format)
+    {
+      Format = format;
+    }
+
+    public string Format { get; private set; }
+  }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+  /// is an MVC action. If applied to a method, the MVC action name is calculated
+  /// implicitly from the context. Use this attribute for custom wrappers similar to
+  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+  public sealed class AspMvcActionAttribute : Attribute
+  {
+    public AspMvcActionAttribute() { }
+    public AspMvcActionAttribute(string anonymousProperty)
+    {
+      AnonymousProperty = anonymousProperty;
+    }
+
+    public string AnonymousProperty { get; private set; }
+  }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC area.
+  /// Use this attribute for custom wrappers similar to
+  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcAreaAttribute : Attribute
+  {
+    public AspMvcAreaAttribute() { }
+    public AspMvcAreaAttribute(string anonymousProperty)
+    {
+      AnonymousProperty = anonymousProperty;
+    }
+
+    public string AnonymousProperty { get; private set; }
+  }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter is
+  /// an MVC controller. If applied to a method, the MVC controller name is calculated
+  /// implicitly from the context. Use this attribute for custom wrappers similar to
+  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+  public sealed class AspMvcControllerAttribute : Attribute
+  {
+    public AspMvcControllerAttribute() { }
+    public AspMvcControllerAttribute(string anonymousProperty)
+    {
+      AnonymousProperty = anonymousProperty;
+    }
+
+    public string AnonymousProperty { get; private set; }
+  }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC Master. Use this attribute
+  /// for custom wrappers similar to <c>System.Web.Mvc.Controller.View(String, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcMasterAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC model type. Use this attribute
+  /// for custom wrappers similar to <c>System.Web.Mvc.Controller.View(String, Object)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcModelTypeAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter is an MVC
+  /// partial view. If applied to a method, the MVC partial view name is calculated implicitly
+  /// from the context. Use this attribute for custom wrappers similar to
+  /// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+  public sealed class AspMvcPartialViewAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Allows disabling inspections for MVC views within a class or a method.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+  public sealed class AspMvcSupressViewErrorAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
+  /// Use this attribute for custom wrappers similar to 
+  /// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcDisplayTemplateAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template.
+  /// Use this attribute for custom wrappers similar to
+  /// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcEditorTemplateAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC template.
+  /// Use this attribute for custom wrappers similar to
+  /// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcTemplateAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+  /// is an MVC view. If applied to a method, the MVC view name is calculated implicitly
+  /// from the context. Use this attribute for custom wrappers similar to
+  /// <c>System.Web.Mvc.Controller.View(Object)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+  public sealed class AspMvcViewAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. When applied to a parameter of an attribute,
+  /// indicates that this parameter is an MVC action name.
+  /// </summary>
+  /// <example><code>
+  /// [ActionName("Foo")]
+  /// public ActionResult Login(string returnUrl) {
+  ///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
+  ///   return RedirectToAction("Bar"); // Error: Cannot resolve action
+  /// }
+  /// </code></example>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+  public sealed class AspMvcActionSelectorAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field)]
+  public sealed class HtmlElementAttributesAttribute : Attribute
+  {
+    public HtmlElementAttributesAttribute() { }
+    public HtmlElementAttributesAttribute(string name)
+    {
+      Name = name;
+    }
+
+    public string Name { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+  public sealed class HtmlAttributeValueAttribute : Attribute
+  {
+    public HtmlAttributeValueAttribute([NotNull] string name)
+    {
+      Name = name;
+    }
+
+    [NotNull] public string Name { get; private set; }
+  }
+
+  /// <summary>
+  /// Razor attribute. Indicates that a parameter or a method is a Razor section.
+  /// Use this attribute for custom wrappers similar to 
+  /// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+  public sealed class RazorSectionAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates how method invocation affects content of the collection.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class CollectionAccessAttribute : Attribute
+  {
+    public CollectionAccessAttribute(CollectionAccessType collectionAccessType)
+    {
+      CollectionAccessType = collectionAccessType;
+    }
+
+    public CollectionAccessType CollectionAccessType { get; private set; }
+  }
+
+  [Flags]
+  public enum CollectionAccessType
+  {
+    /// <summary>Method does not use or modify content of the collection.</summary>
+    None = 0,
+    /// <summary>Method only reads content of the collection but does not modify it.</summary>
+    Read = 1,
+    /// <summary>Method can change content of the collection but does not add new elements.</summary>
+    ModifyExistingContent = 2,
+    /// <summary>Method can add new elements to the collection.</summary>
+    UpdatedContent = ModifyExistingContent | 4
+  }
+
+  /// <summary>
+  /// Indicates that the marked method is assertion method, i.e. it halts control flow if
+  /// one of the conditions is satisfied. To set the condition, mark one of the parameters with 
+  /// <see cref="AssertionConditionAttribute"/> attribute.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class AssertionMethodAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates the condition parameter of the assertion method. The method itself should be
+  /// marked by <see cref="AssertionMethodAttribute"/> attribute. The mandatory argument of
+  /// the attribute is the assertion type.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AssertionConditionAttribute : Attribute
+  {
+    public AssertionConditionAttribute(AssertionConditionType conditionType)
+    {
+      ConditionType = conditionType;
+    }
+
+    public AssertionConditionType ConditionType { get; private set; }
+  }
+
+  /// <summary>
+  /// Specifies assertion type. If the assertion method argument satisfies the condition,
+  /// then the execution continues. Otherwise, execution is assumed to be halted.
+  /// </summary>
+  public enum AssertionConditionType
+  {
+    /// <summary>Marked parameter should be evaluated to true.</summary>
+    IS_TRUE = 0,
+    /// <summary>Marked parameter should be evaluated to false.</summary>
+    IS_FALSE = 1,
+    /// <summary>Marked parameter should be evaluated to null value.</summary>
+    IS_NULL = 2,
+    /// <summary>Marked parameter should be evaluated to not null value.</summary>
+    IS_NOT_NULL = 3,
+  }
+
+  /// <summary>
+  /// Indicates that the marked method unconditionally terminates control flow execution.
+  /// For example, it could unconditionally throw exception.
+  /// </summary>
+  [Obsolete("Use [ContractAnnotation('=> halt')] instead")]
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class TerminatesProgramAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that method is pure LINQ method, with postponed enumeration (like Enumerable.Select,
+  /// .Where). This annotation allows inference of [InstantHandle] annotation for parameters
+  /// of delegate type by analyzing LINQ method chains.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class LinqTunnelAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that IEnumerable, passed as parameter, is not enumerated.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class NoEnumerationAttribute : Attribute { }
+
+  /// <summary>
+  /// Indicates that parameter is regular expression pattern.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class RegexPatternAttribute : Attribute { }
+
+  /// <summary>
+  /// XAML attribute. Indicates the type that has <c>ItemsSource</c> property and should be treated
+  /// as <c>ItemsControl</c>-derived type, to enable inner items <c>DataContext</c> type resolve.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Class)]
+  public sealed class XamlItemsControlAttribute : Attribute { }
+
+  /// <summary>
+  /// XAML attibute. Indicates the property of some <c>BindingBase</c>-derived type, that
+  /// is used to bind some item of <c>ItemsControl</c>-derived type. This annotation will
+  /// enable the <c>DataContext</c> type resolve for XAML bindings for such properties.
+  /// </summary>
+  /// <remarks>
+  /// Property should have the tree ancestor of the <c>ItemsControl</c> type or
+  /// marked with the <see cref="XamlItemsControlAttribute"/> attribute.
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.Property)]
+  public sealed class XamlItemBindingOfItemsControlAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+  public sealed class AspChildControlTypeAttribute : Attribute
+  {
+    public AspChildControlTypeAttribute(string tagName, Type controlType)
+    {
+      TagName = tagName;
+      ControlType = controlType;
+    }
+
+    public string TagName { get; private set; }
+    public Type ControlType { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
+  public sealed class AspDataFieldAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
+  public sealed class AspDataFieldsAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Property)]
+  public sealed class AspMethodPropertyAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+  public sealed class AspRequiredAttributeAttribute : Attribute
+  {
+    public AspRequiredAttributeAttribute([NotNull] string attribute)
+    {
+      Attribute = attribute;
+    }
+
+    public string Attribute { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Property)]
+  public sealed class AspTypePropertyAttribute : Attribute
+  {
+    public bool CreateConstructorReferences { get; private set; }
+
+    public AspTypePropertyAttribute(bool createConstructorReferences)
+    {
+      CreateConstructorReferences = createConstructorReferences;
+    }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class RazorImportNamespaceAttribute : Attribute
+  {
+    public RazorImportNamespaceAttribute(string name)
+    {
+      Name = name;
+    }
+
+    public string Name { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class RazorInjectionAttribute : Attribute
+  {
+    public RazorInjectionAttribute(string type, string fieldName)
+    {
+      Type = type;
+      FieldName = fieldName;
+    }
+
+    public string Type { get; private set; }
+    public string FieldName { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class RazorHelperCommonAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Property)]
+  public sealed class RazorLayoutAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class RazorWriteLiteralMethodAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class RazorWriteMethodAttribute : Attribute { }
+
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class RazorWriteMethodParameterAttribute : Attribute { }
+
+  /// <summary>
+  /// Prevents the Member Reordering feature from tossing members of the marked class.
+  /// </summary>
+  /// <remarks>
+  /// The attribute must be mentioned in your member reordering patterns
+  /// </remarks>
+  [AttributeUsage(AttributeTargets.All)]
+  public sealed class NoReorder : Attribute { }
+}

Filtration.ObjectModel/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.ObjectModel")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.ObjectModel")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1b4dc4e6-68eb-4586-8570-63e9196fb1de")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Filtration.ObjectModel/ReplaceColorsParameterSet.cs

@@ -1,8 +1,8 @@
 using System.Windows.Media;
 
-namespace Filtration.Models
+namespace Filtration.ObjectModel
 {
-    internal class ReplaceColorsParameterSet
+    public class ReplaceColorsParameterSet
     {
         public Color OldTextColor { get; set; }
         public Color NewTextColor { get; set; }

Filtration.ObjectModel/ThemeEditor/Theme.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class Theme
+    {
+        private readonly List<ThemeComponent> _components; 
+
+        public Theme()
+        {
+            _components = new List<ThemeComponent>();
+        }
+
+        public string Name { get; set; }
+        public string FilePath { get; set; }
+
+        public List<ThemeComponent> Components
+        {
+            get { return _components; }
+        }
+
+        public bool ComponentExists(ThemeComponentType componentType, string componentName)
+        {
+            return _components.Exists(c => c.ComponentName == componentName && c.ComponentType == componentType);
+        }
+
+        public void AddComponent(ThemeComponentType componentType, string componentName, Color componentColor)
+        {
+            _components.Add(new ThemeComponent(componentType, componentName, componentColor));
+        }
+    }
+}

Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class ThemeComponent
+    {
+        public ThemeComponent()
+        {
+            
+        }
+
+        public ThemeComponent(ThemeComponentType componentType, string componentName, Color componentColor)
+        {
+            if (componentName == null || componentColor == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in ThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            Color = componentColor;
+            ComponentName = componentName;
+        }
+
+        public string ComponentName { get; set; }
+        public ThemeComponentType ComponentType{ get; set; }
+        public Color Color { get; set; }
+    }
+}

Filtration.Tests/Filtration.Tests.csproj

@@ -46,21 +46,38 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Models\TestLootFilterBlock.cs" />
-    <Compile Include="Models\TestLootFilterScript.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\TestLootFilterPersistenceService.cs" />
+    <Compile Include="Repositories\TestItemFilterScriptRepository.cs" />
+    <Compile Include="Services\TestHTTPService.cs" />
+    <Compile Include="Services\TestItemFilterPersistenceService.cs" />
     <Compile Include="Services\TestStaticDataService.cs" />
-    <Compile Include="Translators\TestLootFilterBlockTranslator.cs" />
+    <Compile Include="Services\TestUpdateService.cs" />
-    <Compile Include="Translators\TestLootFilterScriptTranslator.cs" />
+    <Compile Include="Translators\TestBlockGroupHierarchyBuilder.cs" />
+    <Compile Include="Translators\TestItemFilterBlockTranslator.cs" />
+    <Compile Include="Translators\TestItemFilterScriptTranslator.cs" />
+    <Compile Include="Translators\TestThemeComponentListBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Models\" />
     <Folder Include="ViewModels\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Filtration.Common\Filtration.Common.csproj">
+      <Project>{8cb44f28-2956-4c2a-9314-72727262edd4}</Project>
+      <Name>Filtration.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Filtration.Interface\Filtration.Interface.csproj">
+      <Project>{0f333344-7695-47b2-b0e6-172e4de74819}</Project>
+      <Name>Filtration.Interface</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+      <Name>Filtration.ObjectModel</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Filtration\Filtration.csproj">
       <Project>{55e0a34c-e039-43d7-a024-a4045401cdda}</Project>
       <Name>Filtration</Name>
@@ -70,7 +87,7 @@
     <Content Include="Resources\testscript.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\ThioleLootFilter.txt">
+    <Content Include="Resources\ThioleItemFilter.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

Filtration.Tests/Models/TestLootFilterBlock.cs

@@ -1,55 +0,0 @@
-using Filtration.Models;
-using Filtration.Models.BlockItemTypes;
-using NUnit.Framework;
-
-namespace Filtration.Tests.Models
-{
-    [TestFixture]
-    public class TestLootFilterBlock
-    {
-        [Test]
-        public void LootFilterBlock_BlockCount_ReturnsCorrectNumber()
-        {
-            // Arrange
-            var block = new LootFilterBlock();
-            block.BlockItems.Add(new ItemLevelBlockItem());
-            block.BlockItems.Add(new ItemLevelBlockItem());
-            block.BlockItems.Add(new ItemLevelBlockItem());
-            block.BlockItems.Add(new ItemLevelBlockItem());
-
-            // Act
-            var count = block.BlockCount(typeof (ItemLevelBlockItem));
-
-            // Assert
-            Assert.AreEqual(4, count);
-        }
-
-        [Test]
-        public void LootFilterBlock_AddBlockItemAllowed_LessThanMaximum_ReturnsTrue()
-        {
-            // Arrange
-            var block = new LootFilterBlock();
-            block.BlockItems.Add(new ItemLevelBlockItem());
-
-            // Act
-            bool result = block.AddBlockItemAllowed(typeof (ItemLevelBlockItem));
-
-            // Assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void LootFilterBlock_AddBlockItemAllowed_MoreThanMaximum_ReturnsFalse()
-        {
-            // Arrange
-            var block = new LootFilterBlock();
-            block.BlockItems.Add(new SoundBlockItem());
-
-            // Act
-            bool result = block.AddBlockItemAllowed(typeof (SoundBlockItem));
-
-            // Assert
-            Assert.IsFalse(result);
-        }
-    }
-}

Filtration.Tests/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

Filtration.Tests/Repositories/TestItemFilterScriptRepository.cs

@@ -0,0 +1,118 @@
+using System.IO;
+using Filtration.Repositories;
+using Filtration.Services;
+using Filtration.ViewModels;
+using Moq;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Repositories
+{
+    [TestFixture]
+    public class TestItemFilterScriptRepository
+    {
+        [Test]
+        public void LoadScriptFromFile_CallsPersistenceServiceUsingPathAndReturnsViewModel()
+        {
+            // Arrange
+            var testInputPath = "C:\\TestPath.filter";
+            
+
+            var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
+            mockPersistenceService.Setup(p => p.LoadItemFilterScript(testInputPath)).Verifiable();
+            
+            var mockItemFilterScriptViewModel = new Mock<IItemFilterScriptViewModel>();
+            
+            var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
+            mockItemFilterScriptViewModelFactory.Setup(f => f.Create()).Returns(mockItemFilterScriptViewModel.Object);
+
+            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+
+            // Act
+            var result = repository.LoadScriptFromFile(testInputPath);
+
+            // Assert
+            mockPersistenceService.Verify();
+            Assert.AreEqual(mockItemFilterScriptViewModel.Object, result);
+        }
+
+        [Test]
+        public void LoadScriptFromFile_PersistenceServiceThrows_ThrowsIOException()
+        {
+            // Arrange
+            var testInputPath = "C:\\TestPath.filter";
+
+            var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
+            mockPersistenceService.Setup(p => p.LoadItemFilterScript(testInputPath)).Throws<IOException>();
+
+            var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
+
+            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+
+            // Act
+            
+            // Assert
+            Assert.Throws<IOException>(() => repository.LoadScriptFromFile(testInputPath));
+        }
+
+        [Test]
+        public void SetItemFilterScriptDirectory_CallsPersistenceServiceSetItemFilterScriptDirectory()
+        {
+            // Arrange
+            var testInputPath = "C:\\Test\\Path";
+
+            var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
+            mockPersistenceService.Setup(p => p.SetItemFilterScriptDirectory(testInputPath)).Verifiable();
+
+            var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
+
+            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+
+            // Act
+            repository.SetItemFilterScriptDirectory(testInputPath);
+
+            // Assert
+            mockPersistenceService.Verify();
+        }
+
+        [Test]
+        public void GetItemFilterScriptDirectory_ReturnsItemFilterScriptDirectoryFromPersistenceService()
+        {
+            // Arrange
+            var testInputPath = "C:\\Test\\Path";
+
+            var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
+            mockPersistenceService.SetupGet(p => p.ItemFilterScriptDirectory).Returns(testInputPath).Verifiable();
+
+            var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
+
+            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+
+            // Act
+            string result =  repository.GetItemFilterScriptDirectory();
+
+            // Assert
+            mockPersistenceService.Verify();
+            Assert.AreEqual(result, testInputPath);
+        }
+
+        [Test]
+        public void NewScript_ReturnsScriptFromViewModelFactory()
+        {
+            // Arrange
+            var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
+            
+            var mockItemFilterScriptViewModel = new Mock<IItemFilterScriptViewModel>();
+
+            var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
+            mockItemFilterScriptViewModelFactory.Setup(f => f.Create()).Returns(mockItemFilterScriptViewModel.Object);
+
+            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+            
+            // Act
+            IItemFilterScriptViewModel result = repository.NewScript();
+
+            // Assert
+            Assert.AreEqual(mockItemFilterScriptViewModel.Object, result);
+        }
+    }
+}

Filtration.Tests/Resources/testscript.txt

@@ -1,4 +1,4 @@
-# Loot Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration
+# Item Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration
 # Begin Script Description
 # This is a test script
 # 

Filtration.Tests/Services/TestHTTPService.cs

@@ -0,0 +1,23 @@
+using Filtration.Services;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Services
+{
+    [Ignore("Integration Test - Makes real HTTP call")]
+    [TestFixture]
+    public class TestHTTPService
+    {
+        [Test]
+        public async void GetContent_FetchesDataFromUrl()
+        {
+            // Arrange
+            var service = new HTTPService();
+
+            // Act
+            var result = await service.GetContentAsync("http://ben-wallis.github.io/Filtration/filtration_version.xml");
+
+            // Assert
+            Assert.IsNotNull(result);
+        }
+    }
+}

Filtration.Tests/Services/TestItemFilterPersistenceService.cs

@@ -0,0 +1,124 @@
+using System.IO;
+using Filtration.Common.Services;
+using Filtration.ObjectModel;
+using Filtration.Services;
+using Filtration.Translators;
+using Moq;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Services
+{
+    [TestFixture]
+    public class TestItemFilterPersistenceService
+    {
+        [Test]
+        public void LoadItemFilterScript_CallsTranslatorAndFileSystemService()
+        {
+            // Arrange
+            const string TestInputPath = "C:\\Test Path\\Script.Filter";
+            const string TestScriptString = "This is a test item filter script";
+            var testItemFilterScript = new ItemFilterScript();
+
+            var mockFileSystemService = new Mock<IFileSystemService>();
+            mockFileSystemService.Setup(s => s.ReadFileAsString(TestInputPath)).Returns(TestScriptString).Verifiable();
+
+            var mockItemFilterScriptTranslator = new Mock<IItemFilterScriptTranslator>();
+            mockItemFilterScriptTranslator.Setup(t => t.TranslateStringToItemFilterScript(TestScriptString)).Returns(testItemFilterScript).Verifiable();
+
+            var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
+
+            // Act
+            var script = service.LoadItemFilterScript(TestInputPath);
+
+            // Assert
+            mockFileSystemService.Verify();
+            mockItemFilterScriptTranslator.Verify();
+            Assert.AreEqual(testItemFilterScript, script);
+        }
+
+        [Test]
+        public void SaveItemFilterScript_CallsTranslatorAndFileSystemService()
+        {
+            // Arrange
+            var testFilePath = "C:\\Test\\File.txt";
+            var testScript = new ItemFilterScript {FilePath = testFilePath};
+            var testTranslatedScript = "Test translated script";
+
+            var mockFileSystemService = new Mock<IFileSystemService>();
+            mockFileSystemService.Setup(s => s.WriteFileFromString(testFilePath, testTranslatedScript)).Verifiable();
+
+            var mockItemFilterScriptTranslator = new Mock<IItemFilterScriptTranslator>();
+            mockItemFilterScriptTranslator.Setup(t => t.TranslateItemFilterScriptToString(testScript)).Returns(testTranslatedScript).Verifiable();
+
+            var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
+
+            // Act
+            service.SaveItemFilterScript(testScript);
+
+            // Assert
+            mockFileSystemService.Verify();
+            mockItemFilterScriptTranslator.Verify();
+        }
+
+        [Test]
+        public void DefaultPathOfExileDirectoryExists_CallsFileSystemServiceWithCorrectString()
+        {
+            // Arrange
+            const string TestUserProfilePath = "C:\\Users\\TestUser";
+
+
+            var mockFileSystemService = new Mock<IFileSystemService>();
+            mockFileSystemService.Setup(f => f.GetUserProfilePath()).Returns(TestUserProfilePath).Verifiable();
+            mockFileSystemService.Setup(f => f.DirectoryExists(TestUserProfilePath + "\\Documents\\My Games\\Path of Exile")).Returns(true).Verifiable();
+
+            var mockItemFilterScriptTranslator = new Mock<IItemFilterScriptTranslator>();
+
+            var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
+
+            // Act
+            service.DefaultPathOfExileDirectory();
+
+            // Assert
+            mockFileSystemService.Verify();
+        }
+
+        [Test]
+        public void SetItemFilterScriptDirectory_InvalidPath_ThrowsDirectoryNotFoundException()
+        {
+            // Arrange
+            var testInputPath = "C:\\Test\\Path";
+
+            var mockFileSystemService = new Mock<IFileSystemService>();
+            mockFileSystemService.Setup(f => f.DirectoryExists(testInputPath)).Returns(false).Verifiable();
+
+            var mockItemFilterScriptTranslator = new Mock<IItemFilterScriptTranslator>();
+
+            var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
+
+            // Act
+            
+            // Assert
+            Assert.Throws<DirectoryNotFoundException>(() => service.SetItemFilterScriptDirectory(testInputPath));
+        }
+
+        [Test]
+        public void SetItemFilterScriptDirectory_ValidPath_SetsItemFilterScriptDirectory()
+        {
+            // Arrange
+            var testInputPath = "C:\\Test\\Path";
+
+            var mockFileSystemService = new Mock<IFileSystemService>();
+            mockFileSystemService.Setup(f => f.DirectoryExists(testInputPath)).Returns(true).Verifiable();
+
+            var mockItemFilterScriptTranslator = new Mock<IItemFilterScriptTranslator>();
+
+            var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
+
+            // Act
+            service.SetItemFilterScriptDirectory(testInputPath);
+
+            // Assert
+            Assert.AreEqual(testInputPath, service.ItemFilterScriptDirectory);
+        }
+    }
+}

Filtration.Tests/Services/TestLootFilterPersistenceService.cs

@@ -1,83 +0,0 @@
-using Filtration.Models;
-using Filtration.Services;
-using Filtration.Translators;
-using Moq;
-using NUnit.Framework;
-
-namespace Filtration.Tests.Services
-{
-    [TestFixture]
-    public class TestLootFilterPersistenceService
-    {
-        [Test]
-        public void LoadLootFilterScript_CallsTranslatorAndFileSystemService()
-        {
-            // Arrange
-            const string TestInputPath = "C:\\Test Path\\Script.Filter";
-            const string TestScriptString = "This is a test loot filter script";
-            var testLootFilterScript = new LootFilterScript();
-
-            var mockFileSystemService = new Mock<IFileSystemService>();
-            mockFileSystemService.Setup(s => s.ReadFileAsString(TestInputPath)).Returns(TestScriptString).Verifiable();
-
-            var mockLootFilterScriptTranslator = new Mock<ILootFilterScriptTranslator>();
-            mockLootFilterScriptTranslator.Setup(t => t.TranslateStringToLootFilterScript(TestScriptString)).Returns(testLootFilterScript).Verifiable();
-
-            var service = new LootFilterPersistenceService(mockFileSystemService.Object, mockLootFilterScriptTranslator.Object);
-
-            // Act
-            var script = service.LoadLootFilterScript(TestInputPath);
-
-            // Assert
-            mockFileSystemService.Verify();
-            mockLootFilterScriptTranslator.Verify();
-            Assert.AreEqual(testLootFilterScript, script);
-        }
-
-        [Test]
-        public void SaveLootFilterScript_CallsTranslatorAndFileSystemService()
-        {
-            // Arrange
-            var testFilePath = "C:\\Test\\File.txt";
-            var testScript = new LootFilterScript {FilePath = testFilePath};
-            var testTranslatedScript = "Test translated script";
-
-            var mockFileSystemService = new Mock<IFileSystemService>();
-            mockFileSystemService.Setup(s => s.WriteFileFromString(testFilePath, testTranslatedScript)).Verifiable();
-
-            var mockLootFilterScriptTranslator = new Mock<ILootFilterScriptTranslator>();
-            mockLootFilterScriptTranslator.Setup(t => t.TranslateLootFilterScriptToString(testScript)).Returns(testTranslatedScript).Verifiable();
-
-            var service = new LootFilterPersistenceService(mockFileSystemService.Object, mockLootFilterScriptTranslator.Object);
-
-            // Act
-            service.SaveLootFilterScript(testScript);
-
-            // Assert
-            mockFileSystemService.Verify();
-            mockLootFilterScriptTranslator.Verify();
-        }
-
-        [Test]
-        public void DefaultPathOfExileDirectoryExists_CallsFileSystemServiceWithCorrectString()
-        {
-            // Arrange
-            const string TestUserProfilePath = "C:\\Users\\TestUser";
-
-
-            var mockFileSystemService = new Mock<IFileSystemService>();
-            mockFileSystemService.Setup(f => f.GetUserProfilePath()).Returns(TestUserProfilePath).Verifiable();
-            mockFileSystemService.Setup(f => f.DirectoryExists(TestUserProfilePath + "\\Documents\\My Games\\Path of Exile")).Returns(true).Verifiable();
-
-            var mockLootFilterScriptTranslator = new Mock<ILootFilterScriptTranslator>();
-
-            var service = new LootFilterPersistenceService(mockFileSystemService.Object, mockLootFilterScriptTranslator.Object);
-
-            // Act
-            var result = service.DefaultPathOfExileDirectory();
-
-            // Assert
-            mockFileSystemService.Verify();
-        }
-    }
-}

Filtration.Tests/Services/TestStaticDataService.cs

@@ -1,4 +1,5 @@
-using Filtration.Services;
+using Filtration.Common.Services;
+using Filtration.Services;
 using Moq;
 using NUnit.Framework;
 
@@ -13,7 +14,7 @@ namespace Filtration.Tests.Services
             // Arrange
 
             var mockFileSystemService = new Mock<IFileSystemService>();
-            mockFileSystemService.Setup(f => f.ReadFileAsString(It.IsAny<string>())).Verifiable();
+            mockFileSystemService.Setup(f => f.ReadFileAsString(It.IsAny<string>())).Returns("TestResult").Verifiable();
 
             var service = new StaticDataService(mockFileSystemService.Object);
 

Filtration.Tests/Services/TestUpdateService.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Filtration.Models;
+using Filtration.Services;
+using Moq;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Services
+{
+    [TestFixture]
+    public class TestUpdateService
+    {
+        [Test]
+        public void DeserializeUpdateData_ReturnsCorrectData()
+        {
+            // Arrange
+            var testInputData = @"<UpdateData>
+	                                <CurrentVersion>0.2</CurrentVersion>
+	                                <ReleaseDate>2015-07-01</ReleaseDate>
+                                    <DownloadUrl>http://www.google.com</DownloadUrl>
+	                                <ReleaseNotes>* Release notes line 1
+* Release notes line 2
+* More really great release notes!</ReleaseNotes>
+                                </UpdateData>";
+
+            var expectedResult = new UpdateData
+            {
+                CurrentVersion = 0.2m,
+                DownloadUrl = "http://www.google.com",
+                ReleaseDate = new DateTime(2015, 7, 1),
+                ReleaseNotes = @"* Release notes line 1
+* Release notes line 2
+* More really great release notes!"
+            };
+
+            var mockHTTPService = new Mock<IHTTPService>();
+            var service = new UpdateCheckService(mockHTTPService.Object);
+
+            // Act
+            var result = service.DeserializeUpdateData(testInputData);
+
+            // Assert
+            Assert.AreEqual(expectedResult.CurrentVersion, result.CurrentVersion);
+            Assert.AreEqual(expectedResult.DownloadUrl, result.DownloadUrl);
+            Assert.AreEqual(expectedResult.ReleaseDate, result.ReleaseDate);
+            Assert.AreEqual(expectedResult.ReleaseNotes, result.ReleaseNotes);
+        }
+
+    }
+}

Filtration.Tests/Translators/TestBlockGroupHierarchyBuilder.cs

@@ -0,0 +1,121 @@
+using System.Collections.Generic;
+using Filtration.ObjectModel;
+using Filtration.Translators;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Translators
+{
+    [TestFixture]
+    public class TestBlockGroupHierarchyBuilder
+    {
+        [Test]
+        public void IntegrateStringListIntoBlockGroupHierarchy_ReturnsBlockGroupWithCorrectName()
+        {
+            // Arrange
+            var inputStrings = new List<string> {"Block Group", "Sub Block Group"};
+
+            var rootBlock = new ItemFilterBlockGroup("Root", null);
+            var builder = new BlockGroupHierarchyBuilder();
+
+            // Act
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+            
+            // Assert
+            Assert.AreEqual(1, rootBlock.ChildGroups.Count);
+            Assert.AreEqual("Sub Block Group", result.GroupName);
+        }
+
+        [Test]
+        public void IntegrateStringListIntoBlockGroupHierarchy_SingleBlockGroup()
+        {
+            // Arrange
+            var inputStrings = new List<string> { "Block Group" };
+
+            var rootBlock = new ItemFilterBlockGroup("Root", null);
+            var builder = new BlockGroupHierarchyBuilder();
+
+            // Act
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+
+            // Assert
+            Assert.AreEqual(1, rootBlock.ChildGroups.Count);
+            Assert.AreEqual("Block Group", result.GroupName);
+        }
+
+        [Test]
+        public void IntegrateStringListIntoBlockGroupHierarchy_AdvancedBlockGroup_MarksBlockGroupAsAdvanced()
+        {
+            // Arrange
+            var inputStrings = new List<string> { "~Block Group" };
+
+            var rootBlock = new ItemFilterBlockGroup("Root", null);
+            var builder = new BlockGroupHierarchyBuilder();
+
+            // Act
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+
+            // Assert
+            Assert.AreEqual(1, rootBlock.ChildGroups.Count);
+            Assert.AreEqual("Block Group", result.GroupName);
+            Assert.AreEqual(true, result.Advanced);
+        }
+
+        [Test]
+        public void IntegrateStringListIntoBlockGroupHierarchy_AdvancedBlockGroup_ChildrenAreCreatedAsAdvanced()
+        {
+            // Arrange
+            var inputStrings = new List<string> { "~Advanced Block Group", "This should be advanced too" };
+
+            var rootBlock = new ItemFilterBlockGroup("Root", null);
+            var builder = new BlockGroupHierarchyBuilder();
+
+            // Act
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+
+            // Assert
+            Assert.AreEqual(1, rootBlock.ChildGroups.Count);
+            Assert.AreEqual(true, result.Advanced);
+        }
+
+        [Test]
+        public void IntegrateStringListIntoBlockGroupHierarchy_ExistingAdvancedBlockGroup_SetsParentCorrectly()
+        {
+            // Arrange
+            var inputStrings = new List<string> { "~Block Group" };
+
+            var rootBlock = new ItemFilterBlockGroup("Root", null);
+            var subBlock = new ItemFilterBlockGroup("Block Group", rootBlock, true);
+            rootBlock.ChildGroups.Add(subBlock);
+
+            var builder = new BlockGroupHierarchyBuilder();
+
+            // Act
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+
+            // Assert
+            Assert.AreEqual(1, rootBlock.ChildGroups.Count);
+            Assert.AreEqual("Block Group", result.GroupName);
+            Assert.AreEqual(true, result.Advanced);
+        }
+
+        [Test]
+        public void IntegrateStringListIntoBlockGroupHierarchy_MultipleBlockGroups()
+        {
+            // Arrange
+            var rootBlock = new ItemFilterBlockGroup("Root", null);
+            var builder = new BlockGroupHierarchyBuilder();
+
+            // Act
+            var inputStrings = new List<string> { "Block Group" };
+            builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+            inputStrings = new List<string> { "Block Group 2" };
+            builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+            inputStrings = new List<string> { "Block Group", "Sub Block Group" };
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
+
+            // Assert
+            Assert.AreEqual(2, rootBlock.ChildGroups.Count);
+            Assert.AreEqual("Sub Block Group", result.GroupName);
+        }
+    }
+}

Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs

@@ -0,0 +1,311 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.ThemeEditor;
+using Filtration.Properties;
+using Filtration.Translators;
+using Moq;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Translators
+{
+    [TestFixture]
+    public class TestItemFilterScriptTranslator
+    {
+        private ItemFilterScriptTranslatorTestUtility _testUtility;
+
+        [SetUp]
+        public void ItemFilterScriptTranslatorTestSetup()
+        {
+            _testUtility = new ItemFilterScriptTranslatorTestUtility();
+            Settings.Default.Reset();
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterScript_ReturnsScriptWithCorrectNumberOfBlocks()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/testscript.txt");
+
+            _testUtility.MockItemFilterBlockTranslator.Setup(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>())).Verifiable();
+
+            // Act
+            var script = _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            Assert.AreEqual(5, script.ItemFilterBlocks.Count);
+            _testUtility.MockItemFilterBlockTranslator.Verify();
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterScript_ReturnsScriptWithDescriptionCorrectlySet()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/testscript.txt");
+            var expectedDescription =   "Item Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration" + Environment.NewLine +
+                                        "Begin Script Description" + Environment.NewLine +
+                                        "This is a test script" + Environment.NewLine +
+                                        Environment.NewLine +
+                                        "End Script Description";
+
+            var mockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
+            mockItemFilterBlockTranslator.Setup(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>())).Verifiable();
+
+            // Act
+            var script = _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            Assert.AreEqual(expectedDescription, script.Description);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterScript_CallsThemeComponentListBuilderInitialise()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/testscript.txt");
+
+            _testUtility.MockThemeComponentListBuilder.Setup(t => t.Initialise()).Verifiable();
+            // Act
+            _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            _testUtility.MockThemeComponentListBuilder.Verify();
+        }
+
+
+        [Test]
+        public void TranslateStringToItemFilterScript_SetsScriptThemeComponentsToComponentListBuilderResult()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/testscript.txt");
+            List<ThemeComponent> testThemeComponents = new List<ThemeComponent>();
+
+            _testUtility.MockThemeComponentListBuilder.Setup(t => t.GetComponents()).Returns(testThemeComponents).Verifiable();
+            // Act
+            var result = _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            _testUtility.MockThemeComponentListBuilder.Verify();
+            Assert.AreSame(testThemeComponents, result.ThemeComponents);
+        }
+
+        [Ignore("Integration Test")]
+        [Test]
+        public void TranslateStringToItemFilterScript_ThioleItemFilterTest()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/ThioleItemFilter.txt");
+
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
+
+            // Act
+            translator.TranslateStringToItemFilterScript(testInput);
+            // Assert
+            // Not crashing out when loading a huge script means this integration test has passed!
+        }
+
+        [Test]
+        public void TranslateItemFilterScriptToString_OneBlock_CallsTranslator()
+        {
+            // Arrange
+            var testScript = new ItemFilterScript();
+
+            var testBlock = new ItemFilterBlock();
+            testBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.Equal, 5));
+
+            const string BlockOutput = "Test Script Output";
+
+            testScript.ItemFilterBlocks.Add(testBlock);
+
+            _testUtility.MockItemFilterBlockTranslator.Setup(t => t.TranslateItemFilterBlockToString(testBlock)).Returns(BlockOutput).Verifiable();
+
+
+            // Act
+            _testUtility.ScriptTranslator.TranslateItemFilterScriptToString(testScript);
+
+            // Assert
+            _testUtility.MockItemFilterBlockTranslator.Verify();
+        }
+
+        [Test]
+        public void TranslateItemFilterScriptToString_ExtraLineBetweenBlocksSettingFalse_ReturnsCorrectOutput()
+        {
+            Settings.Default.ExtraLineBetweenBlocks = false;
+
+            var script = new ItemFilterScript();
+            var block1 = new ItemFilterBlock { Description = "Test Filter 1" };
+            block1.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 5));
+
+            var block2 = new ItemFilterBlock();
+            block2.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.LessThan, 15));
+            block2.BlockItems.Add(new FontSizeBlockItem(7));
+            block2.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 3));
+
+            script.ItemFilterBlocks.Add(block1);
+            script.ItemFilterBlocks.Add(block2);
+
+            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine +
+                                 "# Test Filter 1" + Environment.NewLine +
+                                 "Show" + Environment.NewLine +
+                                 "    ItemLevel > 5" + Environment.NewLine +
+                                 "Show" + Environment.NewLine +
+                                 "    Quality < 15" + Environment.NewLine +
+                                 "    Width = 3" + Environment.NewLine +
+                                 "    SetFontSize 7" + Environment.NewLine;
+
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
+
+            // Act
+            var result = translator.TranslateItemFilterScriptToString(script);
+
+            // Assert
+            Assert.AreEqual(expectedOutput, result);
+        }
+
+        [Test]
+        public void TranslateItemFilterScriptToString_FullScript_ReturnsCorrectOutput()
+        {
+            var script = new ItemFilterScript
+            {
+                Description = "Test script description" + Environment.NewLine + 
+                              "This is a really great script!" + Environment.NewLine + 
+                              "Multiple line script descriptions are fun!"
+            };
+            var block1 = new ItemFilterBlock {Description = "Test Filter 1"};
+            block1.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 5));
+
+            var block2 = new ItemFilterBlock();
+            block2.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.LessThan, 15));
+            block2.BlockItems.Add(new FontSizeBlockItem(7));
+            block2.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 3));
+
+            script.ItemFilterBlocks.Add(block1);
+            script.ItemFilterBlocks.Add(block2);
+
+            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine +
+                                 "# Test script description" + Environment.NewLine +
+                                 "# This is a really great script!" + Environment.NewLine + 
+                                 "# Multiple line script descriptions are fun!" + Environment.NewLine +
+                                 Environment.NewLine +
+                                 "# Test Filter 1" + Environment.NewLine +
+                                 "Show" + Environment.NewLine +
+                                 "    ItemLevel > 5" + Environment.NewLine +
+                                 Environment.NewLine +
+                                 "Show" + Environment.NewLine +
+                                 "    Quality < 15" + Environment.NewLine +
+                                 "    Width = 3" + Environment.NewLine +
+                                 "    SetFontSize 7" + Environment.NewLine + Environment.NewLine;
+
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
+
+            // Act
+            var result = translator.TranslateItemFilterScriptToString(script);
+
+            // Assert
+            Assert.AreEqual(expectedOutput, result);
+        }
+        
+        [Test]
+        public void TranslateItemFilterScriptToString_FullScriptWithExistingFiltrationTagline_ReturnsCorrectOutput()
+        {
+            var script = new ItemFilterScript
+            {
+                Description = "Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine +
+                              "Test script description" + Environment.NewLine
+            };
+
+            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" +
+                                 Environment.NewLine +
+                                 "# Test script description" + Environment.NewLine + Environment.NewLine;
+
+            // Act
+            var result = _testUtility.ScriptTranslator.TranslateItemFilterScriptToString(script);
+
+            // Assert
+            Assert.AreEqual(expectedOutput, result);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterScript_SectionDirectlyBeforeBlockWithoutDescription_ReturnsCorrectObject()
+        {
+            // Arrange
+            var testInputScript = "# My Script" + Environment.NewLine +
+                                  Environment.NewLine +
+                                  "# Section: Chance Bases" + Environment.NewLine +
+                                  "Show" + Environment.NewLine +
+                                  "    BaseType \"Lapis Amulet\" \"Amber Amulet\"" + Environment.NewLine +
+                                  "    SetBorderColor 255 0 255" + Environment.NewLine +
+                                  "    SetFontSize 25";
+
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
+
+            // Act
+            var result = translator.TranslateStringToItemFilterScript(testInputScript);
+
+            // Assert
+            Assert.AreEqual(2, result.ItemFilterBlocks.Count);
+            var block = result.ItemFilterBlocks.First(l => l.GetType() != typeof(ItemFilterSection));
+            Assert.AreEqual(4, block.BlockItems.Count);
+            var baseTypeItem = block.BlockItems.OfType<BaseTypeBlockItem>().First();
+            Assert.AreEqual(2, baseTypeItem.Items.Count);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterScript_OneLineDescriptionNoBlockDescriptionAddsDescriptionToScript()
+        {
+            // Arrange
+            var testInputScript = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" +
+                                  Environment.NewLine +
+                                  "Show" + Environment.NewLine +
+                                  "BaseType \"Maelström Staff\"" + Environment.NewLine + Environment.NewLine;
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
+
+            // Act
+            var result = translator.TranslateStringToItemFilterScript(testInputScript);
+
+            // Assert
+            Assert.AreEqual("Script edited with Filtration - https://github.com/ben-wallis/Filtration", result.Description);
+            var firstBlock = result.ItemFilterBlocks.First();
+            Assert.IsNullOrEmpty(firstBlock.Description);
+        }
+
+        private class ItemFilterScriptTranslatorTestUtility
+        {
+            public ItemFilterScriptTranslatorTestUtility()
+            {
+                // Mock setups
+                MockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
+                MockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
+                MockThemeComponentListBuilder = new Mock<IThemeComponentListBuilder>();
+
+                // Class under test instantiation
+                ScriptTranslator = new ItemFilterScriptTranslator(MockItemFilterBlockTranslator.Object, MockBlockGroupHierarchyBuilder.Object, MockThemeComponentListBuilder.Object);
+            }
+
+            public ItemFilterScriptTranslator ScriptTranslator { get; private set; }
+            public Mock<IItemFilterBlockTranslator> MockItemFilterBlockTranslator { get; private set; }
+            public Mock<IBlockGroupHierarchyBuilder> MockBlockGroupHierarchyBuilder { get; private set; }
+            public Mock<IThemeComponentListBuilder> MockThemeComponentListBuilder { get; private set; }
+        }
+    }
+}

Filtration.Tests/Translators/TestLootFilterScriptTranslator.cs

@@ -1,196 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using Filtration.Enums;
-using Filtration.Models;
-using Filtration.Models.BlockItemTypes;
-using Filtration.Translators;
-using Moq;
-using NUnit.Framework;
-
-namespace Filtration.Tests.Translators
-{
-    [TestFixture]
-    public class TestLootFilterScriptTranslator
-    {
-        [Test]
-        public void TranslateStringToLootFilterScript_ReturnsScriptWithCorrectNumberOfBlocks()
-        {
-            // Arrange
-            var testInput = File.ReadAllText(@"Resources/testscript.txt");
-
-            var mockLootFilterBlockTranslator = new Mock<ILootFilterBlockTranslator>();
-            mockLootFilterBlockTranslator.Setup(t => t.TranslateStringToLootFilterBlock(It.IsAny<string>())).Verifiable();
-
-            var translator = new LootFilterScriptTranslator(mockLootFilterBlockTranslator.Object);
-
-            // Act
-            var script = translator.TranslateStringToLootFilterScript(testInput);
-
-            // Assert
-            Assert.AreEqual(5, script.LootFilterBlocks.Count);
-            mockLootFilterBlockTranslator.Verify();
-        }
-
-        [Test]
-        public void TranslateStringToLootFilterScript_ReturnsScriptWithDescriptionCorrectlySet()
-        {
-            // Arrange
-            var testInput = File.ReadAllText(@"Resources/testscript.txt");
-            var expectedDescription =   "Loot Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration" + Environment.NewLine +
-                                        "Begin Script Description" + Environment.NewLine +
-                                        "This is a test script" + Environment.NewLine +
-                                        Environment.NewLine +
-                                        "End Script Description";
-
-            var mockLootFilterBlockTranslator = new Mock<ILootFilterBlockTranslator>();
-            mockLootFilterBlockTranslator.Setup(t => t.TranslateStringToLootFilterBlock(It.IsAny<string>())).Verifiable();
-
-            var translator = new LootFilterScriptTranslator(mockLootFilterBlockTranslator.Object);
-
-            // Act
-            var script = translator.TranslateStringToLootFilterScript(testInput);
-
-            // Assert
-            Assert.AreEqual(expectedDescription, script.Description);
-        }
-
-        [Ignore("Integration Test")]
-        [Test]
-        public void TranslateStringToLootFilterScript_ThioleLootFilterTest()
-        {
-            // Arrange
-            var testInput = File.ReadAllText(@"Resources/ThioleLootFilter.txt");
-
-            
-            var BlockTranslator = new LootFilterBlockTranslator();
-            var translator = new LootFilterScriptTranslator(BlockTranslator);
-
-            // Act
-            var script = translator.TranslateStringToLootFilterScript(testInput);
-            // Assert
-            // Not crashing out when loading a huge script means this integration test has passed!
-        }
-
-        [Test]
-        public void TranslateLootFilterScriptToString_OneBlock_CallsTranslator()
-        {
-            // Arrange
-            var testScript = new LootFilterScript();
-
-            var testBlock = new LootFilterBlock();
-            testBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.Equal, 5));
-
-            var BlockOutput = "Test Script Output";
-            var expectedOutput = "Test Script Output" + Environment.NewLine + Environment.NewLine;
-
-            testScript.LootFilterBlocks.Add(testBlock);
-
-            var mockLootFilterBlockTranslator = new Mock<ILootFilterBlockTranslator>();
-            mockLootFilterBlockTranslator.Setup(t => t.TranslateLootFilterBlockToString(testBlock)).Returns(BlockOutput).Verifiable();
-
-            var translator = new LootFilterScriptTranslator(mockLootFilterBlockTranslator.Object);
-
-            // Act
-            var result = translator.TranslateLootFilterScriptToString(testScript);
-
-            // Assert
-            Assert.AreEqual(expectedOutput, result);
-            mockLootFilterBlockTranslator.Verify();
-        }
-
-        [Test]
-        public void TranslateLootFilterScriptToString_FullScript_ReturnsCorrectOutput()
-        {
-            var script = new LootFilterScript
-            {
-                Description = "Test script description" + Environment.NewLine + 
-                              "This is a really great script!" + Environment.NewLine + 
-                              "Multiple line script descriptions are fun!"
-            };
-            var block1 = new LootFilterBlock {Description = "Test Filter 1"};
-            block1.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 5));
-
-            var block2 = new LootFilterBlock();
-            block2.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.LessThan, 15));
-            block2.BlockItems.Add(new FontSizeBlockItem(7));
-            block2.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 3));
-
-            script.LootFilterBlocks.Add(block1);
-            script.LootFilterBlocks.Add(block2);
-
-            var expectedOutput = "# Script edited with Filtration - http://ben-wallis.github.io/Filtration/" + Environment.NewLine +
-                                 "# Test script description" + Environment.NewLine +
-                                 "# This is a really great script!" + Environment.NewLine + 
-                                 "# Multiple line script descriptions are fun!" + Environment.NewLine +
-                                 Environment.NewLine +
-                                 "# Test Filter 1" + Environment.NewLine +
-                                 "Show" + Environment.NewLine +
-                                 "    ItemLevel > 5" + Environment.NewLine +
-                                 Environment.NewLine +
-                                 "Show" + Environment.NewLine +
-                                 "    Quality < 15" + Environment.NewLine +
-                                 "    Width = 3" + Environment.NewLine +
-                                 "    SetFontSize 7" + Environment.NewLine + Environment.NewLine;
-
-            var blockTranslator = new LootFilterBlockTranslator();
-            var translator = new LootFilterScriptTranslator(blockTranslator);
-
-            // Act
-            var result = translator.TranslateLootFilterScriptToString(script);
-
-            // Assert
-            Assert.AreEqual(expectedOutput, result);
-        }
-        
-        [Test]
-        public void TranslateLootFilterScriptToString_FullScriptWithExistingFiltrationTagline_ReturnsCorrectOutput()
-        {
-            var script = new LootFilterScript
-            {
-                Description = "Script edited with Filtration - http://ben-wallis.github.io/Filtration/" + Environment.NewLine +
-                              "Test script description" + Environment.NewLine
-            };
-
-            var expectedOutput = "# Script edited with Filtration - http://ben-wallis.github.io/Filtration/" +
-                                 Environment.NewLine +
-                                 "# Test script description" + Environment.NewLine + Environment.NewLine;
-
-            var blockTranslator = new LootFilterBlockTranslator();
-            var translator = new LootFilterScriptTranslator(blockTranslator);
-
-            // Act
-            var result = translator.TranslateLootFilterScriptToString(script);
-
-            // Assert
-            Assert.AreEqual(expectedOutput, result);
-        }
-
-        [Test]
-        public void TranslateStringToLootFilterScript_SectionDirectlyBeforeBlockWithoutDescription_ReturnsCorrectObject()
-        {
-            // Arrange
-            var testInputScript = "# My Script" + Environment.NewLine +
-                                  Environment.NewLine +
-                                  "# Section: Chance Bases" + Environment.NewLine +
-                                  "Show" + Environment.NewLine +
-                                  "    BaseType \"Lapis Amulet\" \"Amber Amulet\"" + Environment.NewLine +
-                                  "    SetBorderColor 255 0 255" + Environment.NewLine +
-                                  "    SetFontSize 25";
-
-            var blockTranslator = new LootFilterBlockTranslator();
-            var translator = new LootFilterScriptTranslator(blockTranslator);
-
-            // Act
-            var result = translator.TranslateStringToLootFilterScript(testInputScript);
-
-            // Assert
-            Assert.AreEqual(2, result.LootFilterBlocks.Count);
-            var block = result.LootFilterBlocks.First(l => l.GetType() != typeof(LootFilterSection));
-            Assert.AreEqual(4, block.BlockItems.Count);
-            var baseTypeItem = block.BlockItems.OfType<BaseTypeBlockItem>().First();
-            Assert.AreEqual(2, baseTypeItem.Items.Count);
-
-        }
-    }
-}

Filtration.Tests/Translators/TestThemeComponentListBuilder.cs

@@ -0,0 +1,32 @@
+using System.Net.Mime;
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.Translators;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Translators
+{
+    [TestFixture]
+    public class TestThemeComponentListBuilder
+    {
+        [Test]
+        public void AddComponent_ReturnsFirstAddedComponent_WhenComponentAddedTwice()
+        {
+            // Arrange
+
+            var testInputTargetType = ThemeComponentType.TextColor;
+            var testInputComponentName = "testComponent";
+            var testInputColor = new Color();
+
+            var builder = new ThemeComponentListBuilder();
+
+            // Act
+            var firstResult = builder.AddComponent(testInputTargetType, testInputComponentName, testInputColor);
+            var secondResult = builder.AddComponent(testInputTargetType, testInputComponentName, testInputColor);
+
+            // Assert
+            Assert.AreSame(firstResult, secondResult);
+        }
+    }
+}

Filtration.Tests/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="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{450AC313-BF25-4BFD-A066-9F39F026FDCF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.ThemeEditor.Tests</RootNamespace>
+    <AssemblyName>Filtration.ThemeEditor.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.2.1506.2515\lib\net40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Models\TestTheme.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Providers\TestThemeProvider.cs" />
+    <Compile Include="Services\TestThemeService.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+      <Name>Filtration.ObjectModel</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Filtration.ThemeEditor\Filtration.ThemeEditor.csproj">
+      <Project>{41b8f5c2-65aa-42f0-a20b-6f95b13a9f48}</Project>
+      <Name>Filtration.ThemeEditor</Name>
+    </ProjectReference>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.ThemeEditor.Tests/Models/TestTheme.cs

@@ -0,0 +1,78 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.ThemeEditor;
+using NUnit.Framework;
+
+namespace Filtration.ThemeEditor.Tests.Models
+{
+    [TestFixture]
+    public class TestTheme
+    {
+        [Test]
+        public void ComponentExists_ComponentDoesExist_ReturnsTrue()
+        {
+            // Arrange
+            var theme = new Theme();
+
+            var testInputComponentTargetType = ThemeComponentType.TextColor;
+            const string TestInputComponentName = "test";
+
+            theme.AddComponent(testInputComponentTargetType, TestInputComponentName, new Color());
+            
+            // Act
+            var result = theme.ComponentExists(testInputComponentTargetType, TestInputComponentName);
+
+            // Assert
+            Assert.AreEqual(true, result);
+        }
+        
+        [Test]
+        public void ComponentExists_ComponentDoesNotExist_DifferentNameSameType_ReturnsFalse()
+        {
+            // Arrange
+            var theme = new Theme();
+
+            var testInputComponentTargetType = ThemeComponentType.TextColor;
+            const string TestInputComponentName = "test";
+            theme.AddComponent(testInputComponentTargetType, TestInputComponentName, new Color());
+
+            // Act
+            var result = theme.ComponentExists(testInputComponentTargetType, "blah");
+
+            // Assert
+            Assert.AreEqual(false, result);
+        }
+
+        [Test]
+        public void ComponentExists_ComponentDoesNotExist_DifferentTypeSameName_ReturnsFalse()
+        {
+            // Arrange
+            var theme = new Theme();
+
+            var testInputComponentTargetType = ThemeComponentType.TextColor;
+            const string TestInputComponentName = "test";
+
+            theme.AddComponent(testInputComponentTargetType, TestInputComponentName, new Color());
+
+            // Act
+            var result = theme.ComponentExists(ThemeComponentType.BorderColor, TestInputComponentName);
+
+            // Assert
+            Assert.AreEqual(false, result);
+        }
+
+        [Test]
+        public void ComponentExists_ComponentDoesNotExist_NoComponents_ReturnsFalse()
+        {
+            // Arrange
+            var theme = new Theme();
+            
+            // Act
+            var result = theme.ComponentExists(ThemeComponentType.BorderColor, "test");
+
+            // Assert
+            Assert.AreEqual(false, result);
+        }
+    }
+}

Filtration.ThemeEditor.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.ThemeEditor.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.ThemeEditor.Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("02c5856c-03f5-4942-bdba-ccc013088c2c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Filtration.ThemeEditor.Tests/Providers/TestThemeProvider.cs

@@ -0,0 +1,14 @@
+using NUnit.Framework;
+
+namespace Filtration.ThemeEditor.Tests.Providers
+{
+    [TestFixture]
+    public class TestThemeProvider
+    {
+        [Test]
+        public void CreateThemeFromScript_()
+        {
+            
+        }
+    }
+}

Filtration.ThemeEditor.Tests/Services/TestThemeService.cs

@@ -0,0 +1,67 @@
+using System.Windows.Media;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.ThemeEditor;
+using Filtration.ThemeEditor.Services;
+using NUnit.Framework;
+
+namespace Filtration.ThemeEditor.Tests.Services
+{
+    [TestFixture]
+    public class TestThemeService
+    {
+        [Test]
+        public void ApplyThemeToScript_SingleBlock_ReplacesColor()
+        {
+            // Arrange
+
+            var testInputBlockItem = new TextColorBlockItem();
+            var testInputBlock = new ItemFilterBlock();
+            testInputBlock.BlockItems.Add(testInputBlockItem);
+            var testInputScript = new ItemFilterScript();
+            testInputScript.ItemFilterBlocks.Add(testInputBlock);
+            
+            var testInputTheme = new Theme();
+            var testInputThemeComponentColor = new Color{ R = 255, G = 0, B = 1 };
+            var testInputThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Test Component 1", testInputThemeComponentColor);
+            testInputTheme.Components.Add(testInputThemeComponent);
+            testInputBlockItem.ThemeComponent = testInputThemeComponent;
+
+            var service = new ThemeService();
+
+            // Act
+            service.ApplyThemeToScript(testInputTheme, testInputScript);
+
+            // Assert
+            Assert.AreEqual(testInputThemeComponentColor, testInputBlockItem.Color);
+        }
+        
+        [Test]
+        public void ApplyThemeToScript_SingleBlockDifferentComponentName_DoesNotReplaceColour()
+        {
+            // Arrange
+
+            var testInputBlockItem = new TextColorBlockItem();
+            var testInputBlock = new ItemFilterBlock();
+            testInputBlock.BlockItems.Add(testInputBlockItem);
+            var testInputScript = new ItemFilterScript();
+            testInputScript.ItemFilterBlocks.Add(testInputBlock);
+
+            var testInputTheme = new Theme();
+            var testInputThemeComponentColor = new Color { R = 255, G = 0, B = 1 };
+            var testInputThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Test Component 1", testInputThemeComponentColor);
+            var testInputBlockItemThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Different Component", testInputThemeComponentColor);
+            testInputTheme.Components.Add(testInputThemeComponent);
+            testInputBlockItem.ThemeComponent = testInputBlockItemThemeComponent;
+
+            var service = new ThemeService();
+
+            // Act
+            service.ApplyThemeToScript(testInputTheme, testInputScript);
+
+            // Assert
+            Assert.AreNotEqual(testInputThemeComponentColor, testInputBlockItem.Color);
+        }
+    }
+}

Filtration.ThemeEditor.Tests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.2.1506.2515" targetFramework="net451" />
+  <package id="NUnit" version="2.6.4" targetFramework="net451" />
+</packages>

Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.Extensions;
+
+namespace Filtration.ThemeEditor.Converters
+{
+    public class ThemeComponentTypeToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return string.Empty;
+            
+            }
+            var type = (ThemeComponentType) value;
+
+            return type.GetAttributeDescription();
+
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Filtration.ThemeEditor/Filtration.ThemeEditor.csproj

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.ThemeEditor</RootNamespace>
+    <AssemblyName>Filtration.ThemeEditor</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="AutoMapper.Net4">
+      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Core">
+      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Windsor">
+      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\GalaSoft.MvvmLight.Platform.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>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.ObjectModel" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.1.1.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="Xceed.Wpf.AvalonDock">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.DataGrid">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Converters\ThemeComponentTypeToStringConverter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Providers\ThemeProvider.cs" />
+    <Compile Include="Services\ThemePersistenceService.cs" />
+    <Compile Include="Services\ThemeService.cs" />
+    <Compile Include="ViewModels\IThemeViewModelFactory.cs" />
+    <Compile Include="ViewModels\ThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\ThemeViewModel.cs" />
+    <Compile Include="Views\ThemeComponentControl.xaml.cs">
+      <DependentUpon>ThemeComponentControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ThemeControl.xaml.cs">
+      <DependentUpon>ThemeControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WindsorInstallers\ProvidersInstaller.cs" />
+    <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
+    <Compile Include="WindsorInstallers\ViewModelsInstaller.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Filtration.Common\Filtration.Common.csproj">
+      <Project>{8cb44f28-2956-4c2a-9314-72727262edd4}</Project>
+      <Name>Filtration.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Filtration.Interface\Filtration.Interface.csproj">
+      <Project>{0f333344-7695-47b2-b0e6-172e4de74819}</Project>
+      <Name>Filtration.Interface</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+      <Name>Filtration.ObjectModel</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Page Include="Views\ThemeComponentControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ThemeControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Filtration.ThemeEditor/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.ThemeEditor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.ThemeEditor")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7e4e2310-7f12-497e-a3ff-7ec7282ff8e9")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Filtration.ThemeEditor/Providers/ThemeProvider.cs

@@ -0,0 +1,58 @@
+using System.Collections.ObjectModel;
+using AutoMapper;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.ThemeEditor;
+using Filtration.ThemeEditor.Services;
+using Filtration.ThemeEditor.ViewModels;
+
+namespace Filtration.ThemeEditor.Providers
+{
+    public interface IThemeProvider
+    {
+        IThemeViewModel NewThemeForScript(ItemFilterScript script);
+        IThemeViewModel LoadThemeFromFile(string filePath);
+        Theme LoadThemeModelFromFile(string filePath);
+        void SaveTheme(IThemeViewModel themeViewModel, string filePath);
+    }
+
+    internal class ThemeProvider : IThemeProvider
+    {
+        private readonly IThemeViewModelFactory _themeViewModelFactory;
+        private readonly IThemePersistenceService _themePersistenceService;
+
+        public ThemeProvider(IThemeViewModelFactory themeViewModelFactory, IThemePersistenceService themePersistenceService)
+        {
+            _themeViewModelFactory = themeViewModelFactory;
+            _themePersistenceService = themePersistenceService;
+        }
+
+        public IThemeViewModel NewThemeForScript(ItemFilterScript script)
+        {
+            var themeComponentViewModels = Mapper.Map<ObservableCollection<ThemeComponentViewModel>>(script.ThemeComponents);
+            var themeViewModel = _themeViewModelFactory.Create();
+            themeViewModel.Initialise(themeComponentViewModels, true);
+            themeViewModel.FilePath = "Untitled.filtertheme";
+
+            return themeViewModel;
+        }
+
+        public IThemeViewModel LoadThemeFromFile(string filePath)
+        {
+            var model = _themePersistenceService.LoadTheme(filePath);
+            var viewModel = Mapper.Map<IThemeViewModel>(model);
+            viewModel.FilePath = filePath;
+            return viewModel;
+        }
+
+        public Theme LoadThemeModelFromFile(string filePath)
+        {
+            return _themePersistenceService.LoadTheme(filePath);
+        }
+
+        public void SaveTheme(IThemeViewModel themeViewModel, string filePath)
+        {
+            var theme = Mapper.Map<Theme>(themeViewModel);
+            _themePersistenceService.SaveTheme(theme, filePath);
+        }
+    }
+}

Filtration.ThemeEditor/Services/ThemePersistenceService.cs

@@ -0,0 +1,40 @@
+using System.IO;
+using System.Xml.Serialization;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ThemeEditor.Services
+{
+    internal interface IThemePersistenceService
+    {
+        Theme LoadTheme(string filePath);
+        void SaveTheme(Theme theme, string filePath);
+    }
+
+    internal class ThemePersistenceService : IThemePersistenceService
+    {
+        public Theme LoadTheme(string filePath)
+        {
+            var xmlSerializer = new XmlSerializer(typeof(Theme));
+
+            Theme loadedTheme;
+
+            using (Stream reader = new FileStream(filePath, FileMode.Open))
+            {
+                loadedTheme = (Theme)xmlSerializer.Deserialize(reader);
+            }
+            
+            loadedTheme.FilePath = filePath;
+            return loadedTheme;
+        }
+
+        public void SaveTheme(Theme theme, string filePath)
+        {
+            var xmlSerializer = new XmlSerializer(typeof(Theme));
+
+            using (Stream writer = new FileStream(filePath, FileMode.Create))
+            {
+                xmlSerializer.Serialize(writer, theme);
+            }
+        }
+    }
+}

Filtration.ThemeEditor/Services/ThemeService.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using System.Windows;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ThemeEditor.Services
+{
+    public interface IThemeService
+    {
+        void ApplyThemeToScript(Theme theme, ItemFilterScript script);
+    }
+
+    public class ThemeService : IThemeService
+    {
+        public void ApplyThemeToScript(Theme theme, ItemFilterScript script)
+        {
+            var mismatchedComponents = false;
+            foreach (var component in theme.Components)
+            {
+                var componentMatched = false;
+                Type targetType = null;
+                switch (component.ComponentType)
+                {
+                    case ThemeComponentType.BackgroundColor:
+                        targetType = typeof (BackgroundColorBlockItem);
+                        break;
+                    case ThemeComponentType.TextColor:
+                        targetType = typeof (TextColorBlockItem);
+                        break;
+                    case ThemeComponentType.BorderColor:
+                        targetType = typeof (BorderColorBlockItem);
+                        break;
+                }
+
+                foreach (var block in script.ItemFilterBlocks)
+                {
+                    foreach (var blockItem in block.BlockItems.Where(i => i.GetType() == targetType))
+                    {
+                        var colorBlockItem = (ColorBlockItem) blockItem;
+                        if (colorBlockItem.ThemeComponent != null &&
+                            colorBlockItem.ThemeComponent.ComponentName == component.ComponentName)
+                        {
+                            colorBlockItem.Color = component.Color;
+                            componentMatched = true;
+                        }
+                    }   
+                }
+
+                if (!componentMatched)
+                {
+                    mismatchedComponents = true;
+                }
+            }
+
+            if (mismatchedComponents)
+            {
+                MessageBox.Show(
+                    "Not all theme components had matches - are you sure this theme is designed for this script?",
+                    "Possible Theme Mismatch", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+            }
+        }
+    }
+}

Filtration.ThemeEditor/ViewModels/IThemeViewModelFactory.cs

@@ -0,0 +1,8 @@
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public interface IThemeViewModelFactory
+    {
+        IThemeViewModel Create();
+        void Release(IThemeViewModel themeViewModel);
+    }
+}

Filtration.ThemeEditor/ViewModels/ThemeComponentViewModel.cs

@@ -0,0 +1,19 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public interface IThemeComponentViewModel
+    {
+        string ComponentName { get; set; }
+        ThemeComponentType ComponentType { get; set; }
+        Color Color { get; set; }
+    }
+
+    public class ThemeComponentViewModel : IThemeComponentViewModel
+    {
+        public string ComponentName { get; set; }
+        public ThemeComponentType ComponentType { get; set; }
+        public Color Color { get; set; }
+    }
+}

Filtration.ThemeEditor/ViewModels/ThemeViewModel.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Media.Imaging;
+using Filtration.Common.ViewModels;
+using Filtration.Interface;
+using Filtration.ThemeEditor.Providers;
+using MessageBox = System.Windows.MessageBox;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public interface IThemeViewModel : IEditableDocument
+    {
+        void Initialise(ObservableCollection<ThemeComponentViewModel> themeComponentViewModels, bool newTheme);
+        string Title { get; }
+        string FilePath { get; set; }
+        string Filename { get; }
+        string Name { get; set; }
+        ObservableCollection<ThemeComponentViewModel> Components { get; set; }
+    }
+
+    public class ThemeViewModel : PaneViewModel, IThemeViewModel
+    {
+        private readonly IThemeProvider _themeProvider;
+        private bool _filenameIsFake;
+        private string _filePath;
+
+        public ThemeViewModel(IThemeProvider themeProvider)
+        {
+            _themeProvider = themeProvider;
+
+            Components = new ObservableCollection<ThemeComponentViewModel>();
+
+
+            var icon = new BitmapImage();
+            icon.BeginInit();
+            icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/Theme.ico");
+            icon.EndInit();
+            IconSource = icon;
+        }
+
+        public void Initialise(ObservableCollection<ThemeComponentViewModel> themeComponentViewModels, bool newTheme)
+        {
+            Components = themeComponentViewModels;
+            _filenameIsFake = newTheme;
+        }
+
+        public bool IsScript { get { return false; } }
+        public bool IsTheme { get { return true; } }
+        public bool IsDirty { get; private set; }
+
+        public string FilePath
+        {
+            get { return _filePath; }
+            set
+            {
+                _filePath = value;
+                Title = Filename;
+            }
+        }
+
+        public string Filename
+        {
+            get { return Path.GetFileName(FilePath); }
+        }
+
+        public string Name { get; set; }
+
+        public ObservableCollection<ThemeComponentViewModel> Components { get; set; }
+
+        public void Save()
+        {
+            if (_filenameIsFake)
+            {
+                SaveAs();
+                return;
+            }
+
+            try
+            {
+                _themeProvider.SaveTheme(this, FilePath);
+                //RemoveDirtyFlag();
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(@"Error saving filter theme - " + e.Message, @"Save Error", MessageBoxButton.OK,
+                   MessageBoxImage.Error);
+            }
+        }
+
+        public void SaveAs()
+        {
+            var saveDialog = new SaveFileDialog
+            {
+                DefaultExt = ".filter",
+                Filter = @"Filter Theme Files (*.filtertheme)|*.filtertheme|All Files (*.*)|*.*"
+            };
+
+            var result = saveDialog.ShowDialog();
+
+            if (result != DialogResult.OK) return;
+
+            var previousFilePath = FilePath;
+            //try
+            //{
+                FilePath = saveDialog.FileName;
+                _themeProvider.SaveTheme(this, FilePath);
+                _filenameIsFake = false;
+                //RemoveDirtyFlag();
+            //}
+            //catch (Exception e)
+            //{
+            //    MessageBox.Show(@"Error saving theme file - " + e.Message, @"Save Error", MessageBoxButton.OK,
+            //        MessageBoxImage.Error);
+            //    FilePath = previousFilePath;
+            //}
+        }
+
+        public void Close()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Filtration.ThemeEditor/Views/ThemeComponentControl.xaml

@@ -0,0 +1,25 @@
+<UserControl x:Class="Filtration.ThemeEditor.Views.ThemeComponentControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:viewModels="clr-namespace:Filtration.ThemeEditor.ViewModels"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:converters="clr-namespace:Filtration.ThemeEditor.Converters"
+             mc:Ignorable="d" 
+             d:DataContext="{d:DesignInstance Type=viewModels:ThemeComponentViewModel}"
+             d:DesignHeight="40" d:DesignWidth="200">
+    <UserControl.Resources>
+        <converters:ThemeComponentTypeToStringConverter x:Key="ThemeComponentTypeToStringConverter" />
+    </UserControl.Resources>
+    <Grid Width="200">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="25" />
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ComponentType, Converter={StaticResource ThemeComponentTypeToStringConverter}}" Foreground="Red" FontSize="10" />
+        <TextBlock Grid.Row="1" Grid.Column="0"  Text="{Binding ComponentName}" />
+        <xctk:ColorPicker Grid.Row="2" Grid.Column="0" SelectedColor="{Binding Color}" />
+    </Grid>
+</UserControl>

Filtration.ThemeEditor/Views/ThemeComponentControl.xaml.cs

@@ -0,0 +1,10 @@
+namespace Filtration.ThemeEditor.Views
+{
+    public partial class ThemeComponentControl
+    {
+        public ThemeComponentControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

Filtration.ThemeEditor/Views/ThemeControl.xaml

@@ -0,0 +1,27 @@
+<UserControl x:Class="Filtration.ThemeEditor.Views.ThemeControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:viewModels="clr-namespace:Filtration.ThemeEditor.ViewModels"
+             xmlns:views="clr-namespace:Filtration.ThemeEditor.Views"
+             mc:Ignorable="d" 
+             d:DataContext="{d:DesignInstance Type=viewModels:ThemeViewModel}"
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+        <ScrollViewer HorizontalScrollBarVisibility="Disabled">
+            <ItemsControl ItemsSource="{Binding Components}" Margin="10">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <views:ThemeComponentControl DataContext="{Binding}" Margin="10,5,10,5" />
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

Filtration.ThemeEditor/Views/ThemeControl.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Filtration.ThemeEditor.Views
+{
+    /// <summary>
+    /// Interaction logic for ThemeControl.xaml
+    /// </summary>
+    public partial class ThemeControl : UserControl
+    {
+        public ThemeControl()
+        {
+            InitializeComponent();
+        }
+    }
+}