Merge from master (missed 1.0.3 merge)

* Bumped version to 1.1.0-beta8

Filtration.Common/Filtration.Common.csproj

@@ -66,6 +66,24 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\BooleanInverterConverter.cs" />
@@ -80,6 +98,8 @@
     <Compile Include="Services\FileSystemService.cs" />
     <Compile Include="Services\MessageBoxService.cs" />
     <Compile Include="Utilities\LineReader.cs" />
+    <Compile Include="Utilities\PathOfExileColors.cs" />
+    <Compile Include="Utilities\VisualTreeUtility.cs" />
     <Compile Include="ViewModels\PaneViewModel.cs" />
     <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
   </ItemGroup>

Filtration.Common/Utilities/PathOfExileColors.cs

@@ -2,9 +2,9 @@
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit;
 
-namespace Filtration.Views
+namespace Filtration.Common.Utilities
 {
-    internal static class PathOfExileColors
+    public static class PathOfExileColors
     {
         static PathOfExileColors()
         {

Filtration.Common/Utilities/VisualTreeUtility.cs

@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace Filtration.Utility
+namespace Filtration.Common.Utilities
 {
     public class VisualTreeUtility
     {

Filtration.Common/packages.config

@@ -3,5 +3,6 @@
   <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
   <package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />
   <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
+  <package id="Extended.Wpf.Toolkit" version="3.4.0" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
 </packages>

Filtration.Interface/IDocument.cs

@@ -8,7 +8,7 @@ namespace Filtration.Interface
     {
         bool IsScript { get; }
         bool IsTheme { get; }
-        Task Close();
+        Task<bool> Close();
         RelayCommand CloseCommand { get; }
     }
 }

Filtration.ObjectModel/BlockItemBaseTypes/NilBlockItem.cs

@@ -0,0 +1,16 @@
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class NilBlockItem : BlockItemBase
+    {
+        protected NilBlockItem()
+        {
+
+        }
+
+        public override string OutputText => PrefixText;
+        public override string SummaryText => DisplayHeading;
+        public override int MaximumAllowed => 1;
+
+        public abstract string Description { get; }
+    }
+}

Filtration.ObjectModel/BlockItemTypes/DisableDropSoundBlockItem.cs

@@ -4,18 +4,15 @@ using Filtration.ObjectModel.Enums;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
-    public sealed class DisableDropSoundBlockItem : BooleanBlockItem, IAudioVisualBlockItem
+    public sealed class DisableDropSoundBlockItem : NilBlockItem, IAudioVisualBlockItem
     {
-        public DisableDropSoundBlockItem()
+        public DisableDropSoundBlockItem() : base()
-        {
-        }
-
-        public DisableDropSoundBlockItem(bool booleanValue) : base(booleanValue)
         {
         }
 
         public override string PrefixText => "DisableDropSound";
         public override string DisplayHeading => "Disable Drop Sound";
+        public override string Description => "Default drop sound disabled.";
         public override Color SummaryBackgroundColor => Colors.Transparent;
         public override Color SummaryTextColor => Colors.Transparent;
         public override BlockItemOrdering SortOrder => BlockItemOrdering.DisableDropSound;

Filtration.ObjectModel/BlockItemTypes/QualityBlockItem.cs

@@ -23,6 +23,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override Color SummaryTextColor => Colors.White;
         public override BlockItemOrdering SortOrder => BlockItemOrdering.Quality;
         public override int Minimum => 0;
-        public override int Maximum => 30;
+        public override int Maximum => 99;
     }
 }

Filtration.ObjectModel/Commands/ItemFilterScript/AddBlockItemToBlocksCommand.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.ObjectModel;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class AddBlockItemToBlocksCommand : IUndoableCommand
+    {
+        private readonly List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> _input;
+
+        public AddBlockItemToBlocksCommand(List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> input)
+        {
+            _input = input;
+        }
+
+        public void Execute()
+        {
+            foreach (var v in _input)
+            {
+                var blockItems = v.Item1;
+                var item = v.Item2;
+
+                blockItems.Add(item);
+            }
+        }
+
+        public void Undo()
+        {
+            foreach (var v in _input)
+            {
+                var blockItems = v.Item1;
+                var item = v.Item2;
+                blockItems.Remove(item);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockItemFromBlocksCommand.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.ObjectModel;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class RemoveBlockItemFromBlocksCommand : IUndoableCommand
+    {
+        private readonly List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> _input;
+
+        public RemoveBlockItemFromBlocksCommand(List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> input)
+        {
+            _input = input;
+        }
+
+        public void Execute()
+        {
+            foreach (var pair in _input)
+            {
+                var blockItems = pair.Item1;
+                var blockItem = pair.Item2;
+
+                for (var i = 0; i < blockItems.Count; i++)
+                {
+                    if (blockItems[i] == blockItem)
+                    {
+                        blockItems.RemoveAt(i--);
+                    }
+                }
+            }
+        }
+
+        public void Undo()
+        {
+            foreach (var pair in _input)
+            {
+                var blockItems = pair.Item1;
+                var blockItem = pair.Item2;
+                blockItems.Add(blockItem);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Enums/ItemRarity.cs

@@ -4,8 +4,6 @@ namespace Filtration.ObjectModel.Enums
 {
     public enum ItemRarity
     {
-        [Description("Not Set")]
-        NotSet,
         [Description("Normal")]
         Normal,
         [Description("Magic")]

Filtration.ObjectModel/Extensions/ItemRarityExtensions.cs

@@ -16,23 +16,20 @@ namespace Filtration.ObjectModel.Extensions
                 }
                 case ItemRarity.Normal:
                 {
-                        return PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
+                    return PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
-                    }
+                }
                 case ItemRarity.Rare:
                 {
-                        return PathOfExileNamedColors.Colors[PathOfExileNamedColor.RareItem];
+                    return PathOfExileNamedColors.Colors[PathOfExileNamedColor.RareItem];
-                    }
+                }
                 case ItemRarity.Unique:
                 {
-                        return PathOfExileNamedColors.Colors[PathOfExileNamedColor.UniqueItem];
+                    return PathOfExileNamedColors.Colors[PathOfExileNamedColor.UniqueItem];
-                    }
-                case ItemRarity.NotSet:
-                {
-                    return PathOfExileNamedColors.Colors[PathOfExileNamedColor.QuestItem];
                 }
-
                 default:
+                {
                     throw new ArgumentOutOfRangeException(nameof(itemRarity), itemRarity, null);
+                }
             }
         }
     }

Filtration.ObjectModel/Filtration.ObjectModel.csproj

@@ -75,6 +75,7 @@
     <Compile Include="BlockItemBaseTypes\DualIntegerBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\EffectColorBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\IconBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\NilBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\StringBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\StrIntBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\IntegerBlockItem.cs" />
@@ -114,11 +115,13 @@
     <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
     <Compile Include="Commands\CommandManager.cs" />
     <Compile Include="Commands\ICommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\AddBlockItemToBlocksCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlocksToIndexCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlocksToBottomCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\AddCommentBlockCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlocksToTopCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\PasteBlocksCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveBlockItemFromBlocksCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\RemoveBlocksCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\SetScriptDescriptionCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\AddBlockCommand.cs" />

Filtration.ObjectModel/Item.cs

@@ -121,10 +121,8 @@ namespace Filtration.ObjectModel
                     return PathOfExileNamedColors.Colors[PathOfExileNamedColor.QuestItem];
                 }
 
-                return ItemRarity != ItemRarity.NotSet ? ItemRarity.DefaultRarityTextColor() : PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
+                return ItemRarity.DefaultRarityTextColor();
             }
         }
-
-    
     }
 }

Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs

@@ -919,7 +919,7 @@ namespace Filtration.Parser.Tests.Services
         {
             // Arrange
             var inputString = "Show" + Environment.NewLine +
-                              "    DisableDropSound True";
+                              "    DisableDropSound # Test";
 
             // Act
             var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
@@ -928,7 +928,22 @@ namespace Filtration.Parser.Tests.Services
 
             Assert.AreEqual(1, result.BlockItems.Count(b => b is DisableDropSoundBlockItem));
             var blockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
-            Assert.IsTrue(blockItem.BooleanValue);
+            Assert.AreEqual(blockItem.Comment, " Test");
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_DisableDropSound_IncorrectBooleanValue_ReturnsCorrectObject()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              "    DisableDropSound True";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is DisableDropSoundBlockItem));
         }
 
         [Test]
@@ -965,7 +980,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetBorderColor 0 0 0" + Environment.NewLine +
                               "    SetFontSize 50" + Environment.NewLine +
                               "    PlayAlertSound 3" + Environment.NewLine +
-                              "    DisableDropSound False" + Environment.NewLine +
+                              "    DisableDropSound # False" + Environment.NewLine +
                               "    CustomAlertSound \"test.mp3\" # customSoundTheme" + Environment.NewLine +
                               "    MinimapIcon 2 Green Triangle  # iconTheme" + Environment.NewLine +
                               "    PlayEffect Green Temp  # effectTheme" + Environment.NewLine;
@@ -1075,7 +1090,7 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(0, result.BlockItems.OfType<SoundBlockItem>().Count());
 
             var disableDropSoundBlockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
-            Assert.IsFalse(disableDropSoundBlockItem.BooleanValue);
+            Assert.AreEqual(disableDropSoundBlockItem.Comment, " False");
 
             var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
             Assert.AreEqual("test.mp3", customSoundBlockItem.Value);
@@ -2065,7 +2080,7 @@ namespace Filtration.Parser.Tests.Services
                                  "    SetBorderColor 255 1 254" + Environment.NewLine +
                                  "    SetFontSize 50" + Environment.NewLine +
                                  "    PlayAlertSound 6 90" + Environment.NewLine +
-                                 "    DisableDropSound True" + Environment.NewLine +
+                                 "    DisableDropSound" + Environment.NewLine +
                                  "    MinimapIcon 1 Blue Circle" + Environment.NewLine +
                                  "    PlayEffect Red Temp" + Environment.NewLine +
                                  "    CustomAlertSound \"test.mp3\"";
@@ -2120,7 +2135,7 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new MapTierBlockItem(FilterPredicateOperator.LessThan, 10));
             _testUtility.TestBlock.BlockItems.Add(new MapIconBlockItem(IconSize.Medium, IconColor.Blue, IconShape.Circle));
             _testUtility.TestBlock.BlockItems.Add(new PlayEffectBlockItem(EffectColor.Red, true));
-            _testUtility.TestBlock.BlockItems.Add(new DisableDropSoundBlockItem(true));
+            _testUtility.TestBlock.BlockItems.Add(new DisableDropSoundBlockItem());
 
             // Act
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);

Filtration.Parser/Services/ItemFilterBlockTranslator.cs

@@ -327,7 +327,7 @@ namespace Filtration.Parser.Services
                         // Only ever use the last DisableDropSound item encountered as multiples aren't valid.
                         RemoveExistingBlockItemsOfType<DisableDropSoundBlockItem>(block);
 
-                        AddBooleanItemToBlockItems<DisableDropSoundBlockItem>(block, trimmedLine);
+                        AddNilItemToBlockItems<DisableDropSoundBlockItem>(block, trimmedLine);
                         break;
                     }
                     case "MinimapIcon":
@@ -349,12 +349,6 @@ namespace Filtration.Parser.Services
                                 Shape = EnumHelper.GetEnumValueFromDescription<IconShape>(match.Groups[3].Value)
                             };
 
-                            var themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Icon, match.Groups[5].Value.Trim(),
-                                blockItemValue.Size, blockItemValue.Color, blockItemValue.Shape);
-                            if(match.Groups[4].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[5].Value))
-                            {
-                                blockItemValue.ThemeComponent = themeComponent;
-                            }
                             block.BlockItems.Add(blockItemValue);
                             themeComponentType = (int)ThemeComponentType.Icon;
                         }
@@ -512,6 +506,13 @@ namespace Filtration.Parser.Services
             }
         }
 
+        private static void AddNilItemToBlockItems<T>(IItemFilterBlock block, string inputString) where T : NilBlockItem
+        {
+            var blockItem = Activator.CreateInstance<T>();
+            blockItem.Comment = GetTextAfterFirstComment(inputString);
+            block.BlockItems.Add(blockItem);
+        }
+
         private static void AddNumericFilterPredicateItemToBlockItems<T>(IItemFilterBlock block, string inputString) where T : NumericFilterPredicateBlockItem
         {
             var blockItem = Activator.CreateInstance<T>();
@@ -566,12 +567,17 @@ namespace Filtration.Parser.Services
                 var trimmedLine = line.Trim();
                 if (trimmedLine.IndexOf('#') > 0)
                 {
-                    blockComment = trimmedLine.Substring(trimmedLine.IndexOf('#') + 1);
+                    blockComment = trimmedLine.Substring(trimmedLine.IndexOf('#') + 1).Trim();
                     trimmedLine = trimmedLine.Substring(0, trimmedLine.IndexOf('#')).Trim();
                 }
 
                 switch (matches.Value)
                 {
+                    case "DisableDropSound":
+                    {
+                        blockItems.Add(new DisableDropSoundBlockItem());
+                        break;
+                    }
                     case "PlayAlertSound":
                     {
                         var match = Regex.Match(trimmedLine, @"\s+(\S+) (\d+)");
@@ -586,6 +592,20 @@ namespace Filtration.Parser.Services
                         blockItems.Add(blockItem);
                         break;
                     }
+                    case "PlayAlertSoundPositional":
+                    {
+                        var match = Regex.Match(trimmedLine, @"\s+(\S+) (\d+)");
+                        if (!match.Success) break;
+                        var blockItem = new PositionalSoundBlockItem(match.Groups[1].Value, Convert.ToInt16(match.Groups[2].Value));
+                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
+                        {
+                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound,
+                                blockComment, blockItem.Value, blockItem.SecondValue);
+                                blockItem.ThemeComponent = themeComponent;
+                        }
+                        blockItems.Add(blockItem);
+                        break;
+                    }
                     case "SetTextColor":
                     {
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
@@ -642,6 +662,56 @@ namespace Filtration.Parser.Services
                         blockItems.Add(blockItem);
                         break;
                     }
+                    case "MinimapIcon":
+                    {
+                        // TODO: Get size, color, shape values programmatically
+                        var match = Regex.Match(trimmedLine,
+                            @"\S+\s+(0|1|2)\s+(Red|Green|Blue|Brown|White|Yellow)\s+(Circle|Diamond|Hexagon|Square|Star|Triangle)\s*([#]?)(.*)",
+                            RegexOptions.IgnoreCase);
+
+                        if (match.Success)
+                        {
+                            var blockItemValue = new MapIconBlockItem
+                            {
+                                Size = (IconSize)short.Parse(match.Groups[1].Value),
+                                Color = EnumHelper.GetEnumValueFromDescription<IconColor>(match.Groups[2].Value),
+                                Shape = EnumHelper.GetEnumValueFromDescription<IconShape>(match.Groups[3].Value)
+                            };
+                            
+                            blockItems.Add(blockItemValue);
+                        }
+                        break;
+                    }
+                    case "PlayEffect":
+                    {
+                        // TODO: Get colors programmatically
+                        var match = Regex.Match(trimmedLine, @"\S+\s+(Red|Green|Blue|Brown|White|Yellow)\s*(Temp)?", RegexOptions.IgnoreCase);
+
+                        if (match.Success)
+                        {
+                            var blockItemValue = new PlayEffectBlockItem
+                            {
+                                Color = EnumHelper.GetEnumValueFromDescription<EffectColor>(match.Groups[1].Value),
+                                Temporary = match.Groups[2].Value.Trim().ToLower() == "temp"
+                            };
+                            blockItems.Add(blockItemValue);
+                        }
+                        break;
+                    }
+                    case "CustomAlertSound":
+                    {
+                        var match = Regex.Match(trimmedLine, @"\S+\s+""([^\*\<\>\?|]+)""");
+
+                        if (match.Success)
+                        {
+                            var blockItemValue = new CustomSoundBlockItem
+                            {
+                                Value = match.Groups[1].Value
+                            };
+                            blockItems.Add(blockItemValue);
+                        }
+                        break;
+                    }
                 }
             }
         }

Filtration.Tests/Filtration.Tests.csproj

@@ -40,7 +40,12 @@
     <Reference Include="FluentAssertions, Version=5.5.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.5.5.3\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null" />
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
     </Reference>

Filtration.Tests/Services/TestItemFilterScriptDirectoryService.cs

@@ -1,9 +1,4 @@
-using System;
+using Filtration.Common.Services;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Filtration.Common.Services;
 using Filtration.Services;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using Moq;

Filtration.Tests/packages.config

@@ -7,4 +7,6 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+  <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net461" />
+  <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net461" />
 </packages>

Filtration.ThemeEditor/Filtration.ThemeEditor.csproj

@@ -158,6 +158,9 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </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.

Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs

@@ -186,10 +186,11 @@ namespace Filtration.ThemeEditor.ViewModels
         }
 
 #pragma warning disable 1998
-        public async Task Close()
+        public async Task<bool> Close()
 #pragma warning restore 1998
         {
            Messenger.Default.Send(new ThemeClosedMessage {ClosedViewModel = this});
+            return true;
         }
         
         private void OnAddThemeComponentCommand(ThemeComponentType themeComponentType)

Filtration.ThemeEditor/Views/ThemeComponentControl.xaml

@@ -9,6 +9,7 @@
              xmlns:views="clr-namespace:Filtration.ThemeEditor.Views"
              xmlns:extensions="clr-namespace:Filtration.Common.Extensions;assembly=Filtration.Common"
              xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
+             xmlns:utilities="clr-namespace:Filtration.Common.Utilities;assembly=Filtration.Common"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=themeEditor:ThemeComponent}"
              d:DesignHeight="100" d:DesignWidth="200">
@@ -63,8 +64,8 @@
         <ContentControl Grid.Row="2" Content="{Binding Mode=OneWay}">
             <ContentControl.Resources>
                 <!-- Color Theme Template -->
-                <DataTemplate  DataType="{x:Type themeEditor:ColorThemeComponent}">
+                <DataTemplate DataType="{x:Type themeEditor:ColorThemeComponent}">
-                    <xctk:ColorPicker SelectedColor="{Binding Color}" />
+                    <xctk:ColorPicker SelectedColor="{Binding Color}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" MouseDown="ColorPicker_OnMouseDown" />
                 </DataTemplate>
 
                 <!-- Integer Theme Template -->

Filtration.ThemeEditor/Views/ThemeComponentControl.xaml.cs

@@ -1,4 +1,6 @@
-namespace Filtration.ThemeEditor.Views
+using System.Windows.Input;
+
+namespace Filtration.ThemeEditor.Views
 {
     public partial class ThemeComponentControl
     {
@@ -6,5 +8,13 @@
         {
             InitializeComponent();
         }
+
+        private void ColorPicker_OnMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            // For some reason if we don't mark OnMouseDown events as handled for this control
+            // it ignores them and they end up getting picked up by the parent ListBoxItem instead,
+            // resulting in the Advanced tab not being clickable.
+            e.Handled = true;
+        }
     }
 }

Filtration.ThemeEditor/Views/ThemeEditorView.xaml

@@ -29,50 +29,48 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid Margin="10">
-        <ScrollViewer HorizontalScrollBarVisibility="Disabled">
+        <ListView ItemsSource="{Binding Source={StaticResource ComponentsViewSource}}"
-            <ListView ItemsSource="{Binding Source={StaticResource ComponentsViewSource}}"
                       SelectedItem="{Binding SelectedThemeComponent}"
                       Margin="5"
                       ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                <ListView.Resources>
+            <ListView.Resources>
-                    <Style TargetType="ListViewItem">
+                <Style TargetType="ListViewItem">
-                        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                        <Setter Property="Template">
+                    <Setter Property="Template">
-                            <Setter.Value>
+                        <Setter.Value>
-                                <ControlTemplate TargetType="ListViewItem">
+                            <ControlTemplate TargetType="ListViewItem">
-                                    <Border Name="Border" BorderBrush="Black" Background="White"  BorderThickness="1" CornerRadius="3" Margin="2" SnapsToDevicePixels="true">
+                                <Border Name="Border" BorderBrush="Black" Background="White"  BorderThickness="1" CornerRadius="3" Margin="2" SnapsToDevicePixels="true">
-                                        <ContentPresenter />
+                                    <ContentPresenter />
-                                    </Border>
+                                </Border>
-                                    <ControlTemplate.Triggers>
+                                <ControlTemplate.Triggers>
-                                        <Trigger Property="IsSelected" Value="true">
+                                    <Trigger Property="IsSelected" Value="true">
-                                            <Setter TargetName="Border" Property="Background" Value="#A9BDD8"/>
+                                        <Setter TargetName="Border" Property="Background" Value="#A9BDD8"/>
-                                        </Trigger>
+                                    </Trigger>
-                                    </ControlTemplate.Triggers>
+                                </ControlTemplate.Triggers>
-                                </ControlTemplate>
+                            </ControlTemplate>
-                            </Setter.Value>
+                        </Setter.Value>
-                        </Setter>
+                    </Setter>
-                    </Style>
+                </Style>
-                </ListView.Resources>
+            </ListView.Resources>
-                <ListView.ItemsPanel>
+            <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
+                <ItemsPanelTemplate>
-                        <WrapPanel />
+                    <WrapPanel />
-                    </ItemsPanelTemplate>
+                </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
+            </ListView.ItemsPanel>
-                <ListView.GroupStyle>
+            <ListView.GroupStyle>
-                    <GroupStyle>
+                <GroupStyle>
-                        <GroupStyle.HeaderTemplate>
+                    <GroupStyle.HeaderTemplate>
-                            <DataTemplate>
+                        <DataTemplate>
-                                <TextBlock Margin="7,5,0,0" FontWeight="Bold" FontSize="15" Text="{Binding Path=Name, Converter={StaticResource ThemeComponentTypeToStringConverter}}"/>
+                            <TextBlock Margin="7,5,0,0" FontWeight="Bold" FontSize="15" Text="{Binding Path=Name, Converter={StaticResource ThemeComponentTypeToStringConverter}}"/>
-                            </DataTemplate>
+                        </DataTemplate>
-                        </GroupStyle.HeaderTemplate>
+                    </GroupStyle.HeaderTemplate>
-                    </GroupStyle>
+                </GroupStyle>
-                </ListView.GroupStyle>
+            </ListView.GroupStyle>
-                <ListView.ItemTemplate>
+            <ListView.ItemTemplate>
-                    <DataTemplate>
+                <DataTemplate>
-                        <views:ThemeComponentControl DataContext="{Binding}" Margin="10,5,10,5" />
+                    <views:ThemeComponentControl DataContext="{Binding}" Margin="10,5,10,5" />
-                    </DataTemplate>
+                </DataTemplate>
-                </ListView.ItemTemplate>
+            </ListView.ItemTemplate>
-            </ListView>
+        </ListView>
-        </ScrollViewer>
     </Grid>
 </UserControl>

Filtration.sln

@@ -92,7 +92,6 @@ Global
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x86.ActiveCfg = Release|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x86.Build.0 = Release|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
@@ -140,7 +139,6 @@ Global
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x86.ActiveCfg = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x86.Build.0 = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
@@ -188,7 +186,6 @@ Global
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x86.ActiveCfg = Release|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x86.Build.0 = Release|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
@@ -260,7 +257,6 @@ Global
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x86.ActiveCfg = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x86.Build.0 = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
@@ -308,7 +304,6 @@ Global
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x86.ActiveCfg = Release|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x86.Build.0 = Release|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
@@ -380,7 +375,6 @@ Global
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x86.Build.0 = Release|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
@@ -428,7 +422,6 @@ Global
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.Release|x86.ActiveCfg = Release|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.Release|x86.Build.0 = Release|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU

Filtration/App.config

@@ -4,11 +4,8 @@
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="Filtration.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Filtration.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
     </configSections>
-    <startup> 
+    <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
     <userSettings>
@@ -19,18 +16,6 @@
             <setting name="ExtraLineBetweenBlocks" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="SuppressUpdatesUpToVersionMajorPart" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="SuppressUpdates" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="SuppressUpdatesUpToVersionMinorPart" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="StaticDataLastUpdated" serializeAs="String">
-                <value>2016-01-01</value>
-            </setting>
             <setting name="DownloadPrereleaseUpdates" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -79,17 +64,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <applicationSettings>
-    <Filtration.Properties.Settings>
-      <setting name="ItemBaseTypesStaticDataUrl" serializeAs="String">
-        <value>http://ben-wallis.github.io/Filtration/ItemBaseTypes.txt</value>
-      </setting>
-      <setting name="ItemClassesStaticDataUrl" serializeAs="String">
-        <value>http://ben-wallis.github.io/Filtration/ItemClasses.txt</value>
-      </setting>
-      <setting name="UpdateDataUrl" serializeAs="String">
-        <value>http://ben-wallis.github.io/Filtration/filtration_version.xml</value>
-      </setting>
-    </Filtration.Properties.Settings>
-  </applicationSettings>
 </configuration>

Filtration/Converters/DisabledDefaultSoundConverter.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media.Imaging;
+
+namespace Filtration.Converters
+{
+    public class DisabledDefaultSoundConverter : IValueConverter
+    {
+        private static readonly BitmapImage _soundIcon;
+        private static readonly BitmapImage _soundDDSIcon;
+
+        static DisabledDefaultSoundConverter()
+        {
+            var soundUri = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/sound.png", UriKind.Absolute);
+            var soundDDSUri = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/sound_dds.png", UriKind.Absolute);
+            _soundIcon = new BitmapImage(soundUri);
+            _soundDDSIcon = new BitmapImage(soundDDSUri);
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (bool)value ? _soundDDSIcon : _soundIcon;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ReferenceEquals(value, _soundDDSIcon);
+        }
+    }
+}

Filtration/Converters/DisabledDefaultSoundTooltipConverter.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Filtration.Converters
+{
+    class DisabledDefaultSoundTooltipConverter : IMultiValueConverter
+    {
+        private static readonly string appendage = "\nNote: the default drop sound is disabled for this block.";
+
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values[0] == DependencyProperty.UnsetValue ||
+                values[1] == DependencyProperty.UnsetValue)
+            {
+                return string.Empty;
+            }
+
+            var baseText = (string)(values[0]);
+            var hasDisabledDefaultSound = (bool)(values[1]);
+
+            if (hasDisabledDefaultSound)
+            {
+                return $"{baseText}{appendage}";
+            }
+            else
+            {
+                return baseText;
+            }
+        }
+
+        public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Filtration/Filtration.csproj

@@ -210,6 +210,8 @@
     <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
     <Compile Include="Converters\BlockItemToRemoveEnabledVisibilityConverter.cs" />
+    <Compile Include="Converters\DisabledDefaultSoundConverter.cs" />
+    <Compile Include="Converters\DisabledDefaultSoundTooltipConverter.cs" />
     <Compile Include="Converters\MinimapIconToCroppedBitmapConverter.cs" />
     <Compile Include="Converters\HashSignRemovalConverter.cs" />
     <Compile Include="Converters\ItemRarityConverter.cs" />
@@ -247,8 +249,8 @@
     <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
       <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Utility\VisualTreeUtility.cs" />
     <Compile Include="ViewModels\DesignTime\DesignTimeItemFilterBlockViewModel.cs" />
+    <Compile Include="Utility\SplatNLogAdapter.cs" />
     <Compile Include="ViewModels\DesignTime\DesignTimeSettingsPageViewModel.cs" />
     <Compile Include="Views\AttachedProperties\SelectedItemsAttachedProperty.cs" />
     <Compile Include="Utility\RoutedCommandHandler.cs" />
@@ -279,7 +281,6 @@
     </Compile>
     <Compile Include="Views\Behaviors\BindableSelectedItemBehavior.cs" />
     <Compile Include="Views\BindingProxy.cs" />
-    <Compile Include="Views\PathOfExileColors.cs" />
     <Compile Include="Views\SettingsPageView.xaml.cs">
       <DependentUpon>SettingsPageView.xaml</DependentUpon>
     </Compile>
@@ -462,6 +463,10 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Resource Include="Resources\Icons\no_sound_dds_light.png" />
+    <Resource Include="Resources\Icons\no_sound_dds.png" />
+    <Resource Include="Resources\Icons\speaker_icon.png" />
+    <Resource Include="Resources\Icons\sound_dds.png" />
     <EmbeddedResource Include="Resources\Prophecies.txt" />
     <EmbeddedResource Include="Resources\ItemMods.txt" />
     <Resource Include="Resources\loading_spinner.gif" />
@@ -506,7 +511,7 @@
     <Resource Include="Resources\Icons\open_icon.png" />
     <Resource Include="Resources\Icons\arrow_down_large_icon.png" />
     <Resource Include="Resources\Icons\arrow_up_large_icon.png" />
-    <Resource Include="Resources\Icons\speaker_icon.png" />
+    <Resource Include="Resources\Icons\sound.png" />
     <Resource Include="Resources\Icons\play_icon.png" />
     <Resource Include="Resources\Icons\arrow_top_icon.png" />
     <Resource Include="Resources\Icons\arrow_bottom_icon.png" />

Filtration/Filtration.nuspec

@@ -10,11 +10,17 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
     <releaseNotes>* Added support for new Prophecies block item type
+* Added Betrayal League Item Base Types and Item Classes to static data
 * All open filter scripts are now remembered on exit and reopened when the application is started rather than just the last opened one (#95)
 * Filter sections are once again now expanded by default when scripts are opened, unless the new "Auto-expand all sections when opening scripts" setting is disabled
 * A new Clear Styles button has been added which removes all styles from the selected block (#96)
+* New buttons for adding/removing DisableDropSound from selected blocks have been added (#110)
+* Added a new indicator for blocks with a DisableDropSound block present (#113)
 * The Enable/Disable Block toggle button is now visible on both the Regular Block Items and Appearance Block Items views
 * When there are too many block items to fit horizontally in a block a horizontal scrollbar will now appear
+* Fixed an issue with MinimapIcon block items causing an "Unused Theme Components" message box to erroneously be shown when saving (#116)
+* Fixed the Advanced tab in the Color Picker in the Theme Editor not being clickable (#115)
+* Fixed the previously incorrect handling of DisableDropSound as a true/false value when in fact it is enabled/disabled purely by its presence or lack thereof in a block (#111)
 * Fixed the application freezing for a long period of time when Ctrl+A (Select All) is performed
 * Fixed the Switch to Appearance/Regular Block Items text overlapping block items
 * Fixed theme saving (blank theme files were being saved) (#83)
@@ -25,6 +31,7 @@
     <dependencies />
   </metadata>
   <files>
-    <file src="*.*" target="lib\net45\" exclude="*.pdb;*.nupkg;*.vshost.*;*.xml"/>
+    <file src="*.*" target="lib\net45\" exclude="*.pdb;*.nupkg;*.vshost.*;*.xml;*.log"/>
+    <file src="Resources\AlertSounds\*.mp3" target="lib\net45\Resources\AlertSounds\" />
   </files>
 </package>

Filtration/NLog.config

@@ -10,15 +10,21 @@
             layout="${longdate} ${uppercase:${level}} ${message}" />
     <target xsi:type="File" name="fDebug" fileName="${basedir}/Filtration_debug_${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
+    <target xsi:type="File" name="fUpdater" fileName="${basedir}/Filtration_updater_${shortdate}.log"
+            layout="${longdate} ${uppercase:${level}} ${message}" />
     <target xsi:type="Debugger" name="cDebug" layout="${longdate} ${uppercase:${level}} ${message}"/>
   </targets>
 
   <rules>
 
+    <!-- Squirrel Updater Log-->
+    <logger name="SquirrelLogger" minlevel="Trace" writeTo="fUpdater" />
+
     <!-- Uncomment the Debug line to enable Debug logging -->
     <!--<logger name="*" minlevel="Debug" writeTo="fDebug" final="true" />-->
     <logger name="*" minlevel="Error" writeTo="fErrors" />
     <logger name="*" minlevel="Trace" writeTo="cDebug" />
+
     
   </rules>
 </nlog>

Filtration/Properties/AssemblyInfo.cs

@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyInformationalVersion("1.1.0-beta4")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

Filtration/Properties/Settings.Designer.cs

@@ -47,81 +47,6 @@ namespace Filtration.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int SuppressUpdatesUpToVersionMajorPart {
-            get {
-                return ((int)(this["SuppressUpdatesUpToVersionMajorPart"]));
-            }
-            set {
-                this["SuppressUpdatesUpToVersionMajorPart"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool SuppressUpdates {
-            get {
-                return ((bool)(this["SuppressUpdates"]));
-            }
-            set {
-                this["SuppressUpdates"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int SuppressUpdatesUpToVersionMinorPart {
-            get {
-                return ((int)(this["SuppressUpdatesUpToVersionMinorPart"]));
-            }
-            set {
-                this["SuppressUpdatesUpToVersionMinorPart"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("2016-01-01")]
-        public global::System.DateTime StaticDataLastUpdated {
-            get {
-                return ((global::System.DateTime)(this["StaticDataLastUpdated"]));
-            }
-            set {
-                this["StaticDataLastUpdated"] = value;
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/ItemBaseTypes.txt")]
-        public string ItemBaseTypesStaticDataUrl {
-            get {
-                return ((string)(this["ItemBaseTypesStaticDataUrl"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/ItemClasses.txt")]
-        public string ItemClassesStaticDataUrl {
-            get {
-                return ((string)(this["ItemClassesStaticDataUrl"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/filtration_version.xml")]
-        public string UpdateDataUrl {
-            get {
-                return ((string)(this["UpdateDataUrl"]));
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]

Filtration/Properties/Settings.settings

@@ -8,27 +8,6 @@
     <Setting Name="ExtraLineBetweenBlocks" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="SuppressUpdatesUpToVersionMajorPart" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="SuppressUpdates" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="SuppressUpdatesUpToVersionMinorPart" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="StaticDataLastUpdated" Type="System.DateTime" Scope="User">
-      <Value Profile="(Default)">2016-01-01</Value>
-    </Setting>
-    <Setting Name="ItemBaseTypesStaticDataUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://ben-wallis.github.io/Filtration/ItemBaseTypes.txt</Value>
-    </Setting>
-    <Setting Name="ItemClassesStaticDataUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://ben-wallis.github.io/Filtration/ItemClasses.txt</Value>
-    </Setting>
-    <Setting Name="UpdateDataUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://ben-wallis.github.io/Filtration/filtration_version.xml</Value>
-    </Setting>
     <Setting Name="DownloadPrereleaseUpdates" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>

Filtration/Services/ItemFilterPersistenceService.cs

@@ -25,6 +25,8 @@ namespace Filtration.Services
         {
             _fileSystemService = fileSystemService;
             _itemFilterScriptTranslator = itemFilterScriptTranslator;
+
+           ItemFilterScriptDirectory = Settings.Default.DefaultFilterDirectory;
         }
 
         public string ItemFilterScriptDirectory { get; private set; }
@@ -47,6 +49,7 @@ namespace Filtration.Services
 
             ItemFilterScriptDirectory = path;
             Settings.Default.DefaultFilterDirectory = path;
+            Settings.Default.Save();
         }
 
         public async Task<IItemFilterScript> LoadItemFilterScriptAsync(string filePath)
@@ -62,7 +65,7 @@ namespace Filtration.Services
             {
                 loadedScript.FilePath = filePath;
             }
-        
+
             return loadedScript;
         }
 

Filtration/Services/UpdateService.cs

@@ -1,9 +1,12 @@
 using System;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Filtration.Enums;
 using Filtration.Properties;
+using Filtration.Utility;
 using NLog;
 using Squirrel;
 
@@ -76,11 +79,14 @@ namespace Filtration.Services
         private bool _downloadPrereleaseUpdates;
         private UpdateStatus _updateStatus;
 
-        public UpdateService(ISettingsService settingsService)
+        public UpdateService(ISettingsService settingsService,
+                             ISplatNLogAdapter splatNLogAdapter)
         {
             _settingsService = settingsService;
 
             UpdateStatus = UpdateStatus.NoUpdateAvailable;
+
+            Splat.Locator.CurrentMutable.Register(() => splatNLogAdapter, typeof(Splat.ILogger));
         }
 
         public event EventHandler<UpdateStatusChangedEventArgs> UpdateStatusChanged;
@@ -117,6 +123,17 @@ namespace Filtration.Services
                 _downloadPrereleaseUpdates = true;
 #endif
 
+                var expectedInstallationPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Filtration");
+                var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
+
+                var runningInstalled = baseDirectory.StartsWith(expectedInstallationPath);
+
+                if (!runningInstalled)
+                {
+                    Logger.Debug($"Skipping update check since base directory of {baseDirectory} does not start with the expected installation path of {expectedInstallationPath}");
+                    return;
+                }
+
                 async Task CheckForUpdatesAsync(IUpdateManager updateManager)
                 {
                     _updates = await updateManager.CheckForUpdate(progress: progress => UpdateProgressChanged?.Invoke(this, new UpdateProgressChangedEventArgs(progress)));

Filtration/UserControls/BlockItemControl.xaml

@@ -11,6 +11,7 @@
              xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:views="clr-namespace:Filtration.Views"
+             xmlns:utilities="clr-namespace:Filtration.Common.Utilities;assembly=Filtration.Common"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=userControls:BlockItemControl}"
              d:DesignHeight="200" d:DesignWidth="190">
@@ -117,7 +118,7 @@
                     <!-- Color Template -->
                     <DataTemplate DataType="{x:Type blockItemBaseTypes:ColorBlockItem}">
                         <StackPanel>
-                            <xctk:ColorPicker  SelectedColor="{Binding Color}" AvailableColors="{Binding ElementName=BlockItemContentControl, Path=DataContext.AvailableColors }" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors"/>
+                            <xctk:ColorPicker SelectedColor="{Binding Color}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors"/>
                             <userControls:ThemeComponentSelectionControl ThemeComponent="{Binding ThemeComponent}"
 
                                                                          Margin="0,2,0,2">
@@ -246,6 +247,13 @@
                             </userControls:ThemeComponentSelectionControl>
                         </Grid>
                     </DataTemplate>
+
+                    <!-- Disable Drop Sound Template -->
+                    <DataTemplate DataType="{x:Type blockItemBaseTypes:NilBlockItem}">
+                        <Grid>
+                            <TextBlock Text="{Binding Description}" VerticalAlignment="Center" />
+                        </Grid>
+                    </DataTemplate>
                 </ContentControl.Resources>
             </ContentControl>
         </Grid>

Filtration/UserControls/BlockItemControl.xaml.cs

@@ -1,16 +1,13 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using Filtration.Annotations;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.Enums;
-using Filtration.ObjectModel.ThemeEditor;
+using Filtration.ObjectModel.ThemeEditor;
-using Filtration.Views;
 using GalaSoft.MvvmLight.CommandWpf;
-using Xceed.Wpf.Toolkit;
 
 namespace Filtration.UserControls
 {
@@ -81,9 +78,6 @@ namespace Filtration.UserControls
             }
         }
 
-
-        public ObservableCollection<ColorItem> AvailableColors => PathOfExileColors.DefaultColors;
-
         public List<string> SoundsAvailable => new List<string> {
             "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16",
             "ShGeneral", "ShBlessed", "ShChaos", "ShDivine", "ShExalted", "ShMirror", "ShAlchemy",

Filtration/Utility/SplatNLogAdapter.cs

@@ -0,0 +1,52 @@
+using System;
+using NLog;
+using ILogger = Splat.ILogger;
+using LogLevel = Splat.LogLevel;
+
+namespace Filtration.Utility
+{
+    public interface ISplatNLogAdapter
+    {
+    }
+
+    public class SplatNLogAdapter : ILogger, ISplatNLogAdapter
+    {
+        private static readonly Logger Logger = LogManager.GetLogger("SquirrelLogger");
+
+        public void Write(string message, LogLevel logLevel)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.Debug:
+                {
+                    Logger.Debug(message);
+                    break;
+                }
+                case LogLevel.Info:
+                {
+                    Logger.Info(message);
+                    break;
+                }
+                case LogLevel.Error:
+                {
+                    Logger.Error(message);
+                    break;
+                }
+                case LogLevel.Fatal:
+                {
+                    Logger.Fatal(message);
+                    break;
+                }
+                case LogLevel.Warn:
+                {
+                    Logger.Warn(message);
+                    break;
+                }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
+            }
+        }
+
+        public LogLevel Level { get; set; }
+    }
+}

Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs

@@ -139,7 +139,6 @@ namespace Filtration.ViewModels.DesignTime
                                                          typeof (HasExplicitModBlockItem)
                                                      };
         public List<Type> AudioVisualBlockItemTypesAvailable { get; }
-        public ObservableCollection<ColorItem> AvailableColors { get; }
         public Color DisplayTextColor => Colors.Red;
         public Color DisplayBackgroundColor => Colors.White;
         public Color DisplayBorderColor => Colors.GreenYellow;
@@ -151,6 +150,7 @@ namespace Filtration.ViewModels.DesignTime
         public bool HasSound { get; }
         public bool HasPositionalSound { get; }
         public bool HasCustomSound { get; }
+        public bool HasDisabledDefaultSound { get; }
         public bool HasAudioVisualBlockItems { get; }
         public void RefreshBlockPreview()
         {

Filtration/ViewModels/DesignTime/DesignTimeUpdateViewModel.cs

@@ -39,7 +39,7 @@ namespace Filtration.ViewModels.DesignTime
 
         public bool IsScript { get; }
         public bool IsTheme { get; }
-        public Task Close()
+        public Task<bool> Close()
         {
             throw new System.NotImplementedException();
         }

Filtration/ViewModels/ItemFilterBlockViewModel.cs

@@ -54,7 +54,6 @@ namespace Filtration.ViewModels
         IEnumerable<string> AutocompleteItemMods { get; }
         List<Type> BlockItemTypesAvailable { get; }
         List<Type> AudioVisualBlockItemTypesAvailable { get; }
-        ObservableCollection<ColorItem> AvailableColors { get; }
         Color DisplayTextColor { get; }
         Color DisplayBackgroundColor { get; }
         Color DisplayBorderColor { get; }
@@ -66,6 +65,7 @@ namespace Filtration.ViewModels
         bool HasSound { get; }
         bool HasPositionalSound { get; }
         bool HasCustomSound { get; }
+        bool HasDisabledDefaultSound { get; }
         bool HasAudioVisualBlockItems { get; }
         void RefreshBlockPreview();
     }
@@ -276,8 +276,6 @@ namespace Filtration.ViewModels
             }
         }
 
-        public ObservableCollection<ColorItem> AvailableColors => PathOfExileColors.DefaultColors;
-
         public Color DisplayTextColor => Block.DisplayTextColor;
         public Color DisplayBackgroundColor => Block.DisplayBackgroundColor;
         public Color DisplayBorderColor => Block.DisplayBorderColor;
@@ -290,6 +288,7 @@ namespace Filtration.ViewModels
         public bool HasSound => Block.HasBlockItemOfType<SoundBlockItem>();
         public bool HasPositionalSound => Block.HasBlockItemOfType<PositionalSoundBlockItem>();
         public bool HasCustomSound => Block.HasBlockItemOfType<CustomSoundBlockItem>();
+        public bool HasDisabledDefaultSound => Block.HasBlockItemOfType<DisableDropSoundBlockItem>();
 
         public bool HasAudioVisualBlockItems => AudioVisualBlockItems.Any();
 
@@ -529,6 +528,7 @@ namespace Filtration.ViewModels
             RaisePropertyChanged(nameof(HasSound));
             RaisePropertyChanged(nameof(HasPositionalSound));
             RaisePropertyChanged(nameof(HasCustomSound));
+            RaisePropertyChanged(nameof(HasDisabledDefaultSound));
         }
 
         private void OnBlockItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -537,6 +537,7 @@ namespace Filtration.ViewModels
             RaisePropertyChanged(nameof(SummaryBlockItems));
             RaisePropertyChanged(nameof(AudioVisualBlockItems));
             RaisePropertyChanged(nameof(HasAudioVisualBlockItems));
+            RaisePropertyChanged(nameof(HasDisabledDefaultSound));
         }
 
         private void OnCustomSoundFileDialog()

Filtration/ViewModels/ItemFilterScriptViewModel.cs

@@ -77,6 +77,8 @@ namespace Filtration.ViewModels
         RelayCommand<bool> ToggleShowAdvancedCommand { get; }
         RelayCommand ClearFilterCommand { get; }
         RelayCommand ClearStylesCommand { get; }
+        RelayCommand EnableDropSoundsCommand { get; }
+        RelayCommand DisableDropSoundsCommand { get; }
 
         void AddCommentBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase);
         void AddBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase);
@@ -180,6 +182,8 @@ namespace Filtration.ViewModels
             CollapseAllBlocksCommand = new RelayCommand(OnCollapseAllBlocksCommand);
             ExpandAllSectionsCommand = new RelayCommand(ExpandAllSections);
             CollapseAllSectionsCommand = new RelayCommand(CollapseAllSections);
+            EnableDropSoundsCommand = new RelayCommand(OnEnableDropSoundsCommand, CanModifySelectedBlocks);
+            DisableDropSoundsCommand = new RelayCommand(OnDisableDropSoundsCommand, CanModifySelectedBlocks);
 
             var icon = new BitmapImage();
             icon.BeginInit();
@@ -389,7 +393,7 @@ namespace Filtration.ViewModels
         {
             for (var i = 0; i < SelectedBlockViewModels.Count; i++)
             {
-                if (!ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
+                if (SelectedBlockViewModels[i] == null || !ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
                 {
                     SelectedBlockViewModels.RemoveAt(i--);
                 }
@@ -421,6 +425,8 @@ namespace Filtration.ViewModels
         public RelayCommand CollapseAllBlocksCommand { get; }
         public RelayCommand ExpandAllSectionsCommand { get; }
         public RelayCommand CollapseAllSectionsCommand { get; }
+        public RelayCommand EnableDropSoundsCommand { get; }
+        public RelayCommand DisableDropSoundsCommand { get; }
 
         public bool IsActiveDocument
         {
@@ -556,6 +562,8 @@ namespace Filtration.ViewModels
 
         public bool CanModifySelectedBlocks()
         {
+            ValidateSelectedBlocks();
+
             if (SelectedBlockViewModels.Count < 1)
                 return false;
 
@@ -572,6 +580,9 @@ namespace Filtration.ViewModels
 
         public bool CanModifyBlock(IItemFilterBlockViewModelBase itemFilterBlock)
         {
+            if (itemFilterBlock == null)
+                return false;
+
             if (itemFilterBlock is IItemFilterBlockViewModel)
                 return true;
 
@@ -790,34 +801,37 @@ namespace Filtration.ViewModels
             await Close();
         }
 
-        public async Task Close()
+        public async Task<bool> Close()
         {
             if (!IsDirty)
             {
                 CloseScript();
+                return true;
             }
-            else
-            {
-                var result = _messageBoxService.Show("Filtration",
-                    "Save script \"" + Filename + "\"?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
 
-                switch (result)
+            var result = _messageBoxService.Show("Filtration",
+                                                 "Save script \"" + Filename + "\"?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
+
+            switch (result)
+            {
+                case MessageBoxResult.Yes:
                 {
-                    case MessageBoxResult.Yes:
+                    await SaveAsync();
-                        {
+                    CloseScript();
-                            await SaveAsync();
+                    return true;
-                            CloseScript();
+                }
-                            break;
+                case MessageBoxResult.No:
-                        }
+                {
-                    case MessageBoxResult.No:
+                    CloseScript();
-                        {
+                    return true;
-                            CloseScript();
+                }
-                            break;
+                case MessageBoxResult.Cancel:
-                        }
+                {
-                    case MessageBoxResult.Cancel:
+                    return false;
-                        {
+                }
-                            return;
+                default:
-                        }
+                {
+                    return false;
                 }
             }
         }
@@ -1284,6 +1298,63 @@ namespace Filtration.ViewModels
             SetDirtyFlag();
         }
 
+        public void OnEnableDropSoundsCommand()
+        {
+            ValidateSelectedBlocks();
+
+            var input = new List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>>();
+
+            foreach (var block in SelectedBlockViewModels.OfType<IItemFilterBlockViewModel>())
+            {
+                var blockItems = block.Block.BlockItems;
+                for (var i = 0; i < blockItems.Count; i++)
+                {
+                    var blockItem = blockItems[i];
+                    if (blockItem is DisableDropSoundBlockItem)
+                    {
+                        input.Add(new Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>(blockItems, blockItem));
+                    }
+                }
+            }
+
+            if (input.Count > 0)
+            {
+                _scriptCommandManager.ExecuteCommand(new RemoveBlockItemFromBlocksCommand(input));
+                SetDirtyFlag();
+            }
+        }
+
+        public void OnDisableDropSoundsCommand()
+        {
+            ValidateSelectedBlocks();
+
+            var input = new List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>>();
+
+            foreach (var block in SelectedBlockViewModels.OfType<IItemFilterBlockViewModel>())
+            {
+                var blockItems = block.Block.BlockItems;
+                var found = false;
+                foreach (var item in blockItems)
+                {
+                    if (item is DisableDropSoundBlockItem)
+                    {
+                        found = true;
+                    }
+                }
+
+                if (!found) {
+                    var item = new DisableDropSoundBlockItem();
+                    input.Add(new Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>(blockItems, item));
+                }
+            }
+
+            if (input.Count > 0)
+            {
+                _scriptCommandManager.ExecuteCommand(new AddBlockItemToBlocksCommand(input));
+                SetDirtyFlag();
+            }
+        }
+
         private void OnBlockBecameDirty(object sender, EventArgs e)
         {
             SetDirtyFlag();

Filtration/ViewModels/MainWindowViewModel.cs

@@ -129,6 +129,9 @@ namespace Filtration.ViewModels
             ApplyThemeToScriptCommand = new RelayCommand(async () => await OnApplyThemeToScriptCommandAsync(), () => ActiveDocumentIsScript);
             EditMasterThemeCommand = new RelayCommand(OnEditMasterThemeCommand, () => ActiveDocumentIsScript);
 
+            EnableDropSoundsCommand = new RelayCommand(OnEnableDropSoundsCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock && ActiveScriptCanModifySelectedBlocks);
+            DisableDropSoundsCommand = new RelayCommand(OnDisableDropSoundsCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock && ActiveScriptCanModifySelectedBlocks);
+
             AddTextColorThemeComponentCommand = new RelayCommand(OnAddTextColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             AddBackgroundColorThemeComponentCommand = new RelayCommand(OnAddBackgroundColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             AddBorderColorThemeComponentCommand = new RelayCommand(OnAddBorderColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
@@ -230,6 +233,9 @@ namespace Filtration.ViewModels
         public RelayCommand CreateThemeCommand { get; }
         public RelayCommand ApplyThemeToScriptCommand { get; }
 
+        public RelayCommand EnableDropSoundsCommand { get; }
+        public RelayCommand DisableDropSoundsCommand { get; }
+
         public RelayCommand AddTextColorThemeComponentCommand { get; }
         public RelayCommand AddBackgroundColorThemeComponentCommand { get; }
         public RelayCommand AddBorderColorThemeComponentCommand { get; }
@@ -402,7 +408,7 @@ namespace Filtration.ViewModels
                 OpenTheme(themeViewModel);
             }
         }
-        
+
         private void OpenTheme(IThemeEditorViewModel themeEditorViewModel)
         {
             if (AvalonDockWorkspaceViewModel.OpenDocuments.Contains(themeEditorViewModel))
@@ -724,11 +730,37 @@ namespace Filtration.ViewModels
                 _avalonDockWorkspaceViewModel.ActiveThemeViewModel.SelectedThemeComponent);
         }
 
+        private void OnEnableDropSoundsCommand()
+        {
+            var result = _messageBoxService.Show("Confirm",
+                "Are you sure you wish to enable drop sounds on all selected blocks?",
+                MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result == MessageBoxResult.No)
+            {
+                return;
+            }
+
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.EnableDropSoundsCommand.Execute(null);
+        }
+
+        private void OnDisableDropSoundsCommand()
+        {
+            var result = _messageBoxService.Show("Confirm",
+                "Are you sure you wish to disable drop sounds on all selected blocks?",
+                MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result == MessageBoxResult.No)
+            {
+                return;
+            }
+
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.DisableDropSoundsCommand.Execute(null);
+        }
+
         public async Task<bool> CloseAllDocumentsAsync()
         {
             Settings.Default.LastOpenScripts = string.Join("|", _avalonDockWorkspaceViewModel.OpenDocuments.OfType<IItemFilterScriptViewModel>().Select(sc => sc.Script.FilePath));
             var openDocuments = _avalonDockWorkspaceViewModel.OpenDocuments.OfType<IEditableDocument>().ToList();
-            
+
             foreach (var document in openDocuments)
             {
                 if (!_avalonDockWorkspaceViewModel.OpenDocuments.Contains(document))
@@ -736,7 +768,10 @@ namespace Filtration.ViewModels
                     continue;
                 }
 
-                await document.Close();
+                if (!await document.Close())
+                {
+                    return false;
+                }
             }
 
             return true;

Filtration/ViewModels/ReplaceColorsViewModel.cs

@@ -1,12 +1,9 @@
-using System.Collections.ObjectModel;
+using System.Linq;
-using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemTypes;
-using Filtration.Views;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
-using Xceed.Wpf.Toolkit;
 
 namespace Filtration.ViewModels
 {
@@ -62,8 +59,6 @@ namespace Filtration.ViewModels
             _itemFilterScript = itemFilterScript;
         }
 
-        public ObservableCollection<ColorItem> AvailableColors => PathOfExileColors.DefaultColors;
-
         public Color NewTextColor
         {
             get => _replaceColorsParameterSet.NewTextColor;

Filtration/ViewModels/StartPageViewModel.cs

@@ -25,7 +25,7 @@ namespace Filtration.ViewModels
         public bool IsScript => false;
         public bool IsTheme => false;
 
-        public Task Close()
+        public Task<bool> Close()
         {
             throw new System.NotImplementedException();
         }

Filtration/ViewModels/UpdateViewModel.cs

@@ -65,9 +65,10 @@ namespace Filtration.ViewModels
 
         public bool IsInErrorState => UpdateStatus == UpdateStatus.Error;
 
-        public async Task Close()
+        public async Task<bool> Close()
         {
             await Task.FromResult(true);
+            return true;
         }
 
         public RelayCommand CloseCommand { get; }

Filtration/Views/IconsDictionary.xaml

@@ -11,7 +11,6 @@
     <Image Source="/Filtration;component/Resources/Icons/arrow_up_large_icon.png" x:Key="MoveUpIcon" x:Shared="false" />
     <Image Source="/Filtration;component/Resources/Icons/arrow_bottom_icon.png" x:Key="MoveToBottomIcon" x:Shared="false" />
     <Image Source="/Filtration;component/Resources/Icons/arrow_down_large_icon.png" x:Key="MoveDownIcon" x:Shared="false" />
-    <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png" x:Key="SpeakerIcon" x:Shared="false" />
     <Image Source="/Filtration;component/Resources/Icons/play_icon.png" x:Key="PlayIcon" x:Shared="false" />
     <Image Source="/Filtration;component/Resources/Icons/about_icon.png" x:Key="AboutIcon" x:Shared="false" />
     <Image Source="/Filtration;component/Resources/Icons/ReplaceColors.ico" x:Key="ReplaceColorsIcon" x:Shared="false" />
@@ -35,4 +34,6 @@
     <Image Source="/Filtration;component/Resources/Icons/ThemeComponentDelete.ico" x:Key="ThemeComponentDeleteIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/standby_enabled_icon.png" x:Key="StandbyEnabledIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/standby_disabled_icon.png" x:Key="StandbyDisabledIcon" x:Shared="False" />
-</ResourceDictionary>
+    <Image Source="/Filtration;component/Resources/Icons/standby_enabled_icon.png" x:Key="EnableDropSoundsIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/standby_disabled_icon.png" x:Key="DisableDropSoundsIcon" x:Shared="False" />
+</ResourceDictionary>

Filtration/Views/ItemFilterBlockView.xaml

@@ -1,7 +1,7 @@
 <UserControl x:Class="Filtration.Views.ItemFilterBlockView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:userControls="clr-namespace:Filtration.UserControls"
              xmlns:toolkit="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit"
@@ -10,7 +10,7 @@
              xmlns:blockItemBaseTypes="clr-namespace:Filtration.ObjectModel.BlockItemBaseTypes;assembly=Filtration.ObjectModel"
              xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              xmlns:designTime="clr-namespace:Filtration.ViewModels.DesignTime"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=designTime:DesignTimeItemFilterBlockViewModel, IsDesignTimeCreatable=True}"
              d:DesignHeight="400" d:DesignWidth="817">
     <UserControl.Resources>
@@ -18,6 +18,8 @@
             <views:BindingProxy x:Key="Proxy" Data="{Binding}" />
             <converters:BlockGroupAdvancedFillColorConverter x:Key="BlockGroupAdvancedFillColorConverter" />
             <converters:MinimapIconToCroppedBitmapConverter x:Key="MinimapIconToCroppedBitmapConverter"/>
+            <converters:DisabledDefaultSoundConverter x:Key="DisabledDefaultSoundConverter"/>
+            <converters:DisabledDefaultSoundTooltipConverter x:Key="DisabledDefaultSoundTooltipConverter"/>
             <Style TargetType="{x:Type ContentPresenter}" x:Key="BlockItemFadeInStyle">
                 <Setter Property="LayoutTransform">
                     <Setter.Value>
@@ -130,48 +132,90 @@
                             <WrapPanel Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">
                                 <Image Height="40" Width="40" Margin="0,0,10,0" Stretch="Fill">
                                     <Image.Source>
-                                        <MultiBinding Converter="{StaticResource MinimapIconToCroppedBitmapConverter}">
+                                        <MultiBinding Converter="{StaticResource MinimapIconToCroppedBitmapConverter}">
-                                            <Binding Path="DisplayIconSize"/>
+                                            <Binding Path="DisplayIconSize"/>
-                                            <Binding Path="DisplayIconColor"/>
+                                            <Binding Path="DisplayIconColor"/>
-                                            <Binding Path="DisplayIconShape"/>
+                                            <Binding Path="DisplayIconShape"/>
                                         </MultiBinding>
                                     </Image.Source>
                                 </Image>
+                                <Image Height="28" Width="28" Margin="0,0,5,0" Source="../Resources/Icons/no_sound_dds_light.png">
+                                    <Image.ToolTip>
+                                        <TextBlock>
+                                            The default drop sound is disabled for this block.
+                                            <LineBreak /> 
+                                            Drops matched by this block emit no sound whatsoever
+                                        </TextBlock>
+                                    </Image.ToolTip>
+                                    <Image.Style>
+                                        <Style TargetType="Image">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                            <Style.Triggers>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Binding HasCustomSound}" Value="False" />
+                                                        <Condition Binding="{Binding HasSound}" Value="False" />
+                                                        <Condition Binding="{Binding HasPositionalSound}" Value="False" />
+                                                        <Condition Binding="{Binding HasDisabledDefaultSound}" Value="True" />
+                                                    </MultiDataTrigger.Conditions>
+                                                    <MultiDataTrigger.Setters>
+                                                        <Setter Property="Visibility" Value="Visible" />
+                                                    </MultiDataTrigger.Setters>
+                                                </MultiDataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Image.Style>
+                                </Image>
                                 <Button Command="{Binding PlaySoundCommand}"
-                                        Width="25"
+                                        Width="32"
-                                        Height="25"
+                                        Height="32"
                                         VerticalAlignment="Center"
                                         HorizontalAlignment="Center"
                                         Margin="0,0,3,0"
                                         Visibility="{Binding HasSound, Converter={StaticResource BooleanVisibilityConverter}}"
                                         Background="Transparent"
-                                        BorderBrush="Transparent"
+                                        BorderBrush="Transparent">
-                                        ToolTip="Click to preview drop sound">
+                                    <Button.ToolTip>
-                                    <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                        <MultiBinding Converter="{StaticResource DisabledDefaultSoundTooltipConverter}">
+                                            <Binding Source="Click to preview drop sound."/>
+                                            <Binding Path="HasDisabledDefaultSound"/>
+                                        </MultiBinding>
+                                    </Button.ToolTip>
+                                    <Image Source="{Binding HasDisabledDefaultSound, Converter={StaticResource DisabledDefaultSoundConverter}}"  VerticalAlignment="Center" HorizontalAlignment="Center" />
                                 </Button>
                                 <Button Command="{Binding PlayPositionalSoundCommand}"
-                                        Width="25"
+                                        Width="32"
-                                        Height="25"
+                                        Height="32"
                                         VerticalAlignment="Center"
                                         HorizontalAlignment="Center"
                                         Margin="0,0,3,0"
                                         Visibility="{Binding HasPositionalSound, Converter={StaticResource BooleanVisibilityConverter}}"
                                         Background="Transparent"
-                                        BorderBrush="Transparent"
+                                        BorderBrush="Transparent">
-                                        ToolTip="Click to preview drop sound">
+                                    <Button.ToolTip>
-                                    <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                        <MultiBinding Converter="{StaticResource DisabledDefaultSoundTooltipConverter}">
+                                            <Binding Source="Click to preview positional drop sound."/>
+                                            <Binding Path="HasDisabledDefaultSound"/>
+                                        </MultiBinding>
+                                    </Button.ToolTip>
+                                    <Image Source="{Binding HasDisabledDefaultSound, Converter={StaticResource DisabledDefaultSoundConverter}}"  VerticalAlignment="Center" HorizontalAlignment="Center" />
                                 </Button>
                                 <Button Command="{Binding PlayCustomSoundCommand}"
-                                        Width="25"
+                                        Width="32"
-                                        Height="25"
+                                        Height="32"
                                         VerticalAlignment="Center"
                                         HorizontalAlignment="Center"
                                         Margin="0,0,3,0"
                                         Visibility="{Binding HasCustomSound, Converter={StaticResource BooleanVisibilityConverter}}"
                                         Background="Transparent"
-                                        BorderBrush="Transparent"
+                                        BorderBrush="Transparent">
-                                        ToolTip="Click to preview drop sound">
+                                    <Button.ToolTip>
-                                    <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                        <MultiBinding Converter="{StaticResource DisabledDefaultSoundTooltipConverter}">
+                                            <Binding Source="Click to preview custom drop sound."/>
+                                            <Binding Path="HasDisabledDefaultSound"/>
+                                        </MultiBinding>
+                                    </Button.ToolTip>
+                                    <Image Source="{Binding HasDisabledDefaultSound, Converter={StaticResource DisabledDefaultSoundConverter}}"  VerticalAlignment="Center" HorizontalAlignment="Center" />
                                 </Button>
                                 <Line Y1="5" Y2="38" StrokeThickness="2" Panel.ZIndex="999"
                                       Stroke="{Binding DisplayEffectColor, Converter={StaticResource ColorToSolidColorBrushConverter}, Mode=OneWay}"

Filtration/Views/ItemFilterBlockView.xaml.cs

@@ -2,8 +2,8 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using Filtration.Common.Utilities;
 using Filtration.UserControls;
-using Filtration.Utility;
 
 namespace Filtration.Views
 {
@@ -44,8 +44,9 @@ namespace Filtration.Views
             if (sender is ScrollViewer viewer && !e.Handled)
             {
                 // Don't handle events if they originated from a control within an EditableListBoxControl
-                // since we still want to allow scrolling within those with the mouse wheel
+                // or a ComboBox since we still want to allow scrolling within those with the mouse wheel
-                if (e.OriginalSource is DependencyObject dependencyObject && VisualTreeUtility.FindParent<EditableListBoxControl>(dependencyObject) != null)
+                if (e.OriginalSource is DependencyObject dependencyObject && (IsDropDownScrollViewer(dependencyObject) || ParentIsEditableListBoxControl(dependencyObject) ||
+                    ParentIsDropDownScrollViewer(dependencyObject)))
                 {
                     e.Handled = false;
                     return;
@@ -60,5 +61,20 @@ namespace Filtration.Views
                 }
             }
         }
+
+        private static bool ParentIsEditableListBoxControl(DependencyObject dependencyObject)
+        {
+            return VisualTreeUtility.FindParent<EditableListBoxControl>(dependencyObject) != null;
+        }
+        private static bool ParentIsDropDownScrollViewer(DependencyObject dependencyObject)
+        {
+            var parent = VisualTreeUtility.FindParent<ScrollViewer>(dependencyObject);
+            return parent != null && parent.Name == "DropDownScrollViewer";
+        }
+
+        private static bool IsDropDownScrollViewer(DependencyObject dependencyObject)
+        {
+            return dependencyObject is ScrollViewer scrollViewer && scrollViewer.Name == "DropDownScrollViewer";
+        }
     }
 }

Filtration/Views/MainWindow.xaml

@@ -2,7 +2,7 @@
         x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
         xmlns:viewModels="clr-namespace:Filtration.ViewModels"
@@ -64,12 +64,12 @@
                                                  Background="ForestGreen"
                                                  BorderBrush="ForestGreen"
                                                  x:Name="ScriptToolsGroup"
-                                                 IsVisibleChanged="ScriptToolsGroup_OnIsVisibleChanged"  
+                                                 IsVisibleChanged="ScriptToolsGroup_OnIsVisibleChanged"
                                                  Visibility="{Binding ActiveDocumentIsScript, Converter={StaticResource BooleanVisibilityConverter}, Mode=OneWay}" />
                 <fluent:RibbonContextualTabGroup Header="Theme"
                                                  Background="DodgerBlue"
                                                  BorderBrush="DodgerBlue"
-                                                 x:Name="ThemeToolsGroup" 
+                                                 x:Name="ThemeToolsGroup"
                                                  IsVisibleChanged="ThemeToolsGroup_OnIsVisibleChanged"
                                                  Visibility="{Binding ActiveDocumentIsTheme, Converter={StaticResource BooleanVisibilityConverter}, Mode=OneWay}" />
             </fluent:Ribbon.ContextualGroups>
@@ -125,6 +125,10 @@
                     <fluent:Button Header="Create Theme" Command="{Binding CreateThemeCommand}" Icon="{StaticResource ThemeIcon}" LargeIcon="{StaticResource ThemeIcon}" />
                     <fluent:Button Header="Replace Colours" Command="{Binding ReplaceColorsCommand}" Icon="{StaticResource ReplaceColorsIcon}" LargeIcon="{StaticResource ReplaceColorsIcon}" />
                 </fluent:RibbonGroupBox>
+                <fluent:RibbonGroupBox Header="Helpers">
+                    <fluent:Button Header="Enable Drop Sounds" Command="{Binding EnableDropSoundsCommand}" SizeDefinition="Middle" Icon="{StaticResource EnableDropSoundsIcon}" LargeIcon="{StaticResource EnableDropSoundsIcon}" />
+                    <fluent:Button Header="Disable Drop Sounds" Command="{Binding DisableDropSoundsCommand}" SizeDefinition="Middle" Icon="{StaticResource DisableDropSoundsIcon}" LargeIcon="{StaticResource DisableDropSoundsIcon}" />
+                </fluent:RibbonGroupBox>
             </fluent:RibbonTabItem>
             <fluent:RibbonTabItem x:Name="ThemeToolsTabItem" Header="Theme Tools" Group="{Binding ElementName=ThemeToolsGroup}" Visibility="{Binding ActiveDocumentIsTheme, Converter={StaticResource BooleanVisibilityConverter}, Mode=OneWay}">
                 <fluent:RibbonGroupBox Header="Add Components">
@@ -172,5 +176,4 @@
         </Grid>
     </DockPanel>
 </fluent:RibbonWindow>
- 
+
- 

Filtration/Views/MainWindow.xaml.cs

@@ -44,7 +44,6 @@ namespace Filtration.Views
             if (!allDocumentsClosed)
             {
                 e.Cancel = true;
-
             }
         }
 

Filtration/Views/ReplaceColorsWindow.xaml

@@ -6,6 +6,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:viewModels="clr-namespace:Filtration.ViewModels"
         xmlns:userControls="clr-namespace:Filtration.UserControls"
+        xmlns:utilities="clr-namespace:Filtration.Common.Utilities;assembly=Filtration.Common"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:ReplaceColorsViewModel}"
         Title="Replace Script Colors" Height="280" Width="540"
@@ -31,22 +32,22 @@
         </Grid.ColumnDefinitions>
         <CheckBox Grid.Row="0" Grid.Column="0" Content="Replace Text Color" IsChecked="{Binding ReplaceTextColor}" />
         <TextBlock Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">Existing Text Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="0" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldTextColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
+        <xctk:ColorPicker Grid.Row="0" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldTextColor}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
         <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">New Text Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="1" Grid.Column="4" SelectedColor="{Binding NewTextColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
+        <xctk:ColorPicker Grid.Row="1" Grid.Column="4" SelectedColor="{Binding NewTextColor}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
 
 
         <CheckBox Grid.Row="2" Grid.Column="0" Content="Replace Background Color" IsChecked="{Binding ReplaceBackgroundColor}" />
         <TextBlock Grid.Row="2" Grid.Column="2" VerticalAlignment="Center">Existing Background Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="2" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBackgroundColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
+        <xctk:ColorPicker Grid.Row="2" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBackgroundColor}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
         <TextBlock Grid.Row="3" Grid.Column="2" VerticalAlignment="Center">New Background Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="3" Grid.Column="4" SelectedColor="{Binding NewBackgroundColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
+        <xctk:ColorPicker Grid.Row="3" Grid.Column="4" SelectedColor="{Binding NewBackgroundColor}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
 
         <CheckBox Grid.Row="4" Grid.Column="0" Content="Replace Border Color" IsChecked="{Binding ReplaceBorderColor}" />
         <TextBlock Grid.Row="4" Grid.Column="2" VerticalAlignment="Center">Existing Border Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="4" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBorderColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
+        <xctk:ColorPicker Grid.Row="4" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBorderColor}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
         <TextBlock Grid.Row="5" Grid.Column="2" VerticalAlignment="Center">New Border Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="5" Grid.Column="4" SelectedColor="{Binding NewBorderColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
+        <xctk:ColorPicker Grid.Row="5" Grid.Column="4" SelectedColor="{Binding NewBorderColor}" AvailableColors="{x:Static utilities:PathOfExileColors.DefaultColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
 
         <userControls:ItemPreviewControl Grid.Row="6" Grid.Column="4" TextColor="{Binding DisplayTextColor}" BackgroundColor="{Binding DisplayBackgroundColor}" BorderColor="{Binding DisplayBorderColor}" />
         <TextBlock Grid.Row="6" Grid.Column="2" VerticalAlignment="Center">Preview</TextBlock>

Filtration/WindsorInstallers/ServicesInstaller.cs

@@ -2,6 +2,7 @@
 using Castle.MicroKernel.SubSystems.Configuration;
 using Castle.Windsor;
 using Filtration.Services;
+using Filtration.Utility;
 
 namespace Filtration.WindsorInstallers
 {
@@ -58,6 +59,11 @@ namespace Filtration.WindsorInstallers
                 Component.For<IDialogService>()
                     .ImplementedBy<DialogService>()
                     .LifeStyle.Singleton);
+
+            container.Register(
+                Component.For<ISplatNLogAdapter>()
+                    .ImplementedBy<SplatNLogAdapter>()
+                    .LifeStyle.Singleton);
         }
     }
 }

README.md

@@ -4,7 +4,7 @@ Filtration is an editor for Path of Exile item filter scripts.
 
 ## Current Release (Released 2018-09-30)
 <b>Installer</b><br>
-<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.1/Setup.exe">Setup.exe</a>
+<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.3/Setup.exe">Setup.exe</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.6.1 installed.