BlockitemBase

.gitignore

@@ -187,3 +187,4 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
+/Releases

Filtration.Common/Services/FileSystemService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Text;
 
 namespace Filtration.Common.Services
 {
@@ -21,7 +20,7 @@ namespace Filtration.Common.Services
 
         public void WriteFileFromString(string filePath, string inputString)
         {
-            File.WriteAllText(filePath, inputString, Encoding.UTF8);
+            File.WriteAllText(filePath, inputString);
         }
 
         public bool DirectoryExists(string directoryPath)

Filtration.Interface/IDocument.cs

@@ -1,11 +1,9 @@
-using System.Threading.Tasks;
-
-namespace Filtration.Interface
+namespace Filtration.Interface
 {
     public interface IDocument
     {
         bool IsScript { get; }
         bool IsTheme { get; }
-        Task Close();
+        void Close();
     }
 }

Filtration.Interface/IEditableDocument.cs

@@ -1,11 +1,9 @@
-using System.Threading.Tasks;
-
-namespace Filtration.Interface
+namespace Filtration.Interface
 {
     public interface IEditableDocument : IDocument
     {
         bool IsDirty { get; }
-        Task SaveAsync();
-        Task SaveAsAsync();
+        void Save();
+        void SaveAs();
     }
 }

Filtration.LootExplosionStudio.Tests/Filtration.LootExplosionStudio.Tests.csproj

@@ -0,0 +1,74 @@
+<?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>{56D0887E-B10D-4F9C-A88E-09CF8E8E06E3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.LootExplosionStudio.Tests</RootNamespace>
+    <AssemblyName>Filtration.LootExplosionStudio.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.1507.0118\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="Services\TestItemFilterBlockFinderService.cs" />
+    <Compile Include="Services\TestLootItemAppearanceService.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Filtration.LootExplosionStudio\Filtration.LootExplosionStudio.csproj">
+      <Project>{c8009b11-14d0-4421-94f0-9ef4603cb363}</Project>
+      <Name>Filtration.LootExplosionStudio</Name>
+    </ProjectReference>
+    <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.LootExplosionStudio.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.LootExplosionStudio.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.LootExplosionStudio.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("24ce1315-7f86-4389-a63c-22a40baa4c6d")]
+
+// 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.LootExplosionStudio.Tests/Services/TestItemFilterBlockFinderService.cs

@@ -0,0 +1,178 @@
+using Filtration.LootExplosionStudio.Services;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
+using NUnit.Framework;
+
+namespace Filtration.LootExplosionStudio.Tests.Services
+{
+    [TestFixture]
+    public class TestItemFilterBlockFinderService
+    {
+        private ItemFilterBlockFinderServiceTestUtility _testUtility;
+
+        [SetUp]
+        public void ItemFilterProcessingServiceTestSetup()
+        {
+            _testUtility = new ItemFilterBlockFinderServiceTestUtility();
+        }
+
+        [Test]
+        public void FindBlockForLootItem_SingleBlock_BaseType_Matches()
+        {
+            // Arrange
+            var testInputBaseType = "TestBaseType";
+            var testInputBlockItem = new BaseTypeBlockItem();
+            testInputBlockItem.Items.Add(testInputBaseType);
+
+            _testUtility.TestLootItem.BaseType = testInputBaseType;
+            _testUtility.TestBlock.BlockItems.Add(testInputBlockItem);
+
+
+            // Act
+            var result = _testUtility.Service.FindBlockForLootItem(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(_testUtility.TestBlock, result);
+        }
+
+        [Test]
+        public void FindBlockForLootItem_SingleHideBlock_Matches()
+        {
+            // Arrange
+
+            _testUtility.TestBlock.Action = BlockAction.Hide;
+
+            // Act
+            var result = _testUtility.Service.FindBlockForLootItem(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(_testUtility.TestBlock, result);
+        }
+
+        [Test]
+        public void FindBlockForLootItem_SingleBlock_MultipleBlockItems_Matches()
+        {
+            // Arrange
+            var testInputBaseType = "TestBaseType";
+            var testInputBaseTypeBlockItem = new BaseTypeBlockItem();
+            testInputBaseTypeBlockItem.Items.Add(testInputBaseType);
+
+            var testInputClass = "Test Class";
+            var testInputClassBlockItem = new ClassBlockItem();
+            testInputClassBlockItem.Items.Add(testInputClass);
+
+            var testInputItemLevel = 57;
+            var testInputItemLevelBlockItem = new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 50);
+
+            _testUtility.TestLootItem.BaseType = testInputBaseType;
+            _testUtility.TestLootItem.Class = testInputClass;
+            _testUtility.TestLootItem.ItemLevel = testInputItemLevel;
+
+            _testUtility.TestBlock.BlockItems.Add(testInputBaseTypeBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputClassBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputItemLevelBlockItem);
+
+
+            // Act
+            var result = _testUtility.Service.FindBlockForLootItem(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(_testUtility.TestBlock, result);
+        }
+
+
+
+        [Test]
+        public void FindBlockForLootItem_SingleBlock_MultipleBlockItemsOneWithoutMatch_Matches()
+        {
+            // Arrange
+            var testInputBaseType = "TestBaseType";
+            var testInputBaseTypeBlockItem = new BaseTypeBlockItem();
+            testInputBaseTypeBlockItem.Items.Add(testInputBaseType);
+
+            var testInputClass = "Test Class";
+            var testInputClassBlockItem = new ClassBlockItem();
+            testInputClassBlockItem.Items.Add(testInputClass);
+
+            var testInputItemLevel = 57;
+            var testInputItemLevelBlockItem = new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 50);
+
+            var testInputDropLevel = 35;
+            var testInputDropLevelBlockItem = new DropLevelBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 89);
+
+            _testUtility.TestLootItem.BaseType = testInputBaseType;
+            _testUtility.TestLootItem.Class = testInputClass;
+            _testUtility.TestLootItem.ItemLevel = testInputItemLevel;
+            _testUtility.TestLootItem.DropLevel = testInputDropLevel;
+
+            _testUtility.TestBlock.BlockItems.Add(testInputBaseTypeBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputClassBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputItemLevelBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputDropLevelBlockItem);
+
+            // Act
+            var result = _testUtility.Service.FindBlockForLootItem(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.IsNull(result);
+        }
+
+        [Test]
+        public void FindBlockForLootItem_MultipleBlocksBlock_Matches()
+        {
+            // Arrange
+            var testInputBlock1 = new ItemFilterBlock();
+            var testInputClass1 = "Test Class";
+            var testInputClassBlockItem1 = new ClassBlockItem();
+            testInputClassBlockItem1.Items.Add(testInputClass1);
+            testInputBlock1.BlockItems.Add(testInputClassBlockItem1);
+
+            _testUtility.TestScript.ItemFilterBlocks.Add(testInputBlock1);
+
+            var testInputBaseType = "TestBaseType";
+            var testInputBaseTypeBlockItem = new BaseTypeBlockItem();
+            testInputBaseTypeBlockItem.Items.Add(testInputBaseType);
+
+            var testInputClass = "Test Class";
+            var testInputClassBlockItem = new ClassBlockItem();
+            testInputClassBlockItem.Items.Add(testInputClass);
+
+            var testInputItemLevel = 57;
+            var testInputItemLevelBlockItem = new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 50);
+            
+            _testUtility.TestLootItem.BaseType = testInputBaseType;
+            _testUtility.TestLootItem.Class = testInputClass;
+            _testUtility.TestLootItem.ItemLevel = testInputItemLevel;
+
+            _testUtility.TestBlock.BlockItems.Add(testInputBaseTypeBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputClassBlockItem);
+            _testUtility.TestBlock.BlockItems.Add(testInputItemLevelBlockItem);
+
+            // Act
+            var result = _testUtility.Service.FindBlockForLootItem(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(_testUtility.TestBlock, result);
+        }
+
+        private class ItemFilterBlockFinderServiceTestUtility
+        {
+            public ItemFilterBlockFinderServiceTestUtility()
+            {
+                TestBlock = new ItemFilterBlock();
+                TestScript = new ItemFilterScript();
+                TestScript.ItemFilterBlocks.Add(TestBlock);
+                TestLootItem = new LootItem();
+
+                Service = new ItemFilterBlockFinderService();
+            }
+
+            public ItemFilterScript TestScript { get; private set; }
+            public ItemFilterBlock TestBlock { get; private set; }
+            public LootItem TestLootItem { get; private set; }
+            public ItemFilterBlockFinderService Service { get; private set; }
+        }
+    }
+}

Filtration.LootExplosionStudio.Tests/Services/TestLootItemAppearanceService.cs

@@ -0,0 +1,275 @@
+using System.Windows.Media;
+using Filtration.LootExplosionStudio.Services;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
+using Moq;
+using NUnit.Framework;
+
+namespace Filtration.LootExplosionStudio.Tests.Services
+{
+    [TestFixture]
+    class TestLootItemAppearanceService
+    {
+        private LootItemAppearanceServiceTestUtility _testUtility;
+
+        [SetUp]
+        public void ItemFilterProcessingServiceTestSetup()
+        {
+            _testUtility = new LootItemAppearanceServiceTestUtility();
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_NoMatchingBlocks_NormalItem_SetsCorrectTextColor()
+        {
+            // Arrange
+            _testUtility.TestLootItem.Rarity = ItemRarity.Normal;
+            
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.NormalTextColor, _testUtility.TestLootItem.TextColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_NoMatchingBlocks_MagicItem_SetsCorrectTextColor()
+        {
+            // Arrange
+            _testUtility.TestLootItem.Rarity = ItemRarity.Magic;
+            _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 99));
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.MagicTextColor, _testUtility.TestLootItem.TextColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_NoMatchingBlocks_RareItem_SetsCorrectTextColor()
+        {
+            // Arrange
+            _testUtility.TestLootItem.Rarity = ItemRarity.Rare;
+            _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 99));
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.RareTextColor, _testUtility.TestLootItem.TextColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_NoMatchingBlocks_UniqueItem_SetsCorrectTextColor()
+        {
+            // Arrange
+            _testUtility.TestLootItem.Rarity = ItemRarity.Unique;
+            _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 99));
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.UniqueTextColor, _testUtility.TestLootItem.TextColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_NoMatchingBlocks_SetsCorrectBackgroundColor()
+        {
+            // Arrange
+            _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 99));
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_NoMatchingBlocks_SetsCorrectBorderColor()
+        {
+            // Arrange
+            _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 99));
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingTextColorOnly_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputTextColor = new Color {R = 123, G = 5, B = 22, A = 200};
+            _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem {Color = testInputTextColor});
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.FontSize, _testUtility.TestLootItem.FontSize );
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingBackgroundColorOnly_RarityNormal_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputBackgroundColor = new Color {R = 123, G = 5, B = 22, A = 200};
+            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem {Color = testInputBackgroundColor});
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputBackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.NormalTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.FontSize, _testUtility.TestLootItem.FontSize);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingBackgroundColorOnly_RarityMagic_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputBackgroundColor = new Color { R = 123, G = 5, B = 22, A = 200 };
+            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem {Color = testInputBackgroundColor});
+            _testUtility.TestLootItem.Rarity = ItemRarity.Magic;
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputBackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.MagicTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.FontSize, _testUtility.TestLootItem.FontSize);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingBackgroundColorOnly_RarityRare_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputBackgroundColor = new Color { R = 123, G = 5, B = 22, A = 200 };
+            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem { Color = testInputBackgroundColor });
+            _testUtility.TestLootItem.Rarity = ItemRarity.Rare;
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputBackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.RareTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.FontSize, _testUtility.TestLootItem.FontSize);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingBackgroundColorOnly_RarityUnique_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputBackgroundColor = new Color { R = 123, G = 5, B = 22, A = 200 };
+            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem { Color = testInputBackgroundColor });
+            _testUtility.TestLootItem.Rarity = ItemRarity.Unique;
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputBackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.UniqueTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.FontSize, _testUtility.TestLootItem.FontSize);
+        }
+        
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingBorderColorOnly_RarityUnique_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputBorderColor = new Color { R = 123, G = 5, B = 22, A = 200 };
+            _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem { Color = testInputBorderColor });
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputBorderColor, _testUtility.TestLootItem.BorderColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.NormalTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.FontSize, _testUtility.TestLootItem.FontSize);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_MatchingFontSizeOnly_RarityUnique_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputFontSize = 22;
+            _testUtility.TestBlock.BlockItems.Add(new FontSizeBlockItem(22));
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputFontSize, _testUtility.TestLootItem.FontSize);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.NormalTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(DefaultLootItemAppearanceConstants.BorderColor, _testUtility.TestLootItem.BorderColor);
+        }
+
+        [Test]
+        public void ProcessLootItemAgainstScript_AllAppearanceMatching_SetsColorsCorrectly()
+        {
+            // Arrange
+            var testInputFontSize = 22;
+            var testInputTextColor = new Color { R = 123, G = 5, B = 22, A = 200 };
+            var testInputBackgroundColor = new Color { R = 123, G = 59, B = 27, A = 50 };
+            var testInputBorderColor = new Color { R = 166, G = 0, B = 100, A = 255 };
+
+            _testUtility.TestBlock.BlockItems.Add(new FontSizeBlockItem(22));
+            _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem { Color = testInputBorderColor });
+            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem { Color = testInputBackgroundColor });
+            _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem { Color = testInputTextColor });
+
+            // Act
+            _testUtility.Service.ProcessLootItemAgainstFilterScript(_testUtility.TestLootItem, _testUtility.TestScript);
+
+            // Assert
+            Assert.AreEqual(testInputFontSize, _testUtility.TestLootItem.FontSize);
+            Assert.AreEqual(testInputTextColor, _testUtility.TestLootItem.TextColor);
+            Assert.AreEqual(testInputBackgroundColor, _testUtility.TestLootItem.BackgroundColor);
+            Assert.AreEqual(testInputBorderColor, _testUtility.TestLootItem.BorderColor);
+        }
+
+        private class LootItemAppearanceServiceTestUtility
+        {
+            public LootItemAppearanceServiceTestUtility()
+            {
+                TestBlock = new ItemFilterBlock();
+                TestScript = new ItemFilterScript();
+                TestScript.ItemFilterBlocks.Add(TestBlock);
+                TestLootItem = new LootItem();
+
+                MockItemFilterBlockFinderService = new Mock<IItemFilterBlockFinderService>();
+                MockItemFilterBlockFinderService.Setup(
+                    b => b.FindBlockForLootItem(TestLootItem, TestScript))
+                    .Returns(TestBlock);
+
+                Service = new LootItemAppearanceService(MockItemFilterBlockFinderService.Object);
+            }
+
+            public Mock<IItemFilterBlockFinderService> MockItemFilterBlockFinderService { get; private set; }
+
+            public ItemFilterScript TestScript { get; private set; }
+            public ItemFilterBlock TestBlock { get; private set; }
+            public LootItem TestLootItem { get; private set; }
+            public LootItemAppearanceService Service { get; private set; }
+        }
+    }
+}

Filtration.LootExplosionStudio.Tests/packages.config

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

Filtration.LootExplosionStudio/Filtration.LootExplosionStudio.csproj

@@ -0,0 +1,72 @@
+<?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>{C8009B11-14D0-4421-94F0-9EF4603CB363}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.LootExplosionStudio</RootNamespace>
+    <AssemblyName>Filtration.LootExplosionStudio</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="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="Services\ItemFilterBlockFinderService.cs" />
+    <Compile Include="Services\LootItemAppearanceService.cs" />
+    <Compile Include="Services\LootItemCollectionItemFilterCombinerService.cs" />
+    <Compile Include="WindsorInstallers\ServicesInstaller.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.LootExplosionStudio/Properties/AssemblyInfo.cs

@@ -0,0 +1,39 @@
+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.LootExplosionStudio")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.LootExplosionStudio")]
+[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("b33dec95-6eec-4e14-81d5-3d8ce0db77d1")]
+
+// 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.LootExplosionStudio.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

Filtration.LootExplosionStudio/Services/ItemFilterBlockFinderService.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.LootExplosionStudio;
+
+namespace Filtration.LootExplosionStudio.Services
+{
+    internal interface IItemFilterBlockFinderService
+    {
+        ItemFilterBlock FindBlockForLootItem(LootItem lootItem, ItemFilterScript script);
+    }
+
+    internal class ItemFilterBlockFinderService : IItemFilterBlockFinderService
+    {
+        public ItemFilterBlock FindBlockForLootItem(LootItem lootItem, ItemFilterScript script)
+        {
+            return script.ItemFilterBlocks.FirstOrDefault(block => BlockMatchesLootItem(lootItem, block));
+        }
+
+        private static bool BlockMatchesLootItem(LootItem lootItem, ItemFilterBlock block)
+        {
+            if (!block.BlockItems.OfType<StringListBlockItem>().All(blockItem => blockItem.MatchesLootItem(lootItem)))
+            {
+                return false;
+            }
+
+            if (
+                !block.BlockItems.OfType<NumericFilterPredicateBlockItem>()
+                    .All(blockItem => blockItem.MatchesLootItem(lootItem)))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

Filtration.LootExplosionStudio/Services/LootItemAppearanceService.cs

@@ -0,0 +1,80 @@
+using System.Linq;
+using System.Windows.Media;
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
+
+namespace Filtration.LootExplosionStudio.Services
+{
+    internal interface ILootItemAppearanceService
+    {
+        void ProcessLootItemAgainstFilterScript(LootItem lootItem, ItemFilterScript script);
+    }
+
+    internal class LootItemAppearanceService : ILootItemAppearanceService
+    {
+        private readonly IItemFilterBlockFinderService _blockFinderService;
+
+        public LootItemAppearanceService(IItemFilterBlockFinderService blockFinderService)
+        {
+            _blockFinderService = blockFinderService;
+        }
+
+        public void ProcessLootItemAgainstFilterScript(LootItem lootItem, ItemFilterScript script)
+        {
+            var matchedBlock = _blockFinderService.FindBlockForLootItem(lootItem, script);
+            if (matchedBlock == null)
+            {
+                lootItem.TextColor = GetDefaultTextColorForRarity(lootItem.Rarity);
+                lootItem.BackgroundColor = DefaultLootItemAppearanceConstants.BackgroundColor;
+                lootItem.BorderColor = DefaultLootItemAppearanceConstants.BorderColor;
+                lootItem.FontSize = 35;
+                return;
+            }
+
+            lootItem.TextColor = matchedBlock.HasBlockItemOfType<TextColorBlockItem>()
+                ? matchedBlock.BlockItems.OfType<TextColorBlockItem>().First().Color
+                : GetDefaultTextColorForRarity(lootItem.Rarity);
+
+            lootItem.BackgroundColor = matchedBlock.HasBlockItemOfType<BackgroundColorBlockItem>()
+                ? matchedBlock.BlockItems.OfType<BackgroundColorBlockItem>().First().Color
+                : DefaultLootItemAppearanceConstants.BackgroundColor;
+
+            lootItem.BorderColor = matchedBlock.HasBlockItemOfType<BorderColorBlockItem>()
+                ? matchedBlock.BlockItems.OfType<BorderColorBlockItem>().First().Color
+                : DefaultLootItemAppearanceConstants.BorderColor;
+
+            lootItem.FontSize = matchedBlock.HasBlockItemOfType<FontSizeBlockItem>()
+                ? matchedBlock.BlockItems.OfType<FontSizeBlockItem>().First().Value
+                : 35;
+        }
+
+        private Color GetDefaultTextColorForRarity(ItemRarity rarity)
+        {
+            switch (rarity)
+            {
+                case ItemRarity.Normal:
+                {
+                    return DefaultLootItemAppearanceConstants.NormalTextColor;
+                }
+                case ItemRarity.Magic:
+                {
+                    return DefaultLootItemAppearanceConstants.MagicTextColor;
+                }
+                case ItemRarity.Rare:
+                {
+                    return DefaultLootItemAppearanceConstants.RareTextColor;
+                }
+                case ItemRarity.Unique:
+                {
+                    return DefaultLootItemAppearanceConstants.UniqueTextColor;
+                }
+                default:
+                {
+                    return DefaultLootItemAppearanceConstants.NormalTextColor;
+                }
+            }
+        }
+    }
+}

Filtration.LootExplosionStudio/Services/LootItemCollectionItemFilterCombinerService.cs

@@ -0,0 +1,30 @@
+using Filtration.ObjectModel;
+using Filtration.ObjectModel.LootExplosionStudio;
+
+namespace Filtration.LootExplosionStudio.Services
+{
+    internal interface ILootItemCollectionItemFilterCombinerService
+    {
+        void CombineLootItemCollectionWithItemFilterScript(LootItemCollection lootItemCollection,
+            ItemFilterScript script);
+    }
+
+    internal class LootItemCollectionItemFilterCombinerService : ILootItemCollectionItemFilterCombinerService
+    {
+        private readonly ILootItemAppearanceService _lootItemAppearanceService;
+
+        public LootItemCollectionItemFilterCombinerService(ILootItemAppearanceService lootItemAppearanceService)
+        {
+            _lootItemAppearanceService = lootItemAppearanceService;
+        }
+
+        public void CombineLootItemCollectionWithItemFilterScript(LootItemCollection lootItemCollection,
+            ItemFilterScript script)
+        {
+            foreach (var lootItem in lootItemCollection)
+            {
+                _lootItemAppearanceService.ProcessLootItemAgainstFilterScript(lootItem, script);
+            }
+        }
+    }
+}

Filtration.LootExplosionStudio/WindsorInstallers/ServicesInstaller.cs

@@ -0,0 +1,27 @@
+using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+using Filtration.LootExplosionStudio.Services;
+
+namespace Filtration.LootExplosionStudio.WindsorInstallers
+{
+    class ServicesInstaller : IWindsorInstaller
+    {
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+            container.Register(
+                Component.For<IItemFilterBlockFinderService>()
+                    .ImplementedBy<ItemFilterBlockFinderService>()
+                    .LifeStyle.Singleton);
+
+            container.Register(
+                Component.For<ILootItemAppearanceService>()
+                    .ImplementedBy<LootItemAppearanceService>()
+                    .LifeStyle.Singleton);
+            container.Register(
+                Component.For<ILootItemCollectionItemFilterCombinerService>()
+                    .ImplementedBy<LootItemCollectionItemFilterCombinerService>()
+                    .LifeStyle.Singleton);
+        }
+    }
+}

Filtration.LootExplosionStudio/packages.config

@@ -0,0 +1,5 @@
+<?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" />
+</packages>

Filtration.ObjectModel.Tests/BlockItemBaseTypes/TestBaseTypeBlockItem.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.LootExplosionStudio;
+using NUnit.Framework;
+
+namespace Filtration.ObjectModel.Tests.BlockItemBaseTypes
+{
+    [TestFixture]
+    public class TestBaseTypeBlockItem
+    {
+        [Test]
+        public void MatchesBlockItem_BlankLootItem_ReturnsFalse()
+        {
+            // Arrange
+            
+            var blockItem = new BaseTypeBlockItem();
+            var testInputLootItem = new LootItem();
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_StringMatch_ReturnsTrue()
+        {
+            // Arrange
+            var testInputBaseType = "Test Base Type";
+
+            var blockItem = new BaseTypeBlockItem();
+            blockItem.Items.Add("Testblah");
+            blockItem.Items.Add(testInputBaseType);
+            blockItem.Items.Add("Another Base Type");
+
+            var testInputLootItem = new LootItem { BaseType = testInputBaseType};
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+    }
+}

Filtration.ObjectModel.Tests/BlockItemBaseTypes/TestClassBlockItem.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.LootExplosionStudio;
+using NUnit.Framework;
+
+namespace Filtration.ObjectModel.Tests.BlockItemBaseTypes
+{
+    [TestFixture]
+    public class TestClassBlockItem
+    {
+        [Test]
+        public void MatchesBlockItem_BlankLootItem_ReturnsFalse()
+        {
+            // Arrange
+
+            var blockItem = new ClassBlockItem();
+            var testInputLootItem = new LootItem();
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_StringMatch_ReturnsTrue()
+        {
+            // Arrange
+            var testInputClass = "Test Class";
+
+            var blockItem = new ClassBlockItem();
+            blockItem.Items.Add("Testblah");
+            blockItem.Items.Add(testInputClass);
+            blockItem.Items.Add("Another Base Type");
+
+            var testInputLootItem = new LootItem { Class = testInputClass };
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+    }
+}

Filtration.ObjectModel.Tests/BlockItemBaseTypes/TestItemLevelBlockItem.cs

@@ -0,0 +1,101 @@
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
+using NUnit.Framework;
+
+namespace Filtration.ObjectModel.Tests.BlockItemBaseTypes
+{
+    [TestFixture]
+    public class TestItemLevelBlockItem
+    {
+        [Test]
+        public void MatchesBlockItem_NoMatch_ReturnsFalse()
+        {
+            // Arrange
+
+            var blockItem = new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 10);
+            var lootItem = new LootItem {ItemLevel = 5};
+
+            // Act
+            var result = blockItem.MatchesLootItem(lootItem);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+        
+        [Test]
+        public void MatchesBlockItem_EqualsMatch_ReturnsTrue()
+        {
+            // Arrange
+
+            var blockItem = new ItemLevelBlockItem(FilterPredicateOperator.Equal, 10);
+            var lootItem = new LootItem { ItemLevel = 10 };
+
+            // Act
+            var result = blockItem.MatchesLootItem(lootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_GreaterThanMatch_ReturnsTrue()
+        {
+            // Arrange
+
+            var blockItem = new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 10);
+            var lootItem = new LootItem { ItemLevel = 50 };
+
+            // Act
+            var result = blockItem.MatchesLootItem(lootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_GreaterThanOrEqualMatch_ReturnsTrue()
+        {
+            // Arrange
+
+            var blockItem = new ItemLevelBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 10);
+            var lootItem = new LootItem { ItemLevel = 50 };
+
+            // Act
+            var result = blockItem.MatchesLootItem(lootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_LessThan_ReturnsTrue()
+        {
+            // Arrange
+
+            var blockItem = new ItemLevelBlockItem(FilterPredicateOperator.LessThan, 10);
+            var lootItem = new LootItem { ItemLevel = 1 };
+
+            // Act
+            var result = blockItem.MatchesLootItem(lootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_LessThanOrEqual_ReturnsTrue()
+        {
+            // Arrange
+
+            var blockItem = new ItemLevelBlockItem(FilterPredicateOperator.LessThanOrEqual, 10);
+            var lootItem = new LootItem { ItemLevel = 1 };
+
+            // Act
+            var result = blockItem.MatchesLootItem(lootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+    }
+}

Filtration.ObjectModel.Tests/BlockItemBaseTypes/TestSocketGroupBlockItem.cs

@@ -0,0 +1,92 @@
+using System.Collections.Generic;
+using System.Net.Sockets;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
+using NUnit.Framework;
+
+namespace Filtration.ObjectModel.Tests.BlockItemBaseTypes
+{
+    [TestFixture]
+    public class TestSocketGroupBlockItem
+    {
+        [Test]
+        public void MatchesBlockItem_BlankLootItem_ReturnsFalse()
+        {
+            // Arrange
+
+            var blockItem = new SocketGroupBlockItem();
+            var testInputLootItem = new LootItem();
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void MatchesBlockItem_SocketsMatch_ReturnsTrue()
+        {
+            // Arrange
+            var testInputSocketGroups = new List<SocketGroup>();
+            var testInputSocketGroup1 = new SocketGroup();
+            var testInputSocketGroup2 = new SocketGroup();
+            testInputSocketGroup1.Sockets = new List<SocketColor> {SocketColor.Blue, SocketColor.Red};
+            testInputSocketGroup2.Sockets = new List<SocketColor>
+            {
+                SocketColor.Blue,
+                SocketColor.Blue,
+                SocketColor.Blue,
+                SocketColor.Red
+            };
+
+            testInputSocketGroups.Add(testInputSocketGroup1);
+            testInputSocketGroups.Add(testInputSocketGroup2);
+
+            var blockItem = new SocketGroupBlockItem();
+            blockItem.Items.Add("RRG");
+            blockItem.Items.Add("BRB");
+
+            var testInputLootItem = new LootItem {SocketGroups = testInputSocketGroups};
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+        
+        [Test]
+        public void MatchesBlockItem_SocketsAlmostMatch_ReturnsFalse()
+        {
+            // Arrange
+            var testInputSocketGroups = new List<SocketGroup>();
+            var testInputSocketGroup1 = new SocketGroup();
+            var testInputSocketGroup2 = new SocketGroup();
+            testInputSocketGroup1.Sockets = new List<SocketColor> { SocketColor.Blue, SocketColor.Red };
+            testInputSocketGroup2.Sockets = new List<SocketColor>
+            {
+                SocketColor.Blue,
+                SocketColor.Blue,
+                SocketColor.Blue,
+                SocketColor.Red,
+                SocketColor.Green
+            };
+
+            testInputSocketGroups.Add(testInputSocketGroup1);
+            testInputSocketGroups.Add(testInputSocketGroup2);
+
+            var blockItem = new SocketGroupBlockItem();
+            blockItem.Items.Add("BGBRWB");
+
+            var testInputLootItem = new LootItem { SocketGroups = testInputSocketGroups };
+
+            // Act
+            var result = blockItem.MatchesLootItem(testInputLootItem);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+    }
+}

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

@@ -46,6 +46,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BlockItemBaseTypes\TestBaseTypeBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\TestClassBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\TestItemLevelBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\TestSocketGroupBlockItem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestItemFilterBlock.cs" />
     <Compile Include="TestItemFilterBlockGroup.cs" />

Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.Extensions;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {

Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Media;
+using Filtration.ObjectModel.LootExplosionStudio;
 using Filtration.ObjectModel.ThemeEditor;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes

Filtration.ObjectModel/BlockItemBaseTypes/DualIntegerBlockItem.cs

@@ -1,4 +1,5 @@
 using System.Windows.Media;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {

Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs

@@ -1,4 +1,5 @@
 using System.Windows.Media;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {

Filtration.ObjectModel/BlockItemBaseTypes/NumericFilterPredicateBlockItem.cs

@@ -1,6 +1,7 @@
 using System;
 using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.Extensions;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
@@ -47,5 +48,45 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             OnPropertyChanged("FilterPredicate");
             OnPropertyChanged("SummaryText");
         }
+
+
+
+        public abstract int GetLootItemProperty(LootItem lootItem);
+
+        public virtual bool MatchesLootItem(LootItem lootItem)
+        {
+            var lootItemProperty = GetLootItemProperty(lootItem);
+            var predicateOperand = FilterPredicate.PredicateOperand;
+
+            switch (FilterPredicate.PredicateOperator)
+            {
+                case FilterPredicateOperator.Equal:
+                {
+                    return lootItemProperty == predicateOperand;
+                }
+                case FilterPredicateOperator.GreaterThan:
+                {
+                    return lootItemProperty > predicateOperand;
+                }
+                case FilterPredicateOperator.GreaterThanOrEqual:
+                {
+                    return lootItemProperty >= predicateOperand;
+                }
+                case FilterPredicateOperator.LessThan:
+                {
+                    return lootItemProperty < predicateOperand;
+                }
+                case FilterPredicateOperator.LessThanOrEqual:
+                {
+                    return lootItemProperty <= predicateOperand;
+                }
+                case FilterPredicateOperator.NotEqual:
+                {
+                    return lootItemProperty != predicateOperand;
+                }
+                default:
+                    return false;
+            }
+        }
     }
 }

Filtration.ObjectModel/BlockItemBaseTypes/StringListBlockItem.cs

@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
@@ -36,5 +37,12 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             OnPropertyChanged("Items");
             OnPropertyChanged("SummaryText");
         }
+
+        public abstract string GetLootItemProperty(LootItem lootItem);
+
+        public virtual bool MatchesLootItem(LootItem lootItem)
+        {
+            return Items.Any(i => i == GetLootItemProperty(lootItem));
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -56,5 +57,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
         {
             get { return 11; }
         }
+
+        public override string GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.BaseType;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -50,5 +51,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
         {
             get { return 10; }
         }
+
+        public override string GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.Class;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -68,5 +69,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 100;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.DropLevel;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -65,5 +66,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 6;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.Height;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -67,5 +68,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 100;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.ItemLevel;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs

@@ -1,6 +1,8 @@
-using System.Windows.Media;
+using System.Linq;
+using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -68,5 +70,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 6;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.SocketGroups.Where(c => c.Sockets.Count > 1).Sum(socketGroup => socketGroup.Sockets.Count);
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/QualityBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -68,5 +69,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 20;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.Quality;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs

@@ -2,6 +2,7 @@
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.Extensions;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -85,5 +86,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return (int)ItemRarity.Unique;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return (int)lootItem.Rarity;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs

@@ -1,6 +1,10 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -47,5 +51,68 @@ namespace Filtration.ObjectModel.BlockItemTypes
         {
             get { return 9; }
         }
+
+        public override string GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.SocketGroups.ToString();
+        }
+
+        public override bool MatchesLootItem(LootItem lootItem)
+        {
+            foreach (var socketGroupString in Items)
+            {
+                var socketColorList = SocketGroupStringToSocketColors(socketGroupString);
+                if (
+                    lootItem.SocketGroups.Any(
+                        g =>
+                            g.Sockets.Count(s => s == SocketColor.Red) >=
+                            socketColorList.Count(l => l == SocketColor.Red) &&
+                            g.Sockets.Count(s => s == SocketColor.Green) >=
+                            socketColorList.Count(l => l == SocketColor.Green) &&
+                            g.Sockets.Count(s => s == SocketColor.Blue) >=
+                            socketColorList.Count(l => l == SocketColor.Blue) &&
+                            g.Sockets.Count(s => s == SocketColor.White) >=
+                            socketColorList.Count(l => l == SocketColor.White)))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private List<SocketColor> SocketGroupStringToSocketColors(string socketGroupString)
+        {
+            var socketColorList = new List<SocketColor>();
+
+            foreach (var c in socketGroupString.ToCharArray())
+            {
+                switch (c)
+                {
+                    case 'R':
+                    {
+                        socketColorList.Add(SocketColor.Red);
+                        break;
+                    }
+                    case 'G':
+                    {
+                        socketColorList.Add(SocketColor.Green);
+                        break;
+                    }
+                    case 'B':
+                    {
+                        socketColorList.Add(SocketColor.Blue);
+                        break;
+                    }
+                    case 'W':
+                    {
+                        socketColorList.Add(SocketColor.White);
+                        break;
+                    }
+                }
+            }
+
+            return socketColorList;
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/SocketsBlockItem.cs

@@ -1,6 +1,8 @@
-using System.Windows.Media;
+using System.Linq;
+using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -68,5 +70,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 6;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.SocketGroups.Sum(c => c.Sockets.Count());
+        }
     }
 }

Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs

@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.LootExplosionStudio;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -68,5 +69,10 @@ namespace Filtration.ObjectModel.BlockItemTypes
                 return 2;
             }
         }
+
+        public override int GetLootItemProperty(LootItem lootItem)
+        {
+            return lootItem.Width;
+        }
     }
 }

Filtration.ObjectModel/Filtration.ObjectModel.csproj

@@ -41,7 +41,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BlockItemBaseTypes\ActionBlockItem.cs" />
-    <Compile Include="BlockItemBaseTypes\BlockItembase.cs" />
+    <Compile Include="BlockItemBaseTypes\BlockItemBase.cs" />
     <Compile Include="BlockItemBaseTypes\ColorBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\DualIntegerBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\IntegerBlockItem.cs" />
@@ -77,6 +77,10 @@
     <Compile Include="ItemFilterBlockGroup.cs" />
     <Compile Include="ItemFilterScript.cs" />
     <Compile Include="ItemFilterSection.cs" />
+    <Compile Include="LootExplosionStudio\DefaultLootItemAppearanceConstants.cs" />
+    <Compile Include="LootExplosionStudio\LootItem.cs" />
+    <Compile Include="LootExplosionStudio\LootItemCollection.cs" />
+    <Compile Include="LootExplosionStudio\SocketGroup.cs" />
     <Compile Include="NumericFilterPredicate.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Filtration.ObjectModel/LootExplosionStudio/DefaultLootItemAppearanceConstants.cs

@@ -0,0 +1,16 @@
+using System.Windows.Media;
+
+namespace Filtration.ObjectModel.LootExplosionStudio
+{
+    public static class DefaultLootItemAppearanceConstants
+    {
+        public readonly static Color NormalTextColor = new Color { A = 255, R = 200, G = 200, B = 200 };
+        public readonly static Color MagicTextColor = new Color { A = 255, R = 136, G = 136, B = 255 };
+        public readonly static Color RareTextColor = new Color { A = 255, R = 255, G = 255, B = 119 };
+        public readonly static Color UniqueTextColor = new Color { A = 255, R = 175, G = 96, B = 37 };
+        public readonly static Color QuestItemTextColor = new Color { A = 255, R = 74, G = 230, B = 58 };
+        public static readonly Color BackgroundColor = new Color {A = 255, R = 0, G = 0, B = 0};
+        public static readonly Color BorderColor = new Color { A = 255, R = 0, G = 0, B = 0 };
+        public static readonly int FontSize = 35;
+    }
+}

Filtration.ObjectModel/LootExplosionStudio/LootItem.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.LootExplosionStudio
+{
+    public class LootItem
+    {
+        public string Name { get; set; }
+        public int ItemLevel { get; set; }
+        public int DropLevel { get; set; }
+        public int Quality { get; set; }
+        public ItemRarity Rarity { get; set; }
+        public string Class { get; set; }
+        public string BaseType { get; set; }
+        public List<SocketGroup> SocketGroups { get; set; }
+        public int Width { get; set; }
+        public int Height { get; set; }
+        
+        public Color TextColor { get; set; }
+        public Color BackgroundColor { get; set; }
+        public Color BorderColor { get; set; }
+        public int FontSize { get; set; }
+    }
+}

Filtration.ObjectModel/LootExplosionStudio/LootItemCollection.cs

@@ -0,0 +1,9 @@
+using System.Collections.ObjectModel;
+
+namespace Filtration.ObjectModel.LootExplosionStudio
+{
+    public class LootItemCollection : Collection<LootItem>
+    {
+
+    }
+}

Filtration.ObjectModel/LootExplosionStudio/SocketGroup.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.LootExplosionStudio
+{
+    public class SocketGroup
+    {
+        public List<SocketColor> Sockets { get; set; }
+    }
+}

Filtration.Tests/Repositories/TestItemFilterScriptRepository.cs

@@ -1,6 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
-using Filtration.ObjectModel;
 using Filtration.Repositories;
 using Filtration.Services;
 using Filtration.ViewModels;
@@ -13,14 +11,14 @@ namespace Filtration.Tests.Repositories
     public class TestItemFilterScriptRepository
     {
         [Test]
-        public async Task LoadScriptFromFile_CallsPersistenceServiceUsingPathAndReturnsViewModel()
+        public void LoadScriptFromFile_CallsPersistenceServiceUsingPathAndReturnsViewModel()
         {
             // Arrange
             var testInputPath = "C:\\TestPath.filter";
             
 
             var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
-            mockPersistenceService.Setup(p => p.LoadItemFilterScriptAsync(testInputPath)).ReturnsAsync(new ItemFilterScript()).Verifiable();
+            mockPersistenceService.Setup(p => p.LoadItemFilterScript(testInputPath)).Verifiable();
             
             var mockItemFilterScriptViewModel = new Mock<IItemFilterScriptViewModel>();
             
@@ -30,7 +28,7 @@ namespace Filtration.Tests.Repositories
             var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
 
             // Act
-            var result = await repository.LoadScriptFromFileAsync(testInputPath);
+            var result = repository.LoadScriptFromFile(testInputPath);
 
             // Assert
             mockPersistenceService.Verify();
@@ -44,7 +42,7 @@ namespace Filtration.Tests.Repositories
             var testInputPath = "C:\\TestPath.filter";
 
             var mockPersistenceService = new Mock<IItemFilterPersistenceService>();
-            mockPersistenceService.Setup(p => p.LoadItemFilterScriptAsync(testInputPath)).Throws<IOException>();
+            mockPersistenceService.Setup(p => p.LoadItemFilterScript(testInputPath)).Throws<IOException>();
 
             var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
 
@@ -53,7 +51,7 @@ namespace Filtration.Tests.Repositories
             // Act
             
             // Assert
-            Assert.Throws<IOException>(async () => await repository.LoadScriptFromFileAsync(testInputPath));
+            Assert.Throws<IOException>(() => repository.LoadScriptFromFile(testInputPath));
         }
 
         [Test]

Filtration.Tests/Services/TestItemFilterPersistenceService.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 using Filtration.Common.Services;
 using Filtration.ObjectModel;
 using Filtration.Services;
@@ -13,7 +12,7 @@ namespace Filtration.Tests.Services
     public class TestItemFilterPersistenceService
     {
         [Test]
-        public async Task LoadItemFilterScript_CallsTranslatorAndFileSystemService()
+        public void LoadItemFilterScript_CallsTranslatorAndFileSystemService()
         {
             // Arrange
             const string TestInputPath = "C:\\Test Path\\Script.Filter";
@@ -29,7 +28,7 @@ namespace Filtration.Tests.Services
             var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
 
             // Act
-            var script = await service.LoadItemFilterScriptAsync(TestInputPath);
+            var script = service.LoadItemFilterScript(TestInputPath);
 
             // Assert
             mockFileSystemService.Verify();
@@ -38,7 +37,7 @@ namespace Filtration.Tests.Services
         }
 
         [Test]
-        public async Task SaveItemFilterScript_CallsTranslatorAndFileSystemService()
+        public void SaveItemFilterScript_CallsTranslatorAndFileSystemService()
         {
             // Arrange
             var testFilePath = "C:\\Test\\File.txt";
@@ -54,7 +53,7 @@ namespace Filtration.Tests.Services
             var service = new ItemFilterPersistenceService(mockFileSystemService.Object, mockItemFilterScriptTranslator.Object);
 
             // Act
-            await service.SaveItemFilterScriptAsync(testScript);
+            service.SaveItemFilterScript(testScript);
 
             // Assert
             mockFileSystemService.Verify();

Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs

@@ -353,39 +353,6 @@ namespace Filtration.Tests.Translators
             Assert.AreEqual("This is a disabled block", secondBlock.Description);
         }
 
-        [Test]
-        public void TranslateStringToItemFilterScript_DisabledBlockWithBlockGroup_ReturnsCorrectBlock()
-        {
-            // Arrange
-            var testInputScript = "Show" + Environment.NewLine +
-                                  "    ItemLevel > 2" + Environment.NewLine +
-                                  "    SetTextColor 255 40 0" + Environment.NewLine +
-                                  Environment.NewLine +
-                                  "#Disabled Block Start" + Environment.NewLine +
-                                  "# This is a disabled block" + Environment.NewLine +
-                                  "#Show#My Block Group" + Environment.NewLine +
-                                  "#    ItemLevel > 2" + Environment.NewLine +
-                                  "#Disabled Block End";
-
-
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(
-                b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()))
-                .Returns(new ItemFilterBlockGroup("My Block Group", null));
-
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
-
-            // Act
-            var result = translator.TranslateStringToItemFilterScript(testInputScript);
-
-            // Assert
-            Assert.AreEqual(2, result.ItemFilterBlocks.Count);
-            var secondBlock = result.ItemFilterBlocks.Skip(1).First();
-            Assert.AreEqual("This is a disabled block", secondBlock.Description);
-            Assert.AreEqual("My Block Group", secondBlock.BlockGroup.GroupName);
-        }
-
         private class ItemFilterScriptTranslatorTestUtility
         {
             public ItemFilterScriptTranslatorTestUtility()

Filtration.ThemeEditor/Providers/ThemeProvider.cs

@@ -1,7 +1,6 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.ThemeEditor;
@@ -14,9 +13,9 @@ namespace Filtration.ThemeEditor.Providers
     {
         IThemeEditorViewModel NewThemeForScript(ItemFilterScript script);
         IThemeEditorViewModel MasterThemeForScript(ItemFilterScript script);
-        Task<IThemeEditorViewModel> LoadThemeFromFile(string filePath);
-        Task<Theme> LoadThemeModelFromFile(string filePath);
-        Task SaveThemeAsync(IThemeEditorViewModel themeEditorViewModel, string filePath);
+        IThemeEditorViewModel LoadThemeFromFile(string filePath);
+        Theme LoadThemeModelFromFile(string filePath);
+        void SaveTheme(IThemeEditorViewModel themeEditorViewModel, string filePath);
     }
 
     internal class ThemeProvider : IThemeProvider
@@ -55,26 +54,23 @@ namespace Filtration.ThemeEditor.Providers
             return themeViewModel;
         }
 
-        public async Task<IThemeEditorViewModel> LoadThemeFromFile(string filePath)
+        public IThemeEditorViewModel LoadThemeFromFile(string filePath)
         {
-            var model = await _themePersistenceService.LoadThemeAsync(filePath);
+            var model = _themePersistenceService.LoadTheme(filePath);
             var viewModel = Mapper.Map<IThemeEditorViewModel>(model);
             viewModel.FilePath = filePath;
             return viewModel;
         }
 
-        public async Task<Theme> LoadThemeModelFromFile(string filePath)
+        public Theme LoadThemeModelFromFile(string filePath)
         {
-            return await _themePersistenceService.LoadThemeAsync(filePath);
+            return _themePersistenceService.LoadTheme(filePath);
         }
 
-        public async Task SaveThemeAsync(IThemeEditorViewModel themeEditorViewModel, string filePath)
+        public void SaveTheme(IThemeEditorViewModel themeEditorViewModel, string filePath)
         {
-            await Task.Run(() =>
-            {
-                var theme = Mapper.Map<Theme>(themeEditorViewModel);
-                _themePersistenceService.SaveThemeAsync(theme, filePath);
-            });
+            var theme = Mapper.Map<Theme>(themeEditorViewModel);
+            _themePersistenceService.SaveTheme(theme, filePath);
         }
     }
 }

Filtration.ThemeEditor/Services/ThemePersistenceService.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 using System.Xml.Serialization;
 using Filtration.ObjectModel.ThemeEditor;
 
@@ -7,42 +6,35 @@ namespace Filtration.ThemeEditor.Services
 {
     internal interface IThemePersistenceService
     {
-        Task<Theme> LoadThemeAsync(string filePath);
-        Task SaveThemeAsync(Theme theme, string filePath);
+        Theme LoadTheme(string filePath);
+        void SaveTheme(Theme theme, string filePath);
     }
 
     internal class ThemePersistenceService : IThemePersistenceService
     {
-        public async Task<Theme> LoadThemeAsync(string filePath)
+        public Theme LoadTheme(string filePath)
         {
-            Theme loadedTheme = null;
+            var xmlSerializer = new XmlSerializer(typeof(Theme));
 
-            await Task.Run(() =>
+            Theme loadedTheme;
+
+            using (Stream reader = new FileStream(filePath, FileMode.Open))
             {
-                var xmlSerializer = new XmlSerializer(typeof (Theme));
-
-                using (Stream reader = new FileStream(filePath, FileMode.Open))
-                {
-                    loadedTheme = (Theme) xmlSerializer.Deserialize(reader);
-                }
-
-                loadedTheme.FilePath = filePath;
-            });
+                loadedTheme = (Theme)xmlSerializer.Deserialize(reader);
+            }
             
+            loadedTheme.FilePath = filePath;
             return loadedTheme;
         }
 
-        public async Task SaveThemeAsync(Theme theme, string filePath)
+        public void SaveTheme(Theme theme, string filePath)
         {
-            await Task.Run(() =>
-            {
-                var xmlSerializer = new XmlSerializer(typeof (Theme));
+            var xmlSerializer = new XmlSerializer(typeof(Theme));
 
-                using (Stream writer = new FileStream(filePath, FileMode.Create))
-                {
-                    xmlSerializer.Serialize(writer, theme);
-                }
-            });
+            using (Stream writer = new FileStream(filePath, FileMode.Create))
+            {
+                xmlSerializer.Serialize(writer, theme);
+            }
         }
     }
 }

Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Media;
@@ -56,7 +55,7 @@ namespace Filtration.ThemeEditor.ViewModels
             AddThemeComponentCommand = new RelayCommand<ThemeComponentType>(OnAddThemeComponentCommand, t => IsMasterTheme);
             DeleteThemeComponentCommand = new RelayCommand<ThemeComponent>(OnDeleteThemeComponentCommand,
                 t => IsMasterTheme && SelectedThemeComponent != null);
-            CloseCommand = new RelayCommand(async () => await OnCloseCommand());
+            CloseCommand = new RelayCommand(OnCloseCommand);
 
             var icon = new BitmapImage();
             icon.BeginInit();
@@ -124,19 +123,19 @@ namespace Filtration.ThemeEditor.ViewModels
             }
         }
 
-        public async Task SaveAsync()
+        public void Save()
         {
             if (IsMasterTheme) return;
 
             if (_filenameIsFake)
             {
-                await SaveAsAsync();
+                SaveAs();
                 return;
             }
 
             try
             {
-                await _themeProvider.SaveThemeAsync(this, FilePath);
+                _themeProvider.SaveTheme(this, FilePath);
                 //RemoveDirtyFlag();
             }
             catch (Exception e)
@@ -150,7 +149,7 @@ namespace Filtration.ThemeEditor.ViewModels
             }
         }
 
-        public async Task SaveAsAsync()
+        public void SaveAs()
         {
             if (IsMasterTheme) return;
 
@@ -168,7 +167,7 @@ namespace Filtration.ThemeEditor.ViewModels
             try
             {
                 FilePath = saveDialog.FileName;
-                await _themeProvider.SaveThemeAsync(this, FilePath);
+                _themeProvider.SaveTheme(this, FilePath);
                 _filenameIsFake = false;
                 Title = Filename;
                 //RemoveDirtyFlag();
@@ -186,16 +185,14 @@ namespace Filtration.ThemeEditor.ViewModels
             }
         }
 
-        public async Task OnCloseCommand()
+        public void OnCloseCommand()
         {
-            await Close();
+            Close();
         }
 
-#pragma warning disable 1998
-        public async Task Close()
-#pragma warning restore 1998
+        public void Close()
         {
-           Messenger.Default.Send(new ThemeClosedMessage {ClosedViewModel = this});
+            Messenger.Default.Send(new ThemeClosedMessage { ClosedViewModel = this });
         }
         
         private void OnAddThemeComponentCommand(ThemeComponentType themeComponentType)

Filtration.ThemeEditor/Views/ThemeComponentControl.xaml

@@ -21,29 +21,30 @@
         </Grid.RowDefinitions>
         <Grid.Resources>
             <DataTemplate x:Key="EditableComponentNameTemplate">
-                <StackPanel>
-                    <TextBlock Text="{Binding UsageCount, StringFormat='Usages: {0}'}"
-                               FontSize="10"
-                               HorizontalAlignment="Right"
-                               Visibility="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}, Converter={StaticResource BooleanVisibilityConverter}}">
-                        <TextBlock.Style>
-                            <Style TargetType="TextBlock">
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding UsageCount}" Value="0">
-                                        <Setter Property="Foreground" Value="Red" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                                <Setter Property="Foreground" Value="SteelBlue" />
-                            </Style>
-                        </TextBlock.Style>
-                    </TextBlock>
-                    <TextBox Text="{Binding ComponentName}" />
-                </StackPanel>
+                <TextBox Text="{Binding ComponentName}" />
             </DataTemplate>
             <DataTemplate x:Key="ViewOnlyComponentNameTemplate">
                 <TextBlock Text="{Binding ComponentName}" ToolTip="{Binding ComponentName}" />
             </DataTemplate>
         </Grid.Resources>
+        <DockPanel LastChildFill="True">
+            <TextBlock DockPanel.Dock="Left"
+                       Text="{Binding UsageCount, StringFormat='Usages: {0}'}"
+                       FontSize="10"
+                       HorizontalAlignment="Right"
+                       Visibility="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}, Converter={StaticResource BooleanVisibilityConverter}}">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding UsageCount}" Value="0">
+                                <Setter Property="Foreground" Value="Red" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                        <Setter Property="Foreground" Value="SteelBlue" />
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+        </DockPanel>
         <ContentControl Grid.Row="1" Content="{Binding}">
             <ContentControl.Style>
                 <Style TargetType="ContentControl">
@@ -58,6 +59,7 @@
                 </Style>
             </ContentControl.Style>
         </ContentControl>
+
         <xctk:ColorPicker Grid.Row="2" SelectedColor="{Binding Color}" />
     </Grid>
 </UserControl>

Filtration.sln

@@ -21,6 +21,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Common", "Filtra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Common.Tests", "Filtration.Common.Tests\Filtration.Common.Tests.csproj", "{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.LootExplosionStudio", "Filtration.LootExplosionStudio\Filtration.LootExplosionStudio.csproj", "{C8009B11-14D0-4421-94F0-9EF4603CB363}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.LootExplosionStudio.Tests", "Filtration.LootExplosionStudio.Tests\Filtration.LootExplosionStudio.Tests.csproj", "{56D0887E-B10D-4F9C-A88E-09CF8E8E06E3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +67,14 @@ Global
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8009B11-14D0-4421-94F0-9EF4603CB363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8009B11-14D0-4421-94F0-9EF4603CB363}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8009B11-14D0-4421-94F0-9EF4603CB363}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8009B11-14D0-4421-94F0-9EF4603CB363}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56D0887E-B10D-4F9C-A88E-09CF8E8E06E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56D0887E-B10D-4F9C-A88E-09CF8E8E06E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56D0887E-B10D-4F9C-A88E-09CF8E8E06E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56D0887E-B10D-4F9C-A88E-09CF8E8E06E3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Filtration/Filtration.csproj

@@ -94,10 +94,6 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WpfAnimatedGif, Version=1.4.13.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WpfAnimatedGif.1.4.13\lib\net\WpfAnimatedGif.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
@@ -149,7 +145,6 @@
     <Compile Include="Models\UpdateData.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Repositories\ItemFilterScriptRepository.cs" />
-    <Compile Include="Services\ClipboardService.cs" />
     <Compile Include="Services\HTTPService.cs" />
     <Compile Include="Services\ItemFilterPersistenceService.cs" />
     <Compile Include="Services\StaticDataService.cs" />
@@ -248,6 +243,7 @@
     <Compile Include="Views\UpdateAvailableView.xaml.cs">
       <DependentUpon>UpdateAvailableView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="WindsorInstallers\ModelsInstaller.cs" />
     <Compile Include="WindsorInstallers\RepositoriesInstaller.cs" />
     <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
     <Compile Include="WindsorInstallers\TranslatorsInstaller.cs" />
@@ -369,7 +365,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Resource Include="Resources\loading_spinner.gif" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

Filtration/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Filtration")]
-[assembly: AssemblyDescription("An item filter script editor for Path of Exile")]
+[assembly: AssemblyDescription("An item filter script manager for Path of Exile")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("XVar Industries Inc.")]
 [assembly: AssemblyProduct("Filtration")]
@@ -50,7 +50,7 @@ using System.Windows;
 // 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("0.11.*")]
+[assembly: AssemblyVersion("0.7.*")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

Filtration/Repositories/ItemFilterScriptRepository.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Filtration.ObjectModel;
+using Filtration.ObjectModel;
 using Filtration.Services;
 using Filtration.ViewModels;
 
@@ -7,7 +6,7 @@ namespace Filtration.Repositories
 {
     internal interface IItemFilterScriptRepository
     {
-        Task<IItemFilterScriptViewModel> LoadScriptFromFileAsync(string path);
+        IItemFilterScriptViewModel LoadScriptFromFile(string path);
         IItemFilterScriptViewModel NewScript();
         string GetItemFilterScriptDirectory();
         void SetItemFilterScriptDirectory(string path);
@@ -25,9 +24,9 @@ namespace Filtration.Repositories
             _itemFilterScriptViewModelFactory = itemFilterScriptViewModelFactory;
         }
 
-        public async Task<IItemFilterScriptViewModel> LoadScriptFromFileAsync(string path)
+        public IItemFilterScriptViewModel LoadScriptFromFile(string path)
         {
-            var loadedScript = await _itemFilterPersistenceService.LoadItemFilterScriptAsync(path);
+            var loadedScript = _itemFilterPersistenceService.LoadItemFilterScript(path);
 
             var newViewModel = _itemFilterScriptViewModelFactory.Create();
             newViewModel.Initialise(loadedScript, false);

Filtration/Resources/ItemBaseTypes.txt

@@ -1069,54 +1069,31 @@ Sage Wand
 Serpent Wand
 Spiraled Wand
 Tornado Wand
-Abandoned Wealth
+Emperor's Luck
 The Avenger
-The Battle Born
-Birth of the Three
 The Brittle Emperor
+Hope
+The Battle Born
 The Carrion Crow
 The Cataclysm
-The Celestial Justicar
-The Chains that Bind
-Chaotic Disposition
-Coveted Possession
 The Dark Mage
-The Doctor
 The Drunken Aristocrat
-Emperor's Luck
-The Explorer
-The Feast
-The Fiend
-The Gambler
-The Gemcutter
-Gemcutter's Promise
 The Gladiator
-The Hermit
 The Hoarder
-Hope
 The Hunger
-Humility
-The Incantation
-The Inventor
-Jack in the Box
-The King's Heart
-Lantador's Lost Love
-The Lover
-Lucky Connections
 The Metalsmith's Gift
-The Pact
 The Poet
-The Queen
-Rain of Chaos
 The Road to Power
-The Scarred Meadow
 The Scholar
 The Summoner
-The Sun
-Three Faces in the Dark
-Time-Lost Relic
-The Union
 Vinia's Token
+Three Faces in the Dark
+The Hermit
+Lantador's Lost Love
+Birth of the Three
+The Lover
+Chaotic Disposition
+Eternal Sword
+The Sun
+The Gemcutter
 The Warden
-The Watcher
-The Wind

Filtration/Resources/ItemClasses.txt

@@ -35,4 +35,3 @@ Map Fragments
 Hideout Doodads
 Microtransactions
 Divination Card
-Jewel

Filtration/Services/ClipboardService.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Threading;
-using System.Windows;
-using NLog;
-
-namespace Filtration.Services
-{
-    internal interface IClipboardService
-    {
-        void SetClipboardText(string inputText);
-        string GetClipboardText();
-    }
-
-    internal class ClipboardService : IClipboardService
-    {
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
-
-        public void SetClipboardText(string inputText)
-        {
-            for (var i = 0; i < 10; i++)
-            {
-                try
-                {
-                    Clipboard.SetText(inputText);
-                    return;
-                }
-                catch (Exception e)
-                {
-                    _logger.Error(e);
-                }
-
-                Thread.Sleep(10);
-            }
-
-            throw new Exception("Failed to copy to clipboard");
-        }
-
-        public string GetClipboardText()
-        {
-            return Clipboard.GetText();
-        }
-    }
-}

Filtration/Services/ItemFilterPersistenceService.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 using Filtration.Common.Services;
 using Filtration.ObjectModel;
 using Filtration.Properties;
@@ -11,8 +10,8 @@ namespace Filtration.Services
     {
         void SetItemFilterScriptDirectory(string path);
         string ItemFilterScriptDirectory { get; }
-        Task<ItemFilterScript> LoadItemFilterScriptAsync(string filePath);
-        Task SaveItemFilterScriptAsync(ItemFilterScript script);
+        ItemFilterScript LoadItemFilterScript(string filePath);
+        void SaveItemFilterScript(ItemFilterScript script);
         string DefaultPathOfExileDirectory();
     }
 
@@ -59,30 +58,20 @@ namespace Filtration.Services
             Settings.Default.DefaultFilterDirectory = path;
         }
 
-        public async Task<ItemFilterScript> LoadItemFilterScriptAsync(string filePath)
+        public ItemFilterScript LoadItemFilterScript(string filePath)
         {
-            ItemFilterScript loadedScript = null;
-            await Task.Run(() =>
-            {
-                loadedScript = _itemFilterScriptTranslator.TranslateStringToItemFilterScript(
+            var script = 
+                _itemFilterScriptTranslator.TranslateStringToItemFilterScript(
                     _fileSystemService.ReadFileAsString(filePath));
-            });
 
-            if (loadedScript != null)
-            {
-                loadedScript.FilePath = filePath;
-            }
-        
-            return loadedScript;
+            script.FilePath = filePath;
+            return script;
         }
 
-        public async Task SaveItemFilterScriptAsync(ItemFilterScript script)
+        public void SaveItemFilterScript(ItemFilterScript script)
         {
-            await Task.Run(() =>
-            {
-                _fileSystemService.WriteFileFromString(script.FilePath,
-                    _itemFilterScriptTranslator.TranslateItemFilterScriptToString(script));
-            });
+            _fileSystemService.WriteFileFromString(script.FilePath,
+                _itemFilterScriptTranslator.TranslateItemFilterScriptToString(script));
         }
     }
 }

Filtration/Services/StaticDataService.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows;
 using Filtration.Common.Services;
 using Filtration.Utilities;
 
@@ -30,10 +28,10 @@ namespace Filtration.Services
 
         private void PopulateStaticData()
         {
-            var itemBaseTypes = _fileSystemService.ReadFileAsString(AppDomain.CurrentDomain.BaseDirectory + "\\Resources\\ItemBaseTypes.txt");
+            var itemBaseTypes = _fileSystemService.ReadFileAsString("Resources\\ItemBaseTypes.txt");
             ItemBaseTypes = new LineReader(() => new StringReader(itemBaseTypes)).ToList();
 
-            var itemClasses = _fileSystemService.ReadFileAsString(AppDomain.CurrentDomain.BaseDirectory + "\\Resources\\ItemClasses.txt");
+            var itemClasses = _fileSystemService.ReadFileAsString("Resources\\ItemClasses.txt");
             ItemClasses = new LineReader(() => new StringReader(itemClasses)).ToList();
         }
     }

Filtration/Services/UpdateCheckService.cs

@@ -7,7 +7,7 @@ namespace Filtration.Services
 {
     internal interface IUpdateCheckService
     {
-        Task<UpdateData> GetUpdateDataAsync();
+        Task<UpdateData> GetUpdateData();
     }
 
     internal class UpdateCheckService : IUpdateCheckService
@@ -20,7 +20,7 @@ namespace Filtration.Services
             _httpService = httpService;
         }
 
-        public async Task<UpdateData> GetUpdateDataAsync()
+        public async Task<UpdateData> GetUpdateData()
         {
             var updateXml = await _httpService.GetContentAsync(UpdateDataUrl);
             return (DeserializeUpdateData(updateXml));

Filtration/Translators/ItemFilterScriptTranslator.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Windows.Documents;
 using Castle.Core.Internal;
 using Filtration.ObjectModel;
 using Filtration.Properties;
@@ -55,7 +56,6 @@ namespace Filtration.Translators
                     }
 
                     lines[i] = lines[i].TrimStart('#');
-                    lines[i] = lines[i].Replace("#", " # ");
                     var spaceOrEndOfLinePos = lines[i].IndexOf(" ", StringComparison.Ordinal) > 0 ? lines[i].IndexOf(" ", StringComparison.Ordinal) : lines[i].Length;
                     var lineOption = lines[i].Substring(0, spaceOrEndOfLinePos);
 

Filtration/UserControls/BlockItemControl.xaml

@@ -100,7 +100,7 @@
                                 <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
                             </Button>
                             <ComboBox ItemsSource="{Binding ElementName=BlockItemContentControl, Path=DataContext.SoundsAvailable}" SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}" />
-                            <xctk:ShortUpDown Value="{Binding Path=SecondValue}" Minimum="1" Maximum="300" HorizontalAlignment="Right" ToolTip="Volume"/>
+                            <xctk:ShortUpDown Value="{Binding Path=SecondValue}" Minimum="1" Maximum="100" HorizontalAlignment="Right" ToolTip="Volume"/>
                         </WrapPanel>
                     </DataTemplate>
                 </ContentControl.Resources>

Filtration/Utilities/AutoMapperHelpers.cs

@@ -17,8 +17,7 @@ namespace Filtration.Utilities
                 if (viewModel.ChildGroups.All(g => g.IsChecked == true))
                 {
                     viewModel.IsChecked = true;
-                }
-                else if (viewModel.ChildGroups.Any(g => g.IsChecked == true || g.IsChecked == null))
+                } else if (viewModel.ChildGroups.Any(g => g.IsChecked == true))
                 {
                     viewModel.IsChecked = null;
                 }

Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs

@@ -39,9 +39,9 @@ namespace Filtration.ViewModels
         private readonly ReadOnlyObservableCollection<IDocument> _readOnlyOpenDocuments;
 
         public AvalonDockWorkspaceViewModel(ISectionBrowserViewModel sectionBrowserViewModel,
-            IBlockGroupBrowserViewModel blockGroupBrowserViewModel,
-            IStartPageViewModel startPageViewModel,
-            IBlockOutputPreviewViewModel blockOutputPreviewViewModel)
+                                            IBlockGroupBrowserViewModel blockGroupBrowserViewModel,
+                                            IStartPageViewModel startPageViewModel,
+                                            IBlockOutputPreviewViewModel blockOutputPreviewViewModel)
         {
             _sectionBrowserViewModel = sectionBrowserViewModel;
             _blockGroupBrowserViewModel = blockGroupBrowserViewModel;
@@ -123,6 +123,7 @@ namespace Filtration.ViewModels
 
         private List<IToolViewModel> _tools;
         
+
         public IEnumerable<IToolViewModel> Tools
         {
             get
@@ -170,19 +171,6 @@ namespace Filtration.ViewModels
             {
                 _activeDocument = null;
             }
-
-
-            // TODO: Replace _activeScriptViewModel and _activeThemeViewModel with a better solution.
-
-            if (document.IsScript && _activeScriptViewModel == (IItemFilterScriptViewModel) document)
-            {
-                _activeScriptViewModel = null;
-            }
-
-            if (document.IsTheme && _activeThemeViewModel == (IThemeEditorViewModel)document)
-            {
-                _activeThemeViewModel = null;
-            }
         }
 
         public void SwitchActiveDocument(IDocument document)

Filtration/ViewModels/ItemFilterBlockViewModel.cs

@@ -317,12 +317,6 @@ namespace Filtration.ViewModels
             get { return Block.HasBlockItemOfType<SoundBlockItem>(); }
         }
 
-
-        public bool HasAudioVisualBlockItems
-        {
-            get { return AudioVisualBlockItems.Any(); }
-        }
-
         private void OnSwitchBlockItemsViewCommand()
         {
             AudioVisualBlockItemsGridVisible = !AudioVisualBlockItemsGridVisible;
@@ -465,7 +459,6 @@ namespace Filtration.ViewModels
             RaisePropertyChanged("RegularBlockItems");
             RaisePropertyChanged("SummaryBlockItems");
             RaisePropertyChanged("AudioVisualBlockItems");
-            RaisePropertyChanged("HasAudioVisualBlockItems");
         }
     }
 }

Filtration/ViewModels/ItemFilterScriptViewModel.cs

@@ -4,11 +4,11 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Forms;
 using System.Windows.Media.Imaging;
+using Castle.Core.Internal;
 using Filtration.Common.Services;
 using Filtration.Common.ViewModels;
 using Filtration.Interface;
@@ -19,6 +19,7 @@ using Filtration.Translators;
 using GalaSoft.MvvmLight.CommandWpf;
 using GalaSoft.MvvmLight.Messaging;
 using NLog;
+using Clipboard = System.Windows.Clipboard;
 
 namespace Filtration.ViewModels
 {
@@ -75,8 +76,6 @@ namespace Filtration.ViewModels
         private readonly IAvalonDockWorkspaceViewModel _avalonDockWorkspaceViewModel;
         private readonly IItemFilterPersistenceService _persistenceService;
         private readonly IMessageBoxService _messageBoxService;
-        private readonly IClipboardService _clipboardService;
-        private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder;
 
         private bool _isDirty;
         private IItemFilterBlockViewModel _selectedBlockViewModel;
@@ -89,9 +88,7 @@ namespace Filtration.ViewModels
                                          IItemFilterBlockTranslator blockTranslator,
                                          IAvalonDockWorkspaceViewModel avalonDockWorkspaceViewModel,
                                          IItemFilterPersistenceService persistenceService,
-                                         IMessageBoxService messageBoxService,
-                                         IClipboardService clipboardService,
-                                         IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder)
+                                         IMessageBoxService messageBoxService)
         {
             _itemFilterBlockViewModelFactory = itemFilterBlockViewModelFactory;
             _blockTranslator = blockTranslator;
@@ -99,13 +96,11 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveDocumentChanged += OnActiveDocumentChanged;
             _persistenceService = persistenceService;
             _messageBoxService = messageBoxService;
-            _clipboardService = clipboardService;
-            _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
             _itemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModel>();
             
             ToggleShowAdvancedCommand = new RelayCommand<bool>(OnToggleShowAdvancedCommand);
             ClearFilterCommand = new RelayCommand(OnClearFilterCommand, () => BlockFilterPredicate != null);
-            CloseCommand = new RelayCommand(async () => await OnCloseCommand());
+            CloseCommand = new RelayCommand(OnCloseCommand);
             DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand, () => SelectedBlockViewModel != null);
             MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => SelectedBlockViewModel != null);
             MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand, () => SelectedBlockViewModel != null);
@@ -352,21 +347,20 @@ namespace Filtration.ViewModels
             ContentId = "ScriptContentId";
         }
 
-        public async Task SaveAsync()
+        public void Save()
         {
             if (!ValidateScript()) return;
             if (!CheckForUnusedThemeComponents()) return;
 
             if (_filenameIsFake)
             {
-                await SaveAsAsync();
+                SaveAs();
                 return;
             }
 
-            Messenger.Default.Send(new NotificationMessage("ShowLoadingBanner"));
             try
             {
-                await _persistenceService.SaveItemFilterScriptAsync(Script);
+                _persistenceService.SaveItemFilterScript(Script);
                 RemoveDirtyFlag();
             }
             catch (Exception e)
@@ -379,15 +373,9 @@ namespace Filtration.ViewModels
                 _messageBoxService.Show("Save Error", "Error saving filter file - " + e.Message, MessageBoxButton.OK,
                     MessageBoxImage.Error);
             }
-            finally
-            {
-                Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
-            }
-
-            return;
         }
 
-        public async Task SaveAsAsync()
+        public void SaveAs()
         {
             if (!ValidateScript()) return;
             if (!CheckForUnusedThemeComponents()) return;
@@ -403,13 +391,11 @@ namespace Filtration.ViewModels
 
             if (result != DialogResult.OK) return;
 
-            Messenger.Default.Send(new NotificationMessage("ShowLoadingBanner"));
-
             var previousFilePath = Script.FilePath;
             try
             {
                 Script.FilePath = saveDialog.FileName;
-                await _persistenceService.SaveItemFilterScriptAsync(Script);
+                _persistenceService.SaveItemFilterScript(Script);
                 _filenameIsFake = false;
                 Title = Filename;
                 RemoveDirtyFlag();
@@ -425,10 +411,6 @@ namespace Filtration.ViewModels
                     MessageBoxImage.Error);
                 Script.FilePath = previousFilePath;
             }
-            finally
-            {
-                Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
-            }
         }
 
         private bool CheckForUnusedThemeComponents()
@@ -494,12 +476,12 @@ namespace Filtration.ViewModels
             return false;
         }
 
-        private async Task OnCloseCommand()
+        private void OnCloseCommand()
         {
-            await Close();
+            Close();
         }
         
-        public async Task Close()
+        public void Close()
         {
             if (!IsDirty)
             {
@@ -508,25 +490,25 @@ namespace Filtration.ViewModels
             else
             {
                 var result = _messageBoxService.Show("Filtration",
-                    "Save script \"" + Filename + "\"?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
+                    "Want to save your changes to this script?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
 
                 switch (result)
                 {
                     case MessageBoxResult.Yes:
-                    {
-                        await SaveAsync();
-                        CloseScript();
-                        break;
-                    }
+                        {
+                            Save();
+                            CloseScript();
+                            break;
+                        }
                     case MessageBoxResult.No:
-                    {
-                        CloseScript();
-                        break;
-                    }
+                        {
+                            CloseScript();
+                            break;
+                        }
                     case MessageBoxResult.Cancel:
-                    {
-                        return;
-                    }
+                        {
+                            return;
+                        }
                 }
             }
         }
@@ -562,16 +544,7 @@ namespace Filtration.ViewModels
 
         public void CopyBlock(IItemFilterBlockViewModel targetBlockViewModel)
         {
-            try
-            {
-                _clipboardService.SetClipboardText(
-                    _blockTranslator.TranslateItemFilterBlockToString(SelectedBlockViewModel.Block));
-            }
-            catch
-            {
-                _messageBoxService.Show("Clipboard Error", "Failed to access the clipboard, copy command not completed.",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+            Clipboard.SetText(_blockTranslator.TranslateItemFilterBlockToString(SelectedBlockViewModel.Block));
         }
 
         private void OnCopyBlockStyleCommand()
@@ -591,15 +564,8 @@ namespace Filtration.ViewModels
                 }
                 outputText += blockItem.OutputText;
             }
-            try
-            {
-                _clipboardService.SetClipboardText(outputText);
-            }
-            catch
-            {
-                _messageBoxService.Show("Clipboard Error", "Failed to access the clipboard, copy command not completed.",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+
+            Clipboard.SetText(outputText);
         }
 
         private void OnPasteBlockStyleCommand()
@@ -609,7 +575,7 @@ namespace Filtration.ViewModels
 
         public void PasteBlockStyle(IItemFilterBlockViewModel targetBlockViewModel)
         {
-            var clipboardText = _clipboardService.GetClipboardText();
+            var clipboardText = Clipboard.GetText();
             if (string.IsNullOrEmpty(clipboardText))
             {
                 return;
@@ -628,9 +594,8 @@ namespace Filtration.ViewModels
         {
             try
             {
-                var clipboardText = _clipboardService.GetClipboardText();
-                if (string.IsNullOrEmpty(clipboardText)) return;
-                _blockGroupHierarchyBuilder.Initialise(Script.ItemFilterBlockGroups.First());
+                var clipboardText = Clipboard.GetText();
+                if (clipboardText.IsNullOrEmpty()) return;
 
                 var translatedBlock = _blockTranslator.TranslateStringToItemFilterBlock(clipboardText, Script.ThemeComponents);
                 if (translatedBlock == null) return;
@@ -656,12 +621,9 @@ namespace Filtration.ViewModels
             catch (Exception e)
             {
                 _logger.Error(e);
-                var innerException = e.InnerException != null
-                    ? e.InnerException.Message
-                    : string.Empty;
-
                 _messageBoxService.Show("Paste Error",
-                    e.Message + Environment.NewLine + innerException, MessageBoxButton.OK,
+                    e.Message + Environment.NewLine + e.StackTrace + Environment.NewLine +
+                    e.InnerException.Message + Environment.NewLine + e.InnerException.StackTrace, MessageBoxButton.OK,
                     MessageBoxImage.Error);
             }
         }
@@ -791,7 +753,6 @@ namespace Filtration.ViewModels
             IsDirty = true;
             SelectedBlockViewModel = vm;
             RaisePropertyChanged("ItemFilterSectionViewModels");
-            Messenger.Default.Send(new NotificationMessage("SectionsChanged"));
         }
 
         private void OnExpandAllBlocksCommand()
@@ -823,17 +784,9 @@ namespace Filtration.ViewModels
             
             if (result == MessageBoxResult.Yes)
             {
-                var isSection = targetBlockViewModel.Block is ItemFilterSection;
-
                 Script.ItemFilterBlocks.Remove(targetBlockViewModel.Block);
                 ItemFilterBlockViewModels.Remove(targetBlockViewModel);
                 IsDirty = true;
-
-                if (isSection)
-                {
-                    Messenger.Default.Send(new NotificationMessage("SectionsChanged"));
-                }
-
             }
             SelectedBlockViewModel = null;
         }

Filtration/ViewModels/MainWindowViewModel.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
-using System.Windows.Forms.VisualStyles;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Filtration.Common.Services;
@@ -28,6 +24,7 @@ using Filtration.Views;
 using GalaSoft.MvvmLight.CommandWpf;
 using GalaSoft.MvvmLight.Messaging;
 using NLog;
+using Clipboard = System.Windows.Clipboard;
 using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 
 namespace Filtration.ViewModels
@@ -36,8 +33,6 @@ namespace Filtration.ViewModels
     {
         RelayCommand OpenScriptCommand { get; }
         RelayCommand NewScriptCommand { get; }
-        Task<bool> CloseAllDocumentsAsync();
-        Task OpenDroppedFilesAsync(List<string> filenames);
     }
 
     internal class MainWindowViewModel : FiltrationViewModelBase, IMainWindowViewModel
@@ -54,8 +49,8 @@ namespace Filtration.ViewModels
         private readonly IUpdateCheckService _updateCheckService;
         private readonly IUpdateAvailableViewModel _updateAvailableViewModel;
         private readonly IMessageBoxService _messageBoxService;
-        private readonly IClipboardService _clipboardService;
-        private bool _showLoadingBanner;
+        private bool _activeDocumentIsScript;
+        private bool _activeDocumentIsTheme;
 
         public MainWindowViewModel(IItemFilterScriptRepository itemFilterScriptRepository,
                                    IItemFilterScriptTranslator itemFilterScriptTranslator,
@@ -66,8 +61,7 @@ namespace Filtration.ViewModels
                                    IThemeService themeService,
                                    IUpdateCheckService updateCheckService,
                                    IUpdateAvailableViewModel updateAvailableViewModel,
-                                   IMessageBoxService messageBoxService,
-                                   IClipboardService clipboardService)
+                                   IMessageBoxService messageBoxService)
         {
             _itemFilterScriptRepository = itemFilterScriptRepository;
             _itemFilterScriptTranslator = itemFilterScriptTranslator;
@@ -79,54 +73,53 @@ namespace Filtration.ViewModels
             _updateCheckService = updateCheckService;
             _updateAvailableViewModel = updateAvailableViewModel;
             _messageBoxService = messageBoxService;
-            _clipboardService = clipboardService;
 
             NewScriptCommand = new RelayCommand(OnNewScriptCommand);
-            CopyScriptCommand = new RelayCommand(OnCopyScriptCommand, () => ActiveDocumentIsScript);
-            OpenScriptCommand = new RelayCommand(async () => await OnOpenScriptCommand());
-            OpenThemeCommand = new RelayCommand(async () => await OnOpenThemeCommandAsync());
+            CopyScriptCommand = new RelayCommand(OnCopyScriptCommand, () => _activeDocumentIsScript);
+            OpenScriptCommand = new RelayCommand(OnOpenScriptCommand);
+            OpenThemeCommand = new RelayCommand(OnOpenThemeCommand);
 
-            SaveCommand = new RelayCommand(async () => await OnSaveDocumentCommandAsync(), ActiveDocumentIsEditable);
-            SaveAsCommand = new RelayCommand(async () => await OnSaveAsCommandAsync(), ActiveDocumentIsEditable);
-            CloseCommand = new RelayCommand(OnCloseDocumentCommand, ActiveDocumentIsEditable);
+            SaveCommand = new RelayCommand(OnSaveDocumentCommand, ActiveDocumentIsEditable);
+            SaveAsCommand = new RelayCommand(OnSaveAsCommand, ActiveDocumentIsEditable);
+            CloseCommand = new RelayCommand(OnCloseDocumentCommand, () => AvalonDockWorkspaceViewModel.ActiveDocument != null);
 
-            CopyBlockCommand = new RelayCommand(OnCopyBlockCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
-            CopyBlockStyleCommand = new RelayCommand(OnCopyBlockStyleCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
-            PasteCommand = new RelayCommand(OnPasteCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
-            PasteBlockStyleCommand = new RelayCommand(OnPasteBlockStyleCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
+            CopyBlockCommand = new RelayCommand(OnCopyBlockCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
+            CopyBlockStyleCommand = new RelayCommand(OnCopyBlockStyleCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
+            PasteCommand = new RelayCommand(OnPasteCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
+            PasteBlockStyleCommand = new RelayCommand(OnPasteBlockStyleCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
 
-            MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
-            MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
-            MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
-            MoveBlockToBottomCommand = new RelayCommand(OnMoveBlockToBottomCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
+            MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
+            MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
+            MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
+            MoveBlockToBottomCommand = new RelayCommand(OnMoveBlockToBottomCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
 
-            AddBlockCommand = new RelayCommand(OnAddBlockCommand, () => ActiveDocumentIsScript);
-            AddSectionCommand = new RelayCommand(OnAddSectionCommand, () => ActiveDocumentIsScript);
-            DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
+            AddBlockCommand = new RelayCommand(OnAddBlockCommand, () => _activeDocumentIsScript);
+            AddSectionCommand = new RelayCommand(OnAddSectionCommand, () => _activeDocumentIsScript);
+            DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand, () => _activeDocumentIsScript && ActiveScriptHasSelectedBlock);
             DisableBlockCommand = new RelayCommand(OnDisableBlockCommand,
-                () => ActiveDocumentIsScript && ActiveScriptHasSelectedEnabledBlock);
+                () => _activeDocumentIsScript && ActiveScriptHasSelectedEnabledBlock);
             EnableBlockCommand = new RelayCommand(OnEnableBlockCommand,
-                () => ActiveDocumentIsScript && ActiveScriptHasSelectedDisabledBlock);
+                () => _activeDocumentIsScript && ActiveScriptHasSelectedDisabledBlock);
             OpenAboutWindowCommand = new RelayCommand(OnOpenAboutWindowCommand);
-            ReplaceColorsCommand = new RelayCommand(OnReplaceColorsCommand, () => ActiveDocumentIsScript);
+            ReplaceColorsCommand = new RelayCommand(OnReplaceColorsCommand, () => _activeDocumentIsScript);
 
-            CreateThemeCommand = new RelayCommand(OnCreateThemeCommand, () => ActiveDocumentIsScript);
-            ApplyThemeToScriptCommand = new RelayCommand(async () => await OnApplyThemeToScriptCommandAsync(), () => ActiveDocumentIsScript);
-            EditMasterThemeCommand = new RelayCommand(OnEditMasterThemeCommand, () => ActiveDocumentIsScript);
+            CreateThemeCommand = new RelayCommand(OnCreateThemeCommand, () => _activeDocumentIsScript);
+            ApplyThemeToScriptCommand = new RelayCommand(OnApplyThemeToScriptCommand, () => _activeDocumentIsScript);
+            EditMasterThemeCommand = new RelayCommand(OnEditMasterThemeCommand, () => _activeDocumentIsScript);
 
-            AddTextColorThemeComponentCommand = new RelayCommand(OnAddTextColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
-            AddBackgroundColorThemeComponentCommand = new RelayCommand(OnAddBackgroundColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
-            AddBorderColorThemeComponentCommand = new RelayCommand(OnAddBorderColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddTextColorThemeComponentCommand = new RelayCommand(OnAddTextColorThemeComponentCommand, () => _activeDocumentIsTheme && ActiveThemeIsEditable);
+            AddBackgroundColorThemeComponentCommand = new RelayCommand(OnAddBackgroundColorThemeComponentCommand, () => _activeDocumentIsTheme && ActiveThemeIsEditable);
+            AddBorderColorThemeComponentCommand = new RelayCommand(OnAddBorderColorThemeComponentCommand, () => _activeDocumentIsTheme && ActiveThemeIsEditable);
             DeleteThemeComponentCommand = new RelayCommand(OnDeleteThemeComponentCommand,
                 () =>
-                    ActiveDocumentIsTheme && ActiveThemeIsEditable &&
+                    ActiveDocumentIsTheme && _activeDocumentIsTheme &&
                     _avalonDockWorkspaceViewModel.ActiveThemeViewModel.SelectedThemeComponent != null);
 
-            ExpandAllBlocksCommand = new RelayCommand(OnExpandAllBlocksCommand, () => ActiveDocumentIsScript);
-            CollapseAllBlocksCommand = new RelayCommand(OnCollapseAllBlocksCommand, () => ActiveDocumentIsScript);
+            ExpandAllBlocksCommand = new RelayCommand(OnExpandAllBlocksCommand, () => _activeDocumentIsScript);
+            CollapseAllBlocksCommand = new RelayCommand(OnCollapseAllBlocksCommand, () => _activeDocumentIsScript);
 
-            ToggleShowAdvancedCommand = new RelayCommand<bool>(OnToggleShowAdvancedCommand, s => ActiveDocumentIsScript);
-            ClearFiltersCommand = new RelayCommand(OnClearFiltersCommand, () => ActiveDocumentIsScript);
+            ToggleShowAdvancedCommand = new RelayCommand<bool>(OnToggleShowAdvancedCommand, s => _activeDocumentIsScript);
+            ClearFiltersCommand = new RelayCommand(OnClearFiltersCommand, () => _activeDocumentIsScript);
 
             if (string.IsNullOrEmpty(_itemFilterScriptRepository.GetItemFilterScriptDirectory()))
             {
@@ -161,8 +154,7 @@ namespace Filtration.ViewModels
                         ApplyThemeToScriptCommand.RaiseCanExecuteChanged();
                         EditMasterThemeCommand.RaiseCanExecuteChanged();
                         CreateThemeCommand.RaiseCanExecuteChanged();
-                        RaisePropertyChanged("ActiveDocumentIsScript");
-                        RaisePropertyChanged("ActiveDocumentIsTheme");
+                        SetActiveDocumentStatusProperties();
                         RaisePropertyChanged("ShowAdvancedStatus");
                         break;
                     }
@@ -173,28 +165,14 @@ namespace Filtration.ViewModels
                     }
                     case "OpenScript":
                     {
-#pragma warning disable 4014
                         OnOpenScriptCommand();
-#pragma warning restore 4014
-                        break;
-                    }
-                    case "ShowLoadingBanner":
-                    {
-                        ShowLoadingBanner = true;
-                        break;
-                    }
-                    case "HideLoadingBanner":
-                    {
-                        ShowLoadingBanner = false;
                         break;
                     }
                 }
             });
-
-            Task.Run(async () =>
-            {
-                await CheckForUpdatesAsync();
-            }).Wait();
+            CheckForUpdates();
+            ActiveDocumentIsScript = false;
+            ActiveDocumentIsTheme = false;
         }
 
         public RelayCommand OpenScriptCommand { get; private set; }
@@ -238,14 +216,14 @@ namespace Filtration.ViewModels
         public RelayCommand ClearFiltersCommand { get; private set; }
 
 
-        public async Task CheckForUpdatesAsync()
+        public async void CheckForUpdates()
         {
             var assemblyVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
 
+            var result = await _updateCheckService.GetUpdateData();
+
             try
             {
-                var result = await _updateCheckService.GetUpdateDataAsync();
-
                 if (result.LatestVersionMajorPart >= assemblyVersion.FileMajorPart &&
                     result.LatestVersionMinorPart > assemblyVersion.FileMinorPart)
                 {
@@ -302,24 +280,30 @@ namespace Filtration.ViewModels
             }
         }
 
-        public bool ShowLoadingBanner
+        private void SetActiveDocumentStatusProperties()
         {
-            get { return _showLoadingBanner; }
-            private set
-            {
-                _showLoadingBanner = value;
-                RaisePropertyChanged();
-            }
+            ActiveDocumentIsScript = AvalonDockWorkspaceViewModel.ActiveDocument is ItemFilterScriptViewModel;
+            ActiveDocumentIsTheme = AvalonDockWorkspaceViewModel.ActiveDocument is ThemeEditorViewModel;
         }
 
         public bool ActiveDocumentIsScript
         {
-            get { return _avalonDockWorkspaceViewModel.ActiveDocument != null && _avalonDockWorkspaceViewModel.ActiveDocument.IsScript; }
+            get { return _activeDocumentIsScript; }
+            private set
+            {
+                _activeDocumentIsScript = value;
+                RaisePropertyChanged();
+            }
         }
 
         public bool ActiveDocumentIsTheme
         {
-            get { return _avalonDockWorkspaceViewModel.ActiveDocument!= null && _avalonDockWorkspaceViewModel.ActiveDocument.IsTheme; }
+            get { return _activeDocumentIsTheme; }
+            private set
+            {
+                _activeDocumentIsTheme = value;
+                RaisePropertyChanged();
+            }
         }
 
         public bool ActiveScriptHasSelectedBlock
@@ -355,29 +339,6 @@ namespace Filtration.ViewModels
             }
         }
 
-        public async Task OpenDroppedFilesAsync(List<string> filenames)
-        {
-            foreach (var filename in filenames)
-            {
-                var extension = Path.GetExtension(filename);
-                if (extension == null) continue;
-
-                switch (extension.ToUpperInvariant())
-                {
-                    case ".FILTER":
-                    {
-                        await LoadScriptAsync(filename);
-                        break;
-                    }
-                    case ".FILTERTHEME":
-                    {
-                        await LoadThemeAsync(filename);
-                        break;
-                    }
-                }
-            }
-        }
-
         private void OnCreateThemeCommand()
         {
             var themeViewModel = _themeProvider.NewThemeForScript(AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script);
@@ -418,31 +379,24 @@ namespace Filtration.ViewModels
             var aboutWindow = new AboutWindow();
             aboutWindow.ShowDialog();
         }
-
-        private async Task OnOpenScriptCommand()
+        private void OnOpenScriptCommand()
         {
-            var filePath = ShowOpenScriptDialog();
-
-            if (string.IsNullOrEmpty(filePath))
+            var openFileDialog = new OpenFileDialog
             {
-                return;
-            }
+                Filter = "Filter Files (*.filter)|*.filter|All Files (*.*)|*.*",
+                InitialDirectory = _itemFilterScriptRepository.GetItemFilterScriptDirectory()
+            };
 
-            await LoadScriptAsync(filePath);
-        }
+            if (openFileDialog.ShowDialog() != true) return;
 
-        private async Task LoadScriptAsync(string scriptFilename)
-        {
             IItemFilterScriptViewModel loadedViewModel;
 
-            Messenger.Default.Send(new NotificationMessage("ShowLoadingBanner"));
             try
             {
-                loadedViewModel = await _itemFilterScriptRepository.LoadScriptFromFileAsync(scriptFilename);
+                loadedViewModel = _itemFilterScriptRepository.LoadScriptFromFile(openFileDialog.FileName);
             }
-            catch (IOException e)
+            catch(IOException e)
             {
-                Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
                 if (_logger.IsErrorEnabled)
                 {
                     _logger.Error(e);
@@ -453,28 +407,23 @@ namespace Filtration.ViewModels
                 return;
             }
 
-            Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
             _avalonDockWorkspaceViewModel.AddDocument(loadedViewModel);
         }
 
-        private async Task OnOpenThemeCommandAsync()
+        private void OnOpenThemeCommand()
         {
+
             var filePath = ShowOpenThemeDialog();
             if (string.IsNullOrEmpty(filePath))
             {
                 return;
             }
 
-            await LoadThemeAsync(filePath);
-        }
-
-        private async Task LoadThemeAsync(string themeFilename)
-        {
             IThemeEditorViewModel loadedViewModel;
 
             try
             {
-                loadedViewModel = await _themeProvider.LoadThemeFromFile(themeFilename);
+                loadedViewModel = _themeProvider.LoadThemeFromFile(filePath);
             }
             catch (IOException e)
             {
@@ -491,7 +440,7 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.AddDocument(loadedViewModel);
         }
 
-        private async Task OnApplyThemeToScriptCommandAsync()
+        private void OnApplyThemeToScriptCommand()
         {
             var filePath = ShowOpenThemeDialog();
             if (string.IsNullOrEmpty(filePath))
@@ -503,7 +452,7 @@ namespace Filtration.ViewModels
 
             try
             {
-                loadedTheme = await _themeProvider.LoadThemeModelFromFile(filePath);
+                loadedTheme = _themeProvider.LoadThemeModelFromFile(filePath);
             }
             catch (IOException e)
             {
@@ -529,16 +478,6 @@ namespace Filtration.ViewModels
             AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SetDirtyFlag();
         }
 
-        private string ShowOpenScriptDialog()
-        {
-            var openFileDialog = new OpenFileDialog
-            {
-                Filter = "Filter Files (*.filter)|*.filter|All Files (*.*)|*.*",
-                InitialDirectory = _itemFilterScriptRepository.GetItemFilterScriptDirectory()
-            };
-
-            return openFileDialog.ShowDialog() != true ? string.Empty : openFileDialog.FileName;
-        }
 
         private string ShowOpenThemeDialog()
         {
@@ -551,6 +490,8 @@ namespace Filtration.ViewModels
             return openFileDialog.ShowDialog() != true ? string.Empty : openFileDialog.FileName;
         }
 
+
+
         private void SetItemFilterScriptDirectory()
         {
             var dlg = new FolderBrowserDialog
@@ -566,14 +507,14 @@ namespace Filtration.ViewModels
             }
         }
 
-        private async Task OnSaveDocumentCommandAsync()
+        private void OnSaveDocumentCommand()
         {
-            await ((IEditableDocument)_avalonDockWorkspaceViewModel.ActiveDocument).SaveAsync();
+            ((IEditableDocument)_avalonDockWorkspaceViewModel.ActiveDocument).Save();
         }
 
-        private async Task OnSaveAsCommandAsync()
+        private void OnSaveAsCommand()
         {
-            await ((IEditableDocument)_avalonDockWorkspaceViewModel.ActiveDocument).SaveAsAsync();
+            ((IEditableDocument)_avalonDockWorkspaceViewModel.ActiveDocument).SaveAs();
         }
 
         private void OnReplaceColorsCommand()
@@ -585,18 +526,7 @@ namespace Filtration.ViewModels
 
         private void OnCopyScriptCommand()
         {
-            try
-            {
-
-                _clipboardService.SetClipboardText(
-                    _itemFilterScriptTranslator.TranslateItemFilterScriptToString(
-                        _avalonDockWorkspaceViewModel.ActiveScriptViewModel.Script));
-            }
-            catch
-            {
-                _messageBoxService.Show("Clipboard Error", "Failed to access the clipboard, copy command not completed.",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+            Clipboard.SetText(_itemFilterScriptTranslator.TranslateItemFilterScriptToString(_avalonDockWorkspaceViewModel.ActiveScriptViewModel.Script));
         }
 
         private void OnCopyBlockCommand()
@@ -715,22 +645,5 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveThemeViewModel.DeleteThemeComponentCommand.Execute(
                 _avalonDockWorkspaceViewModel.ActiveThemeViewModel.SelectedThemeComponent);
         }
-
-        public async Task<bool> CloseAllDocumentsAsync()
-        {
-            var openDocuments = _avalonDockWorkspaceViewModel.OpenDocuments.OfType<IEditableDocument>().ToList();
-            
-            foreach (var document in openDocuments)
-            {
-                var docCount = _avalonDockWorkspaceViewModel.OpenDocuments.OfType<IEditableDocument>().Count();
-                await document.Close();
-                if (_avalonDockWorkspaceViewModel.OpenDocuments.OfType<IEditableDocument>().Count() == docCount)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
     }
 }

Filtration/ViewModels/StartPageViewModel.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Filtration.Common.ViewModels;
+using Filtration.Common.ViewModels;
 using Filtration.Interface;
 using GalaSoft.MvvmLight.CommandWpf;
 using GalaSoft.MvvmLight.Messaging;
@@ -26,7 +25,7 @@ namespace Filtration.ViewModels
         public bool IsScript { get { return false; } }
         public bool IsTheme { get { return false; } }
 
-        public Task Close()
+        public void Close()
         {
             throw new System.NotImplementedException();
         }

Filtration/ViewModels/ToolPanes/SectionBrowserViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Media.Imaging;
-using GalaSoft.MvvmLight.Messaging;
 
 namespace Filtration.ViewModels.ToolPanes
 {
@@ -24,18 +23,6 @@ namespace Filtration.ViewModels.ToolPanes
             icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/add_section_icon.png");
             icon.EndInit();
             IconSource = icon;
-
-            Messenger.Default.Register<NotificationMessage>(this, message =>
-            {
-                switch (message.Notification)
-                {
-                    case "SectionsChanged":
-                    {
-                        OnActiveDocumentChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                }
-            });
         }
 
         public const string ToolContentId = "SectionBrowserTool";

Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml

@@ -10,10 +10,9 @@
              xmlns:converters="clr-namespace:Filtration.Converters"
              xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
              xmlns:themeEditorViews="clr-namespace:Filtration.ThemeEditor.Views;assembly=Filtration.ThemeEditor"
-             xmlns:gif="http://wpfanimatedgif.codeplex.com"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance d:Type=viewModels:AvalonDockWorkspaceViewModel}"
-             d:DesignHeight="300" d:DesignWidth="700">
+             d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <xcad:BoolToVisibilityConverter x:Key="AvalonBoolToVisibilityConverter" />
         <converters:ActiveDocumentConverter x:Key="ActiveDocumentConverter" />

Filtration/Views/ItemFilterBlockView.xaml

@@ -272,8 +272,6 @@
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
 
-                            <TextBlock Grid.Row="1" FontStyle="Italic" Visibility="{Binding HasAudioVisualBlockItems, Converter={StaticResource InverseBooleanVisibilityConverter}}">To change the appearance of this block, add a Text, Background or Border Block Item above.</TextBlock>
-                            
                             <!-- Block Items -->
                             <WrapPanel Grid.Row="1" MaxHeight="200">
                                 <WrapPanel.Resources>

Filtration/Views/MainWindow.xaml

@@ -8,18 +8,15 @@
         xmlns:viewModels="clr-namespace:Filtration.ViewModels"
         xmlns:viewsAvalonDock="clr-namespace:Filtration.Views.AvalonDock"
         xmlns:views="clr-namespace:Filtration.Views"
-        xmlns:gif="http://wpfanimatedgif.codeplex.com"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
-        Title="{Binding WindowTitle}" Height="762" Width="1126" IsIconVisible="True"
-        Closing="MainWindow_OnClosing" Drop="MainWindow_OnDrop" AllowDrop="True">
+        Title="{Binding WindowTitle}" Height="762" Width="1126" IsIconVisible="True" >
     <fluent:RibbonWindow.InputBindings>
         <KeyBinding Command="{Binding SaveCommand}" Modifiers="Control" Key="S" />
         <KeyBinding Command="{Binding OpenScriptCommand}" Modifiers="Control" Key="O" />
-        <KeyBinding Command="{Binding NewScriptCommand}" Modifiers="Control" Key="N" />
     </fluent:RibbonWindow.InputBindings>
     <DockPanel x:Name="RootDockPanel">
-        <fluent:Ribbon DockPanel.Dock="Top" x:Name="RibbonRoot" IsEnabled="{Binding ShowLoadingBanner, Converter={StaticResource BoolInverterConverter}}">
+        <fluent:Ribbon DockPanel.Dock="Top" x:Name="RibbonRoot">
             <fluent:Ribbon.Menu>
                 <fluent:Backstage>
                     <fluent:BackstageTabControl>
@@ -32,10 +29,10 @@
                                 </DataTemplate>
                             </fluent:BackstageTabItem.ContentTemplate>
                         </fluent:BackstageTabItem>
-                        <fluent:Button Header="New Script" Command="{Binding NewScriptCommand}" Icon="{StaticResource NewIcon}" ToolTip="New Script (Ctrl+N)" />
-                        <fluent:Button Header="Open Script" Command="{Binding OpenScriptCommand}" Icon="{StaticResource OpenIcon}" ToolTip="Open Script (Ctrl+O)" />
+                        <fluent:Button Header="New Script" Command="{Binding NewScriptCommand}" Icon="{StaticResource NewIcon}" />
+                        <fluent:Button Header="Open Script" Command="{Binding OpenScriptCommand}" Icon="{StaticResource OpenIcon}" />
                         <fluent:Button Header="Open Theme" Command="{Binding OpenThemeCommand}" Icon="{StaticResource OpenIcon}" />
-                        <fluent:Button Header="Save" Command="{Binding SaveCommand}" Icon="{StaticResource SaveIcon}" ToolTip="Save (Ctrl+S)" />
+                        <fluent:Button Header="Save" Command="{Binding SaveCommand}" Icon="{StaticResource SaveIcon}" />
                         <fluent:Button Header="Save As" Command="{Binding SaveAsCommand}" Icon="{StaticResource SaveIcon}" />
                         <fluent:Button Header="Close" Command="{Binding CloseCommand}" />
                         <fluent:SeparatorTabItem />
@@ -74,10 +71,10 @@
             </fluent:RibbonTabItem>
             <fluent:RibbonTabItem x:Name="ScriptToolsTabItem" Header="Script Tools" Group="{Binding ElementName=ScriptToolsGroup}" Visibility="{Binding ActiveDocumentIsScript, Converter={StaticResource BooleanVisibilityConverter}, Mode=OneWay}" >
                 <fluent:RibbonGroupBox Header="Clipboard">
-                    <fluent:Button Header="Copy Block" Command="{Binding CopyBlockCommand}" Icon="{StaticResource CopyIcon}" LargeIcon="{StaticResource CopyIcon}" ToolTip="Copy Block (Ctrl+C)"/>
-                    <fluent:Button Header="Paste Block" Command="{Binding PasteCommand}" Icon="{StaticResource PasteIcon}" LargeIcon="{StaticResource PasteIcon}" ToolTip="Paste Block (Ctrl+V)"/>
-                    <fluent:Button Header="Copy Style" Command="{Binding CopyBlockStyleCommand}" Icon="{StaticResource CopyIcon}" LargeIcon="{StaticResource CopyIcon}" SizeDefinition="Middle" ToolTip="Copy Style (Ctrl+Shift+C)" />
-                    <fluent:Button Header="Paste Style" Command="{Binding PasteBlockStyleCommand}" Icon="{StaticResource PasteStyleIcon}" LargeIcon="{StaticResource PasteIcon}" SizeDefinition="Middle" ToolTip="Paste Style (Ctrl+Shift+V)" />
+                    <fluent:Button Header="Copy Block" Command="{Binding CopyBlockCommand}" Icon="{StaticResource CopyIcon}" LargeIcon="{StaticResource CopyIcon}"/>
+                    <fluent:Button Header="Paste Block" Command="{Binding PasteCommand}" Icon="{StaticResource PasteIcon}" LargeIcon="{StaticResource PasteIcon}" />
+                    <fluent:Button Header="Copy Style" Command="{Binding CopyBlockStyleCommand}" Icon="{StaticResource CopyIcon}" LargeIcon="{StaticResource CopyIcon}" SizeDefinition="Middle" />
+                    <fluent:Button Header="Paste Style" Command="{Binding PasteBlockStyleCommand}" Icon="{StaticResource PasteStyleIcon}" LargeIcon="{StaticResource PasteIcon}" SizeDefinition="Middle" />
                     <fluent:Button Header="Copy Script" Command="{Binding CopyScriptCommand}" Icon="{StaticResource CopyIcon}" LargeIcon="{StaticResource PasteIcon}" SizeDefinition="Middle" />
                 </fluent:RibbonGroupBox>
                 <fluent:RibbonGroupBox Header="Blocks">
@@ -119,30 +116,6 @@
         </fluent:Ribbon>
         <Grid>
             <viewsAvalonDock:AvalonDockWorkspaceView DataContext="{Binding AvalonDockWorkspaceViewModel}" />
-            <Grid ZIndex="9999" Visibility="{Binding ShowLoadingBanner, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter={x:Static Visibility.Hidden}}">
-
-                <Grid.Background>
-                    <SolidColorBrush Color="Black" Opacity="0.5" />
-                </Grid.Background>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition  Width="*" />
-                        <ColumnDefinition  Width="Auto" />
-                        <ColumnDefinition  Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Border Grid.Row="1" Grid.Column="1" BorderBrush="Black" BorderThickness="1" Background="White" Padding="20">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" FontWeight="DemiBold">Working...</TextBlock>
-                            <Image gif:ImageBehavior.AnimatedSource="/Filtration;component/Resources/loading_spinner.gif" Height="32"  Margin="10,0,0,0"/>
-                        </StackPanel>
-                    </Border>
-                </Grid>
-            </Grid>
         </Grid>
     </DockPanel>
 </fluent:RibbonWindow>

Filtration/Views/MainWindow.xaml.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 using Filtration.ViewModels;
 
 namespace Filtration.Views
@@ -14,11 +10,8 @@ namespace Filtration.Views
 
     internal partial class MainWindow : IMainWindow
     {
-        private readonly IMainWindowViewModel _mainWindowViewModel;
-
         public MainWindow(IMainWindowViewModel mainWindowViewModel)
         {
-            _mainWindowViewModel = mainWindowViewModel;
             InitializeComponent();
             DataContext = mainWindowViewModel;
         }
@@ -38,38 +31,5 @@ namespace Filtration.Views
                 RibbonRoot.SelectedTabItem = ThemeToolsTabItem;
             }
         }
-
-        private void MainWindow_OnClosing(object sender, CancelEventArgs e)
-        {
-            var allDocumentsClosed = _mainWindowViewModel.CloseAllDocumentsAsync().Result;
-            if (!allDocumentsClosed)
-            {
-                e.Cancel = true;
-
-            }
-        }
-
-        private async void MainWindow_OnDrop(object sender, DragEventArgs e)
-        {
-            if (!e.Data.GetDataPresent(DataFormats.FileDrop)) return;
-
-            var filenames = (string[])e.Data.GetData(DataFormats.FileDrop);
-            var droppedFilterFiles = new List<string>();
-
-            foreach (var filename in filenames)
-            {
-                var extension = Path.GetExtension(filename);
-                if (extension != null &&
-                    (extension.ToUpperInvariant() == ".FILTER" || extension.ToUpperInvariant() == ".FILTERTHEME"))
-                {
-                    droppedFilterFiles.Add(filename);
-                }
-            }
-
-            if (droppedFilterFiles.Count > 0)
-            {
-                await _mainWindowViewModel.OpenDroppedFilesAsync(droppedFilterFiles);
-            }
-        }
     }
 }

Filtration/WindsorInstallers/ModelsInstaller.cs

@@ -0,0 +1,14 @@
+using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+
+namespace Filtration.WindsorInstallers
+{
+    public class ModelsInstaller : IWindsorInstaller
+    {
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+
+        }
+    }
+}

Filtration/WindsorInstallers/ServicesInstaller.cs

@@ -34,11 +34,6 @@ namespace Filtration.WindsorInstallers
                 Component.For<IUpdateCheckService>()
                     .ImplementedBy<UpdateCheckService>()
                     .LifeStyle.Singleton);
-
-            container.Register(
-                Component.For<IClipboardService>()
-                    .ImplementedBy<ClipboardService>()
-                    .LifeStyle.Singleton);
         }
     }
 }

Filtration/packages.config

@@ -11,6 +11,5 @@
   <package id="NLog" version="4.0.1" targetFramework="net451" />
   <package id="NLog.Config" version="4.0.1" targetFramework="net451" />
   <package id="NLog.Schema" version="4.0.1" targetFramework="net451" />
-  <package id="WpfAnimatedGif" version="1.4.13" targetFramework="net451" />
   <package id="WPFToolkit" version="3.5.50211.1" targetFramework="net451" />
 </packages>

README.md

@@ -2,10 +2,10 @@
 
 Filtration is an editor for Path of Exile item filter scripts.
 
-## Current Release (Released 2015-07-26)
-<b>Installer (6.37mb)</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.10/filtration_0.10_setup.exe">filtration_0.10_setup.exe</a>
+## Current Release (Released 2015-07-06)
+<b>Installer (6.31mb)</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.7/filtration_0.7_setup.exe">filtration_0.7_setup.exe</a>
 
-<b>Zip File (7.97mb)</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.10/filtration_0.10.zip">filtration_0.10.zip</a>
+<b>Zip File (7.91mb)</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.7/filtration_0.7.zip">filtration_0.7.zip</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.5.1 installed.