Merge pull request #62 from GlenCFL/fix-reopen

Fix the reading of CustomAlertSounds containing path separators.

Filtration.Interface/Filtration.Interface.csproj

@@ -31,24 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -61,9 +46,6 @@
     <Compile Include="IEditableDocument.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Filtration.Interface/IDocument.cs

@@ -1,6 +1,4 @@
 using System.Threading.Tasks;
-using System.Windows.Input;
-using GalaSoft.MvvmLight.CommandWpf;
 
 namespace Filtration.Interface
 {
@@ -9,6 +7,5 @@ namespace Filtration.Interface
         bool IsScript { get; }
         bool IsTheme { get; }
         Task Close();
-        RelayCommand CloseCommand { get; }
     }
 }

Filtration.Interface/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
-  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
-</packages>

Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs

@@ -19,7 +19,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
         }
 
         public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " "
-                                             + Color.B + (Color.A != 240 ? " " + Color.A : string.Empty) +
+                                             + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
                                              (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
 
         public override string SummaryText => string.Empty;

Filtration.ObjectModel/BlockItemTypes/HasExplicitModBlockItem.cs

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

Filtration.ObjectModel/BlockItemTypes/QualityBlockItem.cs

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

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockDownCommand.cs

@@ -0,0 +1,39 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockDownCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockDownCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+
+            if (_indexMovedFrom >= _itemFilterScript.ItemFilterBlocks.Count)
+            {
+                throw new InvalidOperationException("Cannot move the bottom block down");
+            }
+
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom + 1, _blockToMove);
+
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToBottomCommand.cs

@@ -0,0 +1,30 @@
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockToBottomCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+            
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Add(_blockToMove);
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToTopCommand.cs

@@ -0,0 +1,30 @@
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockToTopCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(0, _blockToMove);
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockUpCommand.cs

@@ -0,0 +1,39 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockUpCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockUpCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+
+            if (_indexMovedFrom <= 0)
+            {
+                throw new InvalidOperationException("Cannot move the top block up");
+            }
+
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom-1, _blockToMove);
+
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToBottomCommand.cs

@@ -1,60 +0,0 @@
-using System.Collections.Generic;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlocksToBottomCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly List<int> _sourceIndexes;
-
-        public MoveBlocksToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
-        }
-
-        public MoveBlocksToBottomCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = sourceIndexes;
-            _sourceIndexes.Sort();
-        }
-
-        public void Execute()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
-            }
-
-            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
-            {
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
-            }
-
-            foreach (var block in blocksToMove)
-            {
-                _itemFilterScript.ItemFilterBlocks.Add(block);
-            }
-        }
-
-        public void Undo()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                var movedIndex = _itemFilterScript.ItemFilterBlocks.Count - _sourceIndexes.Count;
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[movedIndex]);
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(movedIndex);
-            }
-
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToIndexCommand.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlocksToIndexCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private List<int> _sourceIndexes;
-        private int _targetIndex;
-
-        public MoveBlocksToIndexCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block, int targetIndex)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
-            _targetIndex = targetIndex;
-        }
-
-        public MoveBlocksToIndexCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes, int targetIndex)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = sourceIndexes;
-            _sourceIndexes.Sort();
-            _targetIndex = targetIndex;
-        }
-
-        public void Execute()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
-            }
-
-            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
-            {
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
-            }
-
-            for (var i = 0; i < blocksToMove.Count; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_targetIndex + i, blocksToMove[i]);
-            }
-        }
-
-        public void Undo()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_targetIndex]);
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_targetIndex);
-            }
-
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlocksToTopCommand.cs

@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class MoveBlocksToTopCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly List<int> _sourceIndexes;
-
-        public MoveBlocksToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
-        }
-
-        public MoveBlocksToTopCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = sourceIndexes;
-            _sourceIndexes.Sort();
-        }
-
-        public void Execute()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
-            }
-
-            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
-            {
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
-            }
-
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(i, blocksToMove[i]);
-            }
-        }
-
-        public void Undo()
-        {
-            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[0]);
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(0);
-            }
-
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}

Filtration.ObjectModel/Commands/ItemFilterScript/MoveSectionToIndexCommand.cs

@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveSectionToIndexCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private int _sectionStart;
+        private int _sectionSize;
+        private int _index;
+
+        public MoveSectionToIndexCommand(IItemFilterScript itemFilterScript, int sectionStart, int sectionSize, int index)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sectionStart = sectionStart;
+            _sectionSize = sectionSize;
+            _index = index;
+        }
+        public void Execute()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for(var i = 0; i < _sectionSize; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sectionStart]);
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sectionStart);
+            }
+            for (var i = 0; i < _sectionSize; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_index + i, blocksToMove[i]);
+            }
+        }
+
+        public void Undo()
+        {
+            List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
+            for (var i = 0; i < _sectionSize; i++)
+            {
+                blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_index]);
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_index);
+            }
+            for (var i = 0; i < _sectionSize; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_sectionStart + i, blocksToMove[i]);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlockCommand.cs

@@ -0,0 +1,37 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class PasteBlockCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _pastedItemFilterBlock;
+        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
+
+        public PasteBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase pastedItemFilterBlock, IItemFilterBlockBase addAfterItemFilterBlock)
+        {
+            _itemFilterScript = itemFilterScript;
+            _pastedItemFilterBlock = pastedItemFilterBlock;
+            _addAfterItemFilterBlock = addAfterItemFilterBlock;
+        }
+
+        public void Execute()
+        {
+            if (_addAfterItemFilterBlock != null)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _pastedItemFilterBlock);
+            }
+            else
+            {
+                _itemFilterScript.ItemFilterBlocks.Add(_pastedItemFilterBlock);
+            }
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_pastedItemFilterBlock);
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlocksCommand.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class PasteBlocksCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private readonly List<IItemFilterBlockBase> _pastedItemFilterBlocks;
-        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
-
-        public PasteBlocksCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block, IItemFilterBlockBase addAfterItemFilterBlock)
-        {
-            _itemFilterScript = itemFilterScript;
-            _pastedItemFilterBlocks = new List<IItemFilterBlockBase> { block };
-            _addAfterItemFilterBlock = addAfterItemFilterBlock;
-        }
-
-        public PasteBlocksCommand(IItemFilterScript itemFilterScript, List<IItemFilterBlockBase> pastedItemFilterBlocks, IItemFilterBlockBase addAfterItemFilterBlock)
-        {
-            _itemFilterScript = itemFilterScript;
-            _pastedItemFilterBlocks = pastedItemFilterBlocks;
-            _addAfterItemFilterBlock = addAfterItemFilterBlock;
-        }
-
-        public void Execute()
-        {
-            if (_addAfterItemFilterBlock != null)
-            {
-                var lastAddedBlock = _addAfterItemFilterBlock;
-                foreach (var block in _pastedItemFilterBlocks)
-                {
-                    _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(lastAddedBlock) + 1, block);
-                    lastAddedBlock = block;
-                }
-            }
-            else
-            {
-                foreach (var block in _pastedItemFilterBlocks)
-                {
-                    _itemFilterScript.ItemFilterBlocks.Add(block);
-                }
-            }
-        }
-
-        public void Undo()
-        {
-            foreach (var block in _pastedItemFilterBlocks)
-            {
-                _itemFilterScript.ItemFilterBlocks.Remove(block);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}

Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockCommand.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class RemoveBlockCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private IItemFilterBlockBase _removedItemFilterBlock;
+        private int _indexRemovedFrom;
+
+        public RemoveBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase itemFilterBlockBase)
+        {
+            _itemFilterScript = itemFilterScript;
+            _removedItemFilterBlock = itemFilterBlockBase;
+        }
+        public void Execute()
+        {
+            _indexRemovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_removedItemFilterBlock);
+            _itemFilterScript.ItemFilterBlocks.Remove(_removedItemFilterBlock);
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexRemovedFrom, _removedItemFilterBlock);
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlocksCommand.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Filtration.ObjectModel.Commands.ItemFilterScript
-{
-    public class RemoveBlocksCommand : IUndoableCommand
-    {
-        private readonly IItemFilterScript _itemFilterScript;
-        private List<IItemFilterBlockBase> _removedItemFilterBlocks;
-        private List<int> _sourceIndexes;
-
-        public RemoveBlocksCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
-            _removedItemFilterBlocks = new List<IItemFilterBlockBase> { block };
-        }
-
-        public RemoveBlocksCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
-        {
-            _itemFilterScript = itemFilterScript;
-            _sourceIndexes = sourceIndexes;
-            _sourceIndexes.Sort();
-            _removedItemFilterBlocks = new List<IItemFilterBlockBase>();
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                _removedItemFilterBlocks.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
-            }
-        }
-
-        public void Execute()
-        {
-            for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
-            {
-                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
-            }
-        }
-
-        public void Undo()
-        {
-            for (var i = 0; i < _sourceIndexes.Count; i++)
-            {
-                _itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], _removedItemFilterBlocks[i]);
-            }
-        }
-
-        public void Redo() => Execute();
-    }
-}

Filtration.ObjectModel/Commands/ItemFilterScript/RemoveSectionCommand.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class RemoveSectionCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private List<IItemFilterBlockBase> _removedItemFilterBlocks;
+        private int _sectionStart;
+        private int _sectionSize;
+
+        public RemoveSectionCommand(IItemFilterScript itemFilterScript, int sectionStart, int sectionSize)
+        {
+            _itemFilterScript = itemFilterScript;
+            _sectionStart = sectionStart;
+            _sectionSize = sectionSize;
+            _removedItemFilterBlocks = new List<IItemFilterBlockBase>();
+            for(var i = 0; i < _sectionSize; i++)
+            {
+                _removedItemFilterBlocks.Add(_itemFilterScript.ItemFilterBlocks[_sectionStart + i]);
+            }
+        }
+        public void Execute()
+        {
+            for (var i = 0; i < _sectionSize; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.RemoveAt(_sectionStart);
+            }
+        }
+
+        public void Undo()
+        {
+            for (var i = 0; i < _sectionSize; i++)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_sectionStart + i, _removedItemFilterBlocks[i]);
+            }
+        }
+
+        public void Redo() => Execute();
+    }
+}

Filtration.ObjectModel/Enums/IconColor.cs

@@ -1,23 +1,17 @@
 using System.ComponentModel;
 
 namespace Filtration.ObjectModel.Enums
-{
+{
-	/// <summary>
+    public enum IconColor
-	/// Each of the colors supported by the MinimapIcon block rule.
-	/// </summary>
-	/// <remarks>
-	/// The ordering here should match the ordering of the colors within the source image.
-	/// </remarks>
-	public enum IconColor
     {
-		[Description("Blue")]
+        [Description("Red")]
-		Blue,
-		[Description("Green")]
-		Green,
-		[Description("Brown")]
-		Brown,
-		[Description("Red")]
         Red,
+        [Description("Green")]
+        Green,
+        [Description("Blue")]
+        Blue,
+        [Description("Brown")]
+        Brown,
         [Description("White")]
         White,
         [Description("Yellow")]

Filtration.ObjectModel/Enums/IconShape.cs

@@ -1,14 +1,8 @@
 using System.ComponentModel;
 
 namespace Filtration.ObjectModel.Enums
-{
+{
-	/// <summary>
+    public enum IconShape
-	/// Each of the shapes supported by the MinimapIcon block rule.
-	/// </summary>
-	/// <remarks>
-	/// The ordering here should match the ordering of the shapes within the source image.
-	/// </remarks>
-	public enum IconShape
     {
         [Description("Circle")]
         Circle,

Filtration.ObjectModel/Enums/IconSize.cs

@@ -1,14 +1,8 @@
 using System.ComponentModel;
 
 namespace Filtration.ObjectModel.Enums
-{
+{
-	/// <summary>
+    public enum IconSize
-	/// Each of the sizes supported by the MinimapIcon block rule.
-	/// </summary>
-	/// <remarks>
-	/// The ordering here should match the ordering of the sizes within the source image.
-	/// </remarks>
-	public enum IconSize
     {
         [Description("Largest")]
         Largest,

Filtration.ObjectModel/FilteredItem.cs

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

Filtration.ObjectModel/Filtration.ObjectModel.csproj

@@ -110,13 +110,17 @@
     <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
     <Compile Include="Commands\CommandManager.cs" />
     <Compile Include="Commands\ICommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlocksToIndexCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveSectionToIndexCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlocksToBottomCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\PasteBlockCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockToBottomCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\AddCommentBlockCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\MoveBlocksToTopCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockDownCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\PasteBlocksCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockUpCommand.cs" />
-    <Compile Include="Commands\ItemFilterScript\RemoveBlocksCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockToTopCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\PasteSectionCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveSectionCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\SetScriptDescriptionCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveBlockCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\AddBlockCommand.cs" />
     <Compile Include="Commands\IUndoableCommand.cs" />
     <Compile Include="Enums\BlockAction.cs" />

Filtration.ObjectModel/ItemFilterBlock.cs

@@ -14,7 +14,6 @@ namespace Filtration.ObjectModel
     public interface IItemFilterBlock : IItemFilterBlockBase
     {
         bool Enabled { get; set; }
-        event EventHandler EnabledStatusChanged;
         string Description { get; set; }
         ItemFilterBlockGroup BlockGroup { get; set; }
         BlockAction Action { get; set; }
@@ -89,7 +88,6 @@ namespace Filtration.ObjectModel
         {
             BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
             BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
-            ActionBlockItem.PropertyChanged += OnActionBlockItemChanged;
             _enabled = true;
         }
 
@@ -97,7 +95,6 @@ namespace Filtration.ObjectModel
         {
             BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
             BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
-            ActionBlockItem.PropertyChanged += OnActionBlockItemChanged;
             _enabled = true;
         }
 
@@ -108,16 +105,8 @@ namespace Filtration.ObjectModel
             {
                 _enabled = value;
                 IsEdited = true;
-                EnabledStatusChanged?.Invoke(null, null);
-                if(BlockGroup != null && BlockGroup.IsEnableChecked != value)
-                {
-                    BlockGroup.IsEnableChecked = value;
-                }
             }
         }
-
-        public event EventHandler EnabledStatusChanged;
-
         public string Description
         {
             get { return _description; }
@@ -176,13 +165,6 @@ namespace Filtration.ObjectModel
         {
             IsEdited = true;
         }
-        private void OnActionBlockItemChanged(object sender, EventArgs e)
-        {
-            if (BlockGroup != null && BlockGroup.IsShowChecked != (Action == BlockAction.Show))
-            {
-                BlockGroup.IsShowChecked = (Action == BlockAction.Show);
-            }
-        }
 
         public bool AddBlockItemAllowed(Type type)
         {
@@ -216,23 +198,14 @@ namespace Filtration.ObjectModel
         
         private void OnBlockGroupStatusChanged(object sender, EventArgs e)
         {
-            if (BlockGroup.IsShowChecked == false && Action == BlockAction.Show)
+            if (BlockGroup.IsChecked == false && Action == BlockAction.Show)
             {
                 Action = BlockAction.Hide;
             }
-            else if (BlockGroup.IsShowChecked == true && Action == BlockAction.Hide)
+            else if (BlockGroup.IsChecked && Action == BlockAction.Hide)
             {
                 Action = BlockAction.Show;
             }
-
-            if (BlockGroup.IsEnableChecked == false && Enabled)
-            {
-                Enabled = false;
-            }
-            else if (BlockGroup.IsEnableChecked == true && !Enabled)
-            {
-                Enabled = true;
-            }
         }
 
         public Color DisplayTextColor
@@ -270,7 +243,7 @@ namespace Filtration.ObjectModel
             get
             {
                 var backgroundColorBlockItem = BlockItems.OfType<BackgroundColorBlockItem>().FirstOrDefault();
-                return backgroundColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 };
+                return backgroundColorBlockItem?.Color ?? new Color { A = 255, R = 0, G = 0, B = 0 };
             }
         }
 
@@ -279,7 +252,7 @@ namespace Filtration.ObjectModel
             get
             {
                 var borderColorBlockItem = BlockItems.OfType<BorderColorBlockItem>().FirstOrDefault();
-                return borderColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 };
+                return borderColorBlockItem?.Color ?? new Color { A = 255, R = 0, G = 0, B = 0 };
             }
         }
 

Filtration.ObjectModel/ItemFilterBlockGroup.cs

@@ -5,34 +5,31 @@ namespace Filtration.ObjectModel
 {
     public class ItemFilterBlockGroup
     {
-        private bool? _isShowChecked;
+        private bool _isChecked;
-        private bool? _isEnableChecked;
 
-        public ItemFilterBlockGroup(string groupName, ItemFilterBlockGroup parent, bool advanced = false, bool isLeafNode = false)
+        public ItemFilterBlockGroup(string groupName, ItemFilterBlockGroup parent, bool advanced = false)
         {
             GroupName = groupName;
             ParentGroup = parent;
             Advanced = advanced;
             ChildGroups = new List<ItemFilterBlockGroup>();
-            IsLeafNode = isLeafNode;
         }
 
-        public string GroupName { get; }
-        public ItemFilterBlockGroup ParentGroup { get; set; }
-        public List<ItemFilterBlockGroup> ChildGroups { get; }
-        public bool Advanced { get; }
-        public bool IsLeafNode { get; }
-
         public event EventHandler BlockGroupStatusChanged;
 
-        public bool? IsShowChecked
+        public string GroupName { get; }
+        public ItemFilterBlockGroup ParentGroup { get; }
+        public List<ItemFilterBlockGroup> ChildGroups { get; }
+        public bool Advanced { get; }
+
+        public bool IsChecked
         {
-            get { return _isShowChecked; }
+            get { return _isChecked; }
             set
             {
-                if (value != _isShowChecked)
+                if (value != _isChecked)
                 {
-                    _isShowChecked = value;
+                    _isChecked = value;
                     // Raise an event to let blocks that have this block group assigned that
                     // they might need to change their Action due to the block group status changing.
                     BlockGroupStatusChanged?.Invoke(null, null);
@@ -40,85 +37,20 @@ namespace Filtration.ObjectModel
             }
         }
 
-        public bool? IsEnableChecked
-        {
-            get { return _isEnableChecked; }
-            set
-            {
-                if (value != _isEnableChecked)
-                {
-                    _isEnableChecked = value;
-                    // Raise an event to let blocks that have this block group assigned that
-                    // they might need to change their Enabled due to the block group status changing.
-                    BlockGroupStatusChanged?.Invoke(null, null);
-                }
-            }
-        }
-
-        public void ClearStatusChangeSubscribers()
-        {
-            BlockGroupStatusChanged = null;
-        }
-
-        public void AddOrJoinBlockGroup(ItemFilterBlockGroup blockGroup)
-        {
-            var childIndex = ChildGroups.FindIndex(item => item.GroupName.Equals(blockGroup.GroupName));
-            if (!blockGroup.IsLeafNode && childIndex >= 0)
-            {
-                while(blockGroup.ChildGroups.Count > 0)
-                {
-                    ChildGroups[childIndex].AddOrJoinBlockGroup(blockGroup.ChildGroups[0]);
-                }
-            }
-            else
-            {
-                if(blockGroup.ParentGroup != null)
-                {
-                    blockGroup.ParentGroup.ChildGroups.Remove(blockGroup);
-                }
-                blockGroup.ParentGroup = this;
-                ChildGroups.Add(blockGroup);
-            }
-        }
-
-        public void DetachSelf(bool keepChildren)
-        {
-            if(ParentGroup == null)
-                return;
-
-            if(IsLeafNode && ParentGroup.ParentGroup != null && ParentGroup.ChildGroups.Count < 2)
-            {
-                ParentGroup.DetachSelf(false);
-            }
-            else
-            {
-                ParentGroup.ChildGroups.Remove(this);
-
-                if (keepChildren)
-                {
-                    foreach(var child in ChildGroups)
-                    {
-                        ParentGroup.AddOrJoinBlockGroup(child);
-                    }
-                }
-
-                ParentGroup = null;
-            }
-        }
-
         public override string ToString()
         {
-            if(ParentGroup == null)
+            var currentBlockGroup = this;
-            {
-                return string.Empty;
-            }
 
             var outputString = (Advanced ? "~" : string.Empty) + GroupName;
 
-            var parentOutput = ParentGroup.ToString();
+            // TODO: This is retarded, fix this.
-            if(!string.IsNullOrWhiteSpace(parentOutput))
+            if (currentBlockGroup.ParentGroup != null)
             {
-                outputString = parentOutput + (IsLeafNode ? string.Empty : " - " + outputString);
+                while (currentBlockGroup.ParentGroup.ParentGroup != null)
+                {
+                    outputString = (currentBlockGroup.ParentGroup.Advanced ? "~" : string.Empty) + currentBlockGroup.ParentGroup.GroupName + " - " + outputString;
+                    currentBlockGroup = currentBlockGroup.ParentGroup;
+                }
             }
 
             return outputString;

Filtration.ObjectModel/PathOfExileNamedColors.cs

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

Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs

@@ -93,10 +93,5 @@ namespace Filtration.ObjectModel.ThemeEditor
                 Items.Count(c => c.ComponentName == componentName && c.ComponentType == componentType);
             return componentCount > 0;
         }
-
-        public bool ComponentExists(ThemeComponent themeComponent)
-        {
-            return ComponentExists(themeComponent.ComponentType, themeComponent.ComponentName);
-        }
     }
 }

Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs

@@ -7,6 +7,6 @@ namespace Filtration.Parser.Interface.Services
     {
         void Initialise(ItemFilterBlockGroup rootBlockGroup);
         void Cleanup();
-        ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings, bool show, bool enabled);
+        ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings);
     }
 }

Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs

@@ -5,7 +5,6 @@ namespace Filtration.Parser.Interface.Services
     public interface IItemFilterScriptTranslator
     {
         IItemFilterScript TranslateStringToItemFilterScript(string inputString);
-        IItemFilterScript TranslatePastedStringToItemFilterScript(string inputString, bool blockGroupsEnabled);
         string TranslateItemFilterScriptToString(IItemFilterScript script);
     }
 }

Filtration.Parser.Tests/Services/TestBlockGroupHierarchyBuilder.cs

@@ -18,11 +18,11 @@ namespace Filtration.Parser.Tests.Services
             var builder = new BlockGroupHierarchyBuilder();
 
             // Act
-            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
             
             // Assert
             Assert.AreEqual(1, rootBlock.ChildGroups.Count);
-            Assert.AreEqual("Sub Block Group", result.ParentGroup.GroupName);
+            Assert.AreEqual("Sub Block Group", result.GroupName);
         }
 
         [Test]
@@ -35,11 +35,11 @@ namespace Filtration.Parser.Tests.Services
             var builder = new BlockGroupHierarchyBuilder();
 
             // Act
-            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
 
             // Assert
             Assert.AreEqual(1, rootBlock.ChildGroups.Count);
-            Assert.AreEqual("Block Group", result.ParentGroup.GroupName);
+            Assert.AreEqual("Block Group", result.GroupName);
         }
 
         [Test]
@@ -52,12 +52,12 @@ namespace Filtration.Parser.Tests.Services
             var builder = new BlockGroupHierarchyBuilder();
 
             // Act
-            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
 
             // Assert
             Assert.AreEqual(1, rootBlock.ChildGroups.Count);
-            Assert.AreEqual("Block Group", result.ParentGroup.GroupName);
+            Assert.AreEqual("Block Group", result.GroupName);
-            Assert.AreEqual(true, result.ParentGroup.Advanced);
+            Assert.AreEqual(true, result.Advanced);
         }
 
         [Test]
@@ -70,11 +70,11 @@ namespace Filtration.Parser.Tests.Services
             var builder = new BlockGroupHierarchyBuilder();
 
             // Act
-            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
 
             // Assert
             Assert.AreEqual(1, rootBlock.ChildGroups.Count);
-            Assert.AreEqual(true, result.ParentGroup.Advanced);
+            Assert.AreEqual(true, result.Advanced);
         }
 
         [Test]
@@ -90,12 +90,12 @@ namespace Filtration.Parser.Tests.Services
             var builder = new BlockGroupHierarchyBuilder();
 
             // Act
-            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
 
             // Assert
             Assert.AreEqual(1, rootBlock.ChildGroups.Count);
-            Assert.AreEqual("Block Group", result.ParentGroup.GroupName);
+            Assert.AreEqual("Block Group", result.GroupName);
-            Assert.AreEqual(true, result.ParentGroup.Advanced);
+            Assert.AreEqual(true, result.Advanced);
         }
 
         [Test]
@@ -107,15 +107,15 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
             var inputStrings = new List<string> { "Block Group" };
-            builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
             inputStrings = new List<string> { "Block Group 2" };
-            builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
             inputStrings = new List<string> { "Block Group", "Sub Block Group" };
-            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock, true, true);
+            var result = builder.IntegrateStringListIntoBlockGroupHierarchy(inputStrings, rootBlock);
 
             // Assert
             Assert.AreEqual(2, rootBlock.ChildGroups.Count);
-            Assert.AreEqual("Sub Block Group", result.ParentGroup.GroupName);
+            Assert.AreEqual("Sub Block Group", result.GroupName);
         }
     }
 }

Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs

@@ -48,7 +48,7 @@ namespace Filtration.Parser.Tests.Services
 
             var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
             _testUtility.MockBlockGroupHierarchyBuilder
-                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true))
+                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()))
                 .Returns(inputBlockGroup);
 
             // Act
@@ -94,7 +94,7 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var inputString = "HideDisabled" + Environment.NewLine +
                               "    ItemLevel >= 55";
-            
+
             // Act
             var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
@@ -119,9 +119,8 @@ namespace Filtration.Parser.Tests.Services
             var blockItem = result.BlockItems.OfType<ItemLevelBlockItem>().First();
             Assert.AreEqual(55, blockItem.FilterPredicate.PredicateOperand);
             Assert.AreEqual(FilterPredicateOperator.GreaterThanOrEqual, blockItem.FilterPredicate.PredicateOperator);
-        }
+        }
-
+
-        [Ignore("Update required, ItemFilterBlockTranslator does not set IsShowChecked anymore")]
         [Test]
         public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_ShowBlock_SetsBlockGroupIsCheckedCorrectly()
         {
@@ -130,14 +129,13 @@ namespace Filtration.Parser.Tests.Services
             var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
 
             // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true)).Returns(inputBlockGroup).Verifiable();
+            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
             _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
-            Assert.AreEqual(true, inputBlockGroup.IsShowChecked);
+            Assert.AreEqual(true, inputBlockGroup.IsChecked);
         }
 
-        [Ignore("Update required, ItemFilterBlockTranslator does not set IsShowChecked anymore")]
         [Test]
         public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_HideBlock_SetsBlockGroupIsCheckedCorrectly()
         {
@@ -146,11 +144,11 @@ namespace Filtration.Parser.Tests.Services
             var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
 
             // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), false, true)).Returns(inputBlockGroup).Verifiable();
+            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
             _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
-            Assert.AreEqual(false, inputBlockGroup.IsShowChecked);
+            Assert.AreEqual(false, inputBlockGroup.IsChecked);
         }
 
         [Test]
@@ -161,7 +159,7 @@ namespace Filtration.Parser.Tests.Services
             var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
 
             // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true)).Returns(inputBlockGroup).Verifiable();
+            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
             _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
@@ -175,11 +173,11 @@ namespace Filtration.Parser.Tests.Services
             var inputString = "Show" + Environment.NewLine;
 
             // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true)).Verifiable();
+            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Verifiable();
             _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
-            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true), Times.Never);
+            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()), Times.Never);
         }
 
         [Test]
@@ -192,7 +190,7 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
-            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true), Times.Never);
+            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()), Times.Never);
         }
 
         [Test]
@@ -204,7 +202,7 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
             _testUtility.MockBlockGroupHierarchyBuilder
-                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.Is<IEnumerable<string>>(s => s.Contains("Test Block Group") && s.Contains("Test Sub Block Group") && s.Contains("Test Another Block Group")), true, true))
+                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.Is<IEnumerable<string>>(s => s.Contains("Test Block Group") && s.Contains("Test Sub Block Group") && s.Contains("Test Another Block Group"))))
                 .Returns(testBlockGroup)
                 .Verifiable();
 
@@ -224,7 +222,7 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
             _testUtility.MockBlockGroupHierarchyBuilder
-                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.Is<IEnumerable<string>>(s => s.Contains("AAA-BBB-CCC")), true, true))
+                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.Is<IEnumerable<string>>(s => s.Contains("AAA-BBB-CCC"))))
                 .Returns(testBlockGroup)
                 .Verifiable();
 
@@ -246,7 +244,7 @@ namespace Filtration.Parser.Tests.Services
 
             // Assert
             Assert.IsNull(result.BlockGroup);
-            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, true), Times.Never);
+            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()), Times.Never);
         }
 
         [Test]
@@ -374,37 +372,37 @@ namespace Filtration.Parser.Tests.Services
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_ElderItem_ReturnsCorrectObject()
+        public void TranslateStringToItemFilterBlock_ElderItem_ReturnsCorrectObject()
-        {
+        {
-            // Arrange
+            // Arrange
-            var inputString = "Show" + Environment.NewLine +
+            var inputString = "Show" + Environment.NewLine +
-                              "    ElderItem False";
+                              "    ElderItem False";
-
+
-            // Act
+            // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
-
+
-            // Assert
+            // Assert
-
+
-            Assert.AreEqual(1, result.BlockItems.Count(b => b is ElderItemBlockItem));
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is ElderItemBlockItem));
-            var blockItem = result.BlockItems.OfType<ElderItemBlockItem>().First();
+            var blockItem = result.BlockItems.OfType<ElderItemBlockItem>().First();
-            Assert.IsFalse(blockItem.BooleanValue);
+            Assert.IsFalse(blockItem.BooleanValue);
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_ShaperItem_ReturnsCorrectObject()
+        public void TranslateStringToItemFilterBlock_ShaperItem_ReturnsCorrectObject()
-        {
+        {
-            // Arrange
+            // Arrange
-            var inputString = "Show" + Environment.NewLine +
+            var inputString = "Show" + Environment.NewLine +
-                              "    ShaperItem True";
+                              "    ShaperItem True";
-
+
-            // Act
+            // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
-
+
-            // Assert
+            // Assert
-
+
-            Assert.AreEqual(1, result.BlockItems.Count(b => b is ShaperItemBlockItem));
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is ShaperItemBlockItem));
-            var blockItem = result.BlockItems.OfType<ShaperItemBlockItem>().First();
+            var blockItem = result.BlockItems.OfType<ShaperItemBlockItem>().First();
-            Assert.IsTrue(blockItem.BooleanValue);
+            Assert.IsTrue(blockItem.BooleanValue);
         }
 
         [Test]
@@ -426,37 +424,37 @@ namespace Filtration.Parser.Tests.Services
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_ShapedMap_ReturnsCorrectObject()
+        public void TranslateStringToItemFilterBlock_ShapedMap_ReturnsCorrectObject()
-        {
+        {
-            // Arrange
+            // Arrange
-            var inputString = "Show" + Environment.NewLine +
+            var inputString = "Show" + Environment.NewLine +
-                              "    ShapedMap false";
+                              "    ShapedMap false";
-
+
-            // Act
+            // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
-
+
-            // Assert
+            // Assert
-
+
-            Assert.AreEqual(1, result.BlockItems.Count(b => b is ShapedMapBlockItem));
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is ShapedMapBlockItem));
-            var blockItem = result.BlockItems.OfType<ShapedMapBlockItem>().First();
+            var blockItem = result.BlockItems.OfType<ShapedMapBlockItem>().First();
-            Assert.IsFalse(blockItem.BooleanValue);
+            Assert.IsFalse(blockItem.BooleanValue);
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_ElderMap_ReturnsCorrectObject()
+        public void TranslateStringToItemFilterBlock_ElderMap_ReturnsCorrectObject()
-        {
+        {
-            // Arrange
+            // Arrange
-            var inputString = "Show" + Environment.NewLine +
+            var inputString = "Show" + Environment.NewLine +
-                              "    ElderMap false";
+                              "    ElderMap false";
-
+
-            // Act
+            // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
-
+
-            // Assert
+            // Assert
-
+
-            Assert.AreEqual(1, result.BlockItems.Count(b => b is ElderMapBlockItem));
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is ElderMapBlockItem));
-            var blockItem = result.BlockItems.OfType<ElderMapBlockItem>().First();
+            var blockItem = result.BlockItems.OfType<ElderMapBlockItem>().First();
-            Assert.IsFalse(blockItem.BooleanValue);
+            Assert.IsFalse(blockItem.BooleanValue);
         }
 
         [Test]
@@ -793,9 +791,9 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var inputString = "Show" + Environment.NewLine +
                               "    SetTextColor 255 20 100 # Rare Item Text";
-            var testComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Rare Item Text", new Color { A = 240, R = 255, G = 20, B = 100});
+            var testComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Rare Item Text", new Color { R = 255, G = 20, B = 100});
             var testInputThemeComponentCollection = new ThemeComponentCollection { testComponent };
-            
+
             // Act
             var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.ThemeComponentCollection == testInputThemeComponentCollection));
 
@@ -896,22 +894,22 @@ namespace Filtration.Parser.Tests.Services
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_DisableDropSound_ReturnsCorrectObject()
+        public void TranslateStringToItemFilterBlock_DisableDropSound_ReturnsCorrectObject()
-        {
+        {
-            // Arrange
+            // Arrange
-            var inputString = "Show" + Environment.NewLine +
+            var inputString = "Show" + Environment.NewLine +
-                              "    DisableDropSound True";
+                              "    DisableDropSound True";
-
+
-            // Act
+            // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
-
+
-            // Assert
+            // Assert
-
+
-            Assert.AreEqual(1, result.BlockItems.Count(b => b is DisableDropSoundBlockItem));
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is DisableDropSoundBlockItem));
-            var blockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
+            var blockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
-            Assert.IsTrue(blockItem.BooleanValue);
+            Assert.IsTrue(blockItem.BooleanValue);
-        }
+        }
-
+
         [Test]
         public void TranslateStringToItemFilterBlock_Everything_ReturnsCorrectObject()
         {
@@ -1046,7 +1044,7 @@ namespace Filtration.Parser.Tests.Services
 
             var fontSizeblockItem = result.BlockItems.OfType<FontSizeBlockItem>().First();
             Assert.AreEqual(50, fontSizeblockItem.Value);
-            
+
             Assert.AreEqual(0, result.BlockItems.OfType<SoundBlockItem>().Count());
 
             var disableDropSoundBlockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
@@ -1089,9 +1087,9 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
 
             var inputString = "Show" + Environment.NewLine +
-                              "    ItemLevel >= 70" + Environment.NewLine + 
+                              "    ItemLevel >= 70" + Environment.NewLine +
-                              "    ItemLevel <= 80" + Environment.NewLine + 
+                              "    ItemLevel <= 80" + Environment.NewLine +
-                              "    Quality = 15" + Environment.NewLine + 
+                              "    Quality = 15" + Environment.NewLine +
                               "    Quality < 17";
 
             // Act
@@ -1152,7 +1150,7 @@ namespace Filtration.Parser.Tests.Services
             var blockItem = result.BlockItems.OfType<FontSizeBlockItem>().First();
             Assert.AreEqual(27, blockItem.Value);
         }
-        
+
         [Test]
         public void TranslateStringToItemFilterBlock_MultipleSoundItems_OnlyLastOneUsed()
         {
@@ -1308,6 +1306,86 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(ItemRarity.Magic, (ItemRarity)rarityBlockItem.FilterPredicate.PredicateOperand);
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundDocumentsFile()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundDocumentsRelativeFile()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"Sounds\test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("Sounds\test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundFullBackSlashPath()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"C:\\Sounds\\test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("C:\\Sounds\\test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundFullForwardSlashPath()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"C:/Sounds/test.mp3\"";
+
+            //Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("C:/Sounds/test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundFullMixedPath()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"C:\\Sounds/test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("C:\\Sounds/test.mp3", customSoundBlockItem.Value);
+        }
+
         [Test]
         public void TranslateItemFilterBlockToString_NothingPopulated_ReturnsCorrectString()
         {
@@ -1328,13 +1406,13 @@ namespace Filtration.Parser.Tests.Services
         {
             // Arrange
             var expectedResult = "Show # Child 1 Block Group - Child 2 Block Group";
-            
+
             var rootBlockGroup = new ItemFilterBlockGroup("Root Block Group", null);
             var child1BlockGroup = new ItemFilterBlockGroup("Child 1 Block Group", rootBlockGroup);
             var child2BlockGroup = new ItemFilterBlockGroup("Child 2 Block Group", child1BlockGroup);
-            _testUtility.TestBlock.BlockGroup = child2BlockGroup;
+            _testUtility.TestBlock.BlockGroup = child2BlockGroup;
-
+
-            // TODO: Shouldn't be set to edited this way
+            // TODO: Shouldn't be set to edited this way
             _testUtility.TestBlock.IsEdited = true;
             // Act
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
@@ -1737,7 +1815,7 @@ namespace Filtration.Parser.Tests.Services
             var expectedResult = "Show" + Environment.NewLine +
                                  "    SetTextColor 54 102 255";
 
-            _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 240, R = 54, G = 102, B = 255}));
+            _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255}));
 
             // Act
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
@@ -1753,7 +1831,7 @@ namespace Filtration.Parser.Tests.Services
             var expectedResult = "Show" + Environment.NewLine +
                                  "    SetTextColor 54 102 255 # Test Theme Component";
 
-            var blockItem = new TextColorBlockItem(new Color {A = 240, R = 54, G = 102, B = 255})
+            var blockItem = new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255})
             {
                 ThemeComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Test Theme Component", new Color())
             };
@@ -1853,7 +1931,7 @@ namespace Filtration.Parser.Tests.Services
         {
             // Arrange
             var expectedResult = "Show" + Environment.NewLine +
-                                 "    ItemLevel > 56" + Environment.NewLine + 
+                                 "    ItemLevel > 56" + Environment.NewLine +
                                  "    ItemLevel >= 45" + Environment.NewLine +
                                  "    ItemLevel < 100";
 
@@ -1895,7 +1973,7 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var expectedResult = "#Show" + Environment.NewLine +
                                  "#    Width = 4";
-                                 
+
 
             _testUtility.TestBlock.Enabled = false;
             _testUtility.TestBlock.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 4));
@@ -1942,7 +2020,7 @@ namespace Filtration.Parser.Tests.Services
                                  "    DisableDropSound True" + Environment.NewLine +
                                  "    MinimapIcon 1 Blue Circle" + Environment.NewLine +
                                  "    PlayEffect Red Temp" + Environment.NewLine +
-                                 "    CustomAlertSound \"test.mp3\"";
+                                 "    CustomAlertSound \"test.mp3\"";
 
             _testUtility.TestBlock.BlockItems.Add(new ActionBlockItem(BlockAction.Show));
             _testUtility.TestBlock.BlockItems.Add(new IdentifiedBlockItem(true));
@@ -1977,8 +2055,8 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new HeightBlockItem(FilterPredicateOperator.LessThanOrEqual, 6));
             _testUtility.TestBlock.BlockItems.Add(new HeightBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 2));
             _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 56, R = 255, G = 89, B = 0}));
-            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 240, R = 0, G = 0, B = 0 }));
+            _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 255, R = 0, G = 0, B = 0 }));
-            _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem(new Color { A = 240, R = 255, G = 1, B = 254 }));
+            _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem(new Color { A = 255, R = 255, G = 1, B = 254 }));
             _testUtility.TestBlock.BlockItems.Add(new FontSizeBlockItem(50));
             _testUtility.TestBlock.BlockItems.Add(new SoundBlockItem("6", 90));
             _testUtility.TestBlock.BlockItems.Add(new ElderItemBlockItem(true));
@@ -2010,12 +2088,12 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
             _testUtility.Translator.ReplaceAudioVisualBlockItemsFromString(testInputBlockItems, testInputString);
-            
+
             // Assert
             var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem;
             Assert.IsNotNull(textColorBlockItem);
             Assert.AreNotSame(testInputBlockItem, textColorBlockItem);
-            Assert.AreEqual(new Color { R = 240, G = 200, B = 150, A = 240}, textColorBlockItem.Color);
+            Assert.AreEqual(new Color { R = 240, G = 200, B = 150, A = 255}, textColorBlockItem.Color);
         }
 
         [Test]
@@ -2085,7 +2163,7 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var testInputString = "SetTextColor 240 200 150 # Rarest Currency" + Environment.NewLine +
                                   "SetBackgroundColor 0 0 0 # Rarest Currency Background" + Environment.NewLine +
-                                  "SetBorderColor 255 255 255 # Rarest Currency Border" + Environment.NewLine + 
+                                  "SetBorderColor 255 255 255 # Rarest Currency Border" + Environment.NewLine +
                                   "PlayAlertSound 7 280";
 
             var testInputBlockItems = new ObservableCollection<IItemFilterBlockItem>();
@@ -2106,17 +2184,17 @@ namespace Filtration.Parser.Tests.Services
             var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem;
             Assert.IsNotNull(textColorBlockItem);
             Assert.AreNotSame(testInputTextColorBlockItem, textColorBlockItem);
-            Assert.AreEqual(new Color {A = 240, R = 240, G = 200, B = 150}, textColorBlockItem.Color);
+            Assert.AreEqual(new Color {A = 255, R = 240, G = 200, B = 150}, textColorBlockItem.Color);
 
             var backgroundColorBlockItem = testInputBlockItems.First(b => b is BackgroundColorBlockItem) as BackgroundColorBlockItem;
             Assert.IsNotNull(backgroundColorBlockItem);
             Assert.AreNotSame(testInputBackgroundColorBlockItem, backgroundColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color);
 
             var borderColorBlockItem = testInputBlockItems.First(b => b is BorderColorBlockItem) as BorderColorBlockItem;
             Assert.IsNotNull(borderColorBlockItem);
             Assert.AreNotSame(testInputBorderColorBlockItem, borderColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color);
 
             var soundBlockItem = testInputBlockItems.First(b => b is SoundBlockItem) as SoundBlockItem;
             Assert.IsNotNull(soundBlockItem);
@@ -2131,9 +2209,9 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var testInputString = "SetTextColor 240 200 150 # Rarest Currency" + Environment.NewLine +
                                   "SetBackgroundColor 0 0 0 # Rarest Currency Background" + Environment.NewLine +
-                                  "SetBorderColor 255 255 255 # Rarest Currency Border" + Environment.NewLine + 
+                                  "SetBorderColor 255 255 255 # Rarest Currency Border" + Environment.NewLine +
                                   "PlayAlertSound 7 280";
-            
+
             var testInputBlockItems = new ObservableCollection<IItemFilterBlockItem>();
 
             // Act
@@ -2142,15 +2220,15 @@ namespace Filtration.Parser.Tests.Services
             // Assert
             var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem;
             Assert.IsNotNull(textColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 240, G = 200, B = 150 }, textColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 240, G = 200, B = 150 }, textColorBlockItem.Color);
 
             var backgroundColorBlockItem = testInputBlockItems.First(b => b is BackgroundColorBlockItem) as BackgroundColorBlockItem;
             Assert.IsNotNull(backgroundColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color);
 
             var borderColorBlockItem = testInputBlockItems.First(b => b is BorderColorBlockItem) as BorderColorBlockItem;
             Assert.IsNotNull(borderColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color);
 
             var soundBlockItem = testInputBlockItems.First(b => b is SoundBlockItem) as SoundBlockItem;
             Assert.IsNotNull(soundBlockItem);
@@ -2179,11 +2257,11 @@ namespace Filtration.Parser.Tests.Services
             // Assert
             var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem;
             Assert.IsNotNull(textColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 240, G = 200, B = 150 }, textColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 240, G = 200, B = 150 }, textColorBlockItem.Color);
 
             var backgroundColorBlockItem = testInputBlockItems.First(b => b is BackgroundColorBlockItem) as BackgroundColorBlockItem;
             Assert.IsNotNull(backgroundColorBlockItem);
-            Assert.AreEqual(new Color { A = 240, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color);
+            Assert.AreEqual(new Color { A = 255, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color);
 
             Assert.AreEqual(0, testInputBlockItems.Count(b => b is BorderColorBlockItem));
         }
@@ -2203,9 +2281,9 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.Translator.ReplaceAudioVisualBlockItemsFromString(testInputBlockItems, testInputString);
 
             // Assert
-            
+
         }
-        
+
         private class ItemFilterBlockTranslatorTestUtility
         {
             public ItemFilterBlockTranslatorTestUtility()

Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs

@@ -119,7 +119,7 @@ namespace Filtration.Parser.Tests.Services
                     "	Class \"Life Flasks\" \"Mana Flasks\"" + Environment.NewLine +
                     "	Rarity Normal	"
                 )
-            } && s.ItemFilterBlockGroups == new ObservableCollection<ItemFilterBlockGroup> { new ItemFilterBlockGroup("Root", null, false, false) }
+            } && s.ItemFilterBlockGroups == new ObservableCollection<ItemFilterBlockGroup> { new ItemFilterBlockGroup("Root", null, false) }
             && s.ThemeComponents == new ThemeComponentCollection() 
             && s.ItemFilterScriptSettings == new ItemFilterScriptSettings(new ThemeComponentCollection())
             && s.Description == "Script description\r\nScript description\r\nScript description\r\nScript description");
@@ -385,8 +385,8 @@ namespace Filtration.Parser.Tests.Services
 
             var mockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
             mockBlockGroupHierarchyBuilder.Setup(
-                    b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>(), true, false))
+                    b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()))
-                .Returns(new ItemFilterBlockGroup("My Block Group", null, false, true));
+                .Returns(new ItemFilterBlockGroup("My Block Group", null));
 
             var blockTranslator = new ItemFilterBlockTranslator(mockBlockGroupHierarchyBuilder.Object);
             

Filtration.Parser/Services/BlockGroupHierarchyBuilder.cs

@@ -20,16 +20,16 @@ namespace Filtration.Parser.Services
             _rootBlockGroup = null;
         }
 
-        public ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings, bool show, bool enabled)
+        public ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings)
         {
             if (_rootBlockGroup == null)
             {
                 throw new Exception("BlockGroupHierarchyBuilder must be initialised with root BlockGroup before use");
             }
-            return IntegrateStringListIntoBlockGroupHierarchy(groupStrings, _rootBlockGroup, show, enabled);
+            return IntegrateStringListIntoBlockGroupHierarchy(groupStrings, _rootBlockGroup);
         }
 
-        public ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings, ItemFilterBlockGroup startItemGroup, bool show, bool enabled)
+        public ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable<string> groupStrings, ItemFilterBlockGroup startItemGroup)
         {
             var inputGroups = groupStrings.ToList();
             var firstGroup = inputGroups.First().Trim();
@@ -47,47 +47,12 @@ namespace Filtration.Parser.Services
             if (matchingChildItemGroup == null)
             {
                 var newItemGroup = CreateBlockGroup(inputGroups.First().Trim(), startItemGroup);
-                newItemGroup.IsShowChecked = show;
-                newItemGroup.IsEnableChecked = enabled;
                 startItemGroup.ChildGroups.Add(newItemGroup);
                 inputGroups = inputGroups.Skip(1).ToList();
-                if (inputGroups.Count > 0)
+                return inputGroups.Count > 0 ? IntegrateStringListIntoBlockGroupHierarchy(inputGroups, newItemGroup) : newItemGroup;
-                {
-                    return IntegrateStringListIntoBlockGroupHierarchy(inputGroups, newItemGroup, show, enabled);
-                }
-                else
-                {
-                    var leafNode = new ItemFilterBlockGroup("", newItemGroup, false, true);
-                    leafNode.IsShowChecked = show;
-                    leafNode.IsEnableChecked = enabled;
-                    newItemGroup.ChildGroups.Add(leafNode);
-                    return leafNode;
-                }
-            }
-            else
-            {
-                if(matchingChildItemGroup.IsShowChecked != show)
-                {
-                    matchingChildItemGroup.IsShowChecked = null;
-                }
-                if (matchingChildItemGroup.IsEnableChecked != enabled)
-                {
-                    matchingChildItemGroup.IsEnableChecked = null;
-                }
             }
             inputGroups = inputGroups.Skip(1).ToList();
-            if(inputGroups.Count > 0)
+            return inputGroups.Count > 0 ? IntegrateStringListIntoBlockGroupHierarchy(inputGroups, matchingChildItemGroup) : matchingChildItemGroup;
-            {
-                return IntegrateStringListIntoBlockGroupHierarchy(inputGroups, matchingChildItemGroup, show, enabled);
-            }
-            else
-            {
-                var leafNode = new ItemFilterBlockGroup("", matchingChildItemGroup, false, true);
-                leafNode.IsShowChecked = show;
-                leafNode.IsEnableChecked = enabled;
-                matchingChildItemGroup.ChildGroups.Add(leafNode);
-                return leafNode;
-            }
         }
 
         private ItemFilterBlockGroup CreateBlockGroup(string groupNameString, ItemFilterBlockGroup parentGroup)

Filtration.Parser/Services/ItemFilterBlockTranslator.cs

@@ -32,7 +32,8 @@ namespace Filtration.Parser.Services
         // Converts a string into an ItemFilterCommentBlock maintaining newlines and spaces but removing # characters
         public IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript, string originalString = "")
         {
-            var itemFilterCommentBlock = new ItemFilterCommentBlock(parentItemFilterScript) {OriginalText = originalString};
+            var itemFilterCommentBlock = new ItemFilterCommentBlock(parentItemFilterScript);
+            itemFilterCommentBlock.OriginalText = originalString;
 
             foreach (var line in new LineReader(() => new StringReader(inputString)))
             {
@@ -40,13 +41,13 @@ namespace Filtration.Parser.Services
                 itemFilterCommentBlock.Comment += trimmedLine + Environment.NewLine;
             }
 
-            itemFilterCommentBlock.Comment = itemFilterCommentBlock.Comment.TrimEnd('\r', '\n');
+            itemFilterCommentBlock.Comment = itemFilterCommentBlock.Comment.TrimEnd('\r', '\n');
-
+
             itemFilterCommentBlock.IsEdited = false;
             return itemFilterCommentBlock;
         }
 
-        // This method converts a string into a ItemFilterBlock. This is used for pasting ItemFilterBlocks 
+        // This method converts a string into a ItemFilterBlock. This is used for pasting ItemFilterBlocks
         // and reading ItemFilterScripts from a file.
         public IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, string originalString = "", bool initialiseBlockGroupHierarchyBuilder = false)
         {
@@ -64,20 +65,20 @@ namespace Filtration.Parser.Services
             {
                 if (line.StartsWith(@"#"))
                 {
-                    if(!showHideFound)
+                    if(!showHideFound)
-                    {
+                    {
-                        block.Description = line.TrimStart('#').TrimStart(' ');
+                        block.Description = line.TrimStart('#').TrimStart(' ');
                     }
-                    else
+                    else
-                    {
+                    {
-                        if(block.BlockItems.Count > 1)
+                        if(block.BlockItems.Count > 1)
-                        {
+                        {
-                            block.BlockItems.Last().Comment += Environment.NewLine + line.TrimStart('#');
+                            block.BlockItems.Last().Comment += Environment.NewLine + line.TrimStart('#');
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                            block.ActionBlockItem.Comment += Environment.NewLine + line.TrimStart('#');
+                            block.ActionBlockItem.Comment += Environment.NewLine + line.TrimStart('#');
-                        }
+                        }
                     }
                     continue;
                 }
@@ -86,10 +87,10 @@ namespace Filtration.Parser.Services
                 var trimmedLine = fullLine;
                 var blockComment = "";
                 var themeComponentType = -1;
-                if(trimmedLine.IndexOf('#') > 0)
+                if(trimmedLine.IndexOf('#') > 0)
-                {
+                {
-                    blockComment = trimmedLine.Substring(trimmedLine.IndexOf('#') + 1);
+                    blockComment = trimmedLine.Substring(trimmedLine.IndexOf('#') + 1);
-                    trimmedLine = trimmedLine.Substring(0, trimmedLine.IndexOf('#')).Trim();
+                    trimmedLine = trimmedLine.Substring(0, trimmedLine.IndexOf('#')).Trim();
                 }
                 var spaceOrEndOfLinePos = trimmedLine.IndexOf(" ", StringComparison.Ordinal) > 0 ? trimmedLine.IndexOf(" ", StringComparison.Ordinal) : trimmedLine.Length;
 
@@ -216,7 +217,8 @@ namespace Filtration.Parser.Services
 
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
 
-                        var blockItem = new TextColorBlockItem {Color = GetColorFromString(result[0].Groups[1].Value)};
+                        var blockItem = new TextColorBlockItem();
+                        blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
                         block.BlockItems.Add(blockItem);
                         themeComponentType = (int)ThemeComponentType.TextColor;
                         break;
@@ -228,7 +230,8 @@ namespace Filtration.Parser.Services
 
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
 
-                        var blockItem = new BackgroundColorBlockItem {Color = GetColorFromString(result[0].Groups[1].Value)};
+                        var blockItem = new BackgroundColorBlockItem();
+                        blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
                         block.BlockItems.Add(blockItem);
                         themeComponentType = (int)ThemeComponentType.BackgroundColor;
                         break;
@@ -240,7 +243,8 @@ namespace Filtration.Parser.Services
 
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
 
-                        var blockItem = new BorderColorBlockItem {Color = GetColorFromString(result[0].Groups[1].Value)};
+                        var blockItem = new BorderColorBlockItem();
+                        blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
                         block.BlockItems.Add(blockItem);
                         themeComponentType = (int)ThemeComponentType.BorderColor;
                         break;
@@ -268,33 +272,41 @@ namespace Filtration.Parser.Services
                         RemoveExistingBlockItemsOfType<CustomSoundBlockItem>(block);
 
                         var match = Regex.Match(trimmedLine, @"\S+\s+(\S+)\s?(\d+)?");
-                        
-                        if (match.Success)
-                        {
-                            string firstValue = match.Groups[1].Value;
 
-                            var secondValue = match.Groups[2].Success ? Convert.ToInt16(match.Groups[2].Value) : 79;
+                        if (match.Success)
-
+                        {
-                            if (lineOption == "PlayAlertSound")
+                            string firstValue = match.Groups[1].Value;
-                            {
+                            int secondValue;
-                                var blockItemValue = new SoundBlockItem
+
-                                {
+                            if (match.Groups[2].Success)
-                                    Value = firstValue,
+                            {
-                                    SecondValue = secondValue
+                                secondValue = Convert.ToInt16(match.Groups[2].Value);
-                                };
-                                block.BlockItems.Add(blockItemValue);
-                            }
-                            else
-                            {
-                                var blockItemValue = new PositionalSoundBlockItem
-                                {
-                                    Value = firstValue,
-                                    SecondValue = secondValue
-                                };
-                                block.BlockItems.Add(blockItemValue);
                             }
-                            themeComponentType = (int)ThemeComponentType.AlertSound;
+                            else
-                        }
+                            {
+                                secondValue = 79;
+                            }
+
+                            if (lineOption == "PlayAlertSound")
+                            {
+                                var blockItemValue = new SoundBlockItem
+                                {
+                                    Value = firstValue,
+                                    SecondValue = secondValue
+                                };
+                                block.BlockItems.Add(blockItemValue);
+                            }
+                            else
+                            {
+                                var blockItemValue = new PositionalSoundBlockItem
+                                {
+                                    Value = firstValue,
+                                    SecondValue = secondValue
+                                };
+                                block.BlockItems.Add(blockItemValue);
+                            }
+                            themeComponentType = (int)ThemeComponentType.AlertSound;
+                        }
                         break;
                     }
                     case "GemLevel":
@@ -329,49 +341,49 @@ namespace Filtration.Parser.Services
                     {
                         // Only ever use the last Icon item encountered as multiples aren't valid.
                         RemoveExistingBlockItemsOfType<MapIconBlockItem>(block);
-                        
+
                         // 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)
+                        if (match.Success)
-                        {
+                        {
                             var blockItemValue = new MapIconBlockItem
                             {
-                                Size = (IconSize)short.Parse(match.Groups[1].Value),
+                                Size = (IconSize)Int16.Parse(match.Groups[1].Value),
                                 Color = EnumHelper.GetEnumValueFromDescription<IconColor>(match.Groups[2].Value),
                                 Shape = EnumHelper.GetEnumValueFromDescription<IconShape>(match.Groups[3].Value)
                             };
 
-                            var themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Icon, match.Groups[5].Value.Trim(),
+                            if(match.Groups[4].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[5].Value))
-                                blockItemValue.Size, blockItemValue.Color, blockItemValue.Shape);
-                            if(match.Groups[4].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[5].Value))
                             {
-                                blockItemValue.ThemeComponent = themeComponent;
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Icon, match.Groups[5].Value.Trim(),
-                            }
+                                    blockItemValue.Size, blockItemValue.Color, blockItemValue.Shape);
-                            block.BlockItems.Add(blockItemValue);
+                                blockItemValue.ThemeComponent = themeComponent;
-                            themeComponentType = (int)ThemeComponentType.Icon;
+                            }
-                        }
+                            block.BlockItems.Add(blockItemValue);
+                            themeComponentType = (int)ThemeComponentType.Icon;
+                        }
                         break;
                     }
                     case "PlayEffect":
                     {
                         // Only ever use the last BeamColor item encountered as multiples aren't valid.
                         RemoveExistingBlockItemsOfType<PlayEffectBlockItem>(block);
-                        
+
                         // TODO: Get colors programmatically
                         var match = Regex.Match(trimmedLine, @"\S+\s+(Red|Green|Blue|Brown|White|Yellow)\s*(Temp)?", RegexOptions.IgnoreCase);
-                        
+
-                        if (match.Success)
+                        if (match.Success)
-                        {
+                        {
-                            var blockItemValue = new PlayEffectBlockItem
+                            var blockItemValue = new PlayEffectBlockItem
-                            {
+                            {
-                                Color = EnumHelper.GetEnumValueFromDescription<EffectColor>(match.Groups[1].Value),
+                                Color = EnumHelper.GetEnumValueFromDescription<EffectColor>(match.Groups[1].Value),
-                                Temporary = match.Groups[2].Value.Trim().ToLower() == "temp"
+                                Temporary = match.Groups[2].Value.Trim().ToLower() == "temp"
-                            };
+                            };
                             block.BlockItems.Add(blockItemValue);
-                            themeComponentType = (int)ThemeComponentType.Effect;
+                            themeComponentType = (int)ThemeComponentType.Effect;
                         }
                         break;
                     }
@@ -382,17 +394,17 @@ namespace Filtration.Parser.Services
                         RemoveExistingBlockItemsOfType<SoundBlockItem>(block);
                         RemoveExistingBlockItemsOfType<PositionalSoundBlockItem>(block);
 
-                        var match = Regex.Match(trimmedLine, @"\S+\s+""(\S+)""");
+	                    var match = Regex.Match(trimmedLine, @"\S+\s+""([^\*\<\>\?|]+)""");
-                        
+
-                        if (match.Success)
+                        if (match.Success)
-                        {
+                        {
-                            var blockItemValue = new CustomSoundBlockItem
+                            var blockItemValue = new CustomSoundBlockItem
-                            {
+                            {
-                                Value = match.Groups[1].Value
+                                Value = match.Groups[1].Value
-                            };
+                            };
                             block.BlockItems.Add(blockItemValue);
-                            themeComponentType = (int)ThemeComponentType.CustomSound;
+                            themeComponentType = (int)ThemeComponentType.CustomSound;
-                        }
+                        }
                         break;
                     }
                     case "MapTier":
@@ -400,87 +412,88 @@ namespace Filtration.Parser.Services
                         AddNumericFilterPredicateItemToBlockItems<MapTierBlockItem>(block, trimmedLine);
                         break;
                     }
-                }
-
-                if (!string.IsNullOrWhiteSpace(blockComment) && block.BlockItems.Count > 1)
-                {
-                    if(!(block.BlockItems.Last() is IBlockItemWithTheme blockItemWithTheme))
-                    {
-                        block.BlockItems.Last().Comment = blockComment;
-                    }
-                    else
-                    {
-                        switch((ThemeComponentType)themeComponentType)
-                        {
-                            case ThemeComponentType.AlertSound:
-                            {
-                                ThemeComponent themeComponent;
-                                if(blockItemWithTheme is SoundBlockItem item)
-                                {
-                                    themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound, blockComment.Trim(),
-                                        item.Value, item.SecondValue);
-                                }
-                                else
-                                {
-                                    themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound, blockComment.Trim(),
-                                        ((PositionalSoundBlockItem)blockItemWithTheme).Value, ((PositionalSoundBlockItem)blockItemWithTheme).SecondValue);
-                                }
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                            case ThemeComponentType.BackgroundColor:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BackgroundColor,
-                                    blockComment.Trim(), ((BackgroundColorBlockItem)blockItemWithTheme).Color);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                            case ThemeComponentType.BorderColor:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BorderColor,
-                                    blockComment.Trim(), ((BorderColorBlockItem)blockItemWithTheme).Color);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                            case ThemeComponentType.CustomSound:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.CustomSound,
-                                    blockComment.Trim(), ((CustomSoundBlockItem)blockItemWithTheme).Value);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                    break;
-                            }
-                            case ThemeComponentType.Effect:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Effect,
-                                    blockComment.Trim(), ((EffectColorBlockItem)blockItemWithTheme).Color, ((EffectColorBlockItem)blockItemWithTheme).Temporary);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                            case ThemeComponentType.FontSize:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.FontSize,
-                                    blockComment.Trim(), ((FontSizeBlockItem)blockItemWithTheme).Value);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                            case ThemeComponentType.Icon:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Icon, blockComment.Trim(),
-                                    ((IconBlockItem)blockItemWithTheme).Size, ((IconBlockItem)blockItemWithTheme).Color, ((IconBlockItem)blockItemWithTheme).Shape);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                            case ThemeComponentType.TextColor:
-                            {
-                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.TextColor,
-                                    blockComment.Trim(), ((TextColorBlockItem)blockItemWithTheme).Color);
-                                blockItemWithTheme.ThemeComponent = themeComponent;
-                                break;
-                            }
-                        }
-                    }
                 }
-            }
+
+                if (!string.IsNullOrWhiteSpace(blockComment) && block.BlockItems.Count > 1)
+                {
+                    var blockItemWithTheme = block.BlockItems.Last() as IBlockItemWithTheme;
+                    if(blockItemWithTheme == null)
+                    {
+                        block.BlockItems.Last().Comment = blockComment;
+                    }
+                    else
+                    {
+                        switch((ThemeComponentType)themeComponentType)
+                        {
+                            case ThemeComponentType.AlertSound:
+                            {
+                                ThemeComponent themeComponent = null;
+                                if(blockItemWithTheme is SoundBlockItem)
+                                {
+                                    themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound, blockComment.Trim(),
+                                        ((SoundBlockItem)blockItemWithTheme).Value, ((SoundBlockItem)blockItemWithTheme).SecondValue);
+                                }
+                                else
+                                {
+                                    themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound, blockComment.Trim(),
+                                        ((PositionalSoundBlockItem)blockItemWithTheme).Value, ((PositionalSoundBlockItem)blockItemWithTheme).SecondValue);
+                                }
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                            case ThemeComponentType.BackgroundColor:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BackgroundColor,
+                                    blockComment.Trim(), ((BackgroundColorBlockItem)blockItemWithTheme).Color);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                            case ThemeComponentType.BorderColor:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BorderColor,
+                                    blockComment.Trim(), ((BorderColorBlockItem)blockItemWithTheme).Color);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                            case ThemeComponentType.CustomSound:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.CustomSound,
+                                    blockComment.Trim(), ((CustomSoundBlockItem)blockItemWithTheme).Value);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                    break;
+                            }
+                            case ThemeComponentType.Effect:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Effect,
+                                    blockComment.Trim(), ((EffectColorBlockItem)blockItemWithTheme).Color, ((EffectColorBlockItem)blockItemWithTheme).Temporary);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                            case ThemeComponentType.FontSize:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.FontSize,
+                                    blockComment.Trim(), ((FontSizeBlockItem)blockItemWithTheme).Value);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                            case ThemeComponentType.Icon:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Icon, blockComment.Trim(),
+                                    ((IconBlockItem)blockItemWithTheme).Size, ((IconBlockItem)blockItemWithTheme).Color, ((IconBlockItem)blockItemWithTheme).Shape);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                            case ThemeComponentType.TextColor:
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.TextColor,
+                                    blockComment.Trim(), ((TextColorBlockItem)blockItemWithTheme).Color);
+                                blockItemWithTheme.ThemeComponent = themeComponent;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
             block.IsEdited = false;
             return block;
         }
@@ -510,7 +523,7 @@ namespace Filtration.Parser.Services
         private static void AddNumericFilterPredicateItemToBlockItems<T>(IItemFilterBlock block, string inputString) where T : NumericFilterPredicateBlockItem
         {
             var blockItem = Activator.CreateInstance<T>();
-            
+
             SetNumericFilterPredicateFromString(blockItem.FilterPredicate, inputString);
             block.BlockItems.Add(blockItem);
         }
@@ -559,12 +572,12 @@ namespace Filtration.Parser.Services
                 var matches = Regex.Match(line, @"(\w+)");
                 var blockComment = "";
                 var trimmedLine = line.Trim();
-                if (trimmedLine.IndexOf('#') > 0)
+                if (trimmedLine.IndexOf('#') > 0)
-                {
+                {
-                    blockComment = trimmedLine.Substring(trimmedLine.IndexOf('#') + 1);
+                    blockComment = trimmedLine.Substring(trimmedLine.IndexOf('#') + 1);
-                    trimmedLine = trimmedLine.Substring(0, trimmedLine.IndexOf('#')).Trim();
+                    trimmedLine = trimmedLine.Substring(0, trimmedLine.IndexOf('#')).Trim();
-                }
+                }
-
+
                 switch (matches.Value)
                 {
                     case "PlayAlertSound":
@@ -572,11 +585,11 @@ namespace Filtration.Parser.Services
                         var match = Regex.Match(trimmedLine, @"\s+(\S+) (\d+)");
                         if (!match.Success) break;
                         var blockItem = new SoundBlockItem(match.Groups[1].Value, Convert.ToInt16(match.Groups[2].Value));
-                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
+                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
-                        {
+                        {
-                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound,
+                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound,
-                                blockComment, blockItem.Value, blockItem.SecondValue);
+                                blockComment, blockItem.Value, blockItem.SecondValue);
-                                blockItem.ThemeComponent = themeComponent;
+                                blockItem.ThemeComponent = themeComponent;
                         }
                         blockItems.Add(blockItem);
                         break;
@@ -585,12 +598,13 @@ namespace Filtration.Parser.Services
                     {
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
 
-                        var blockItem = new TextColorBlockItem {Color = GetColorFromString(result[0].Groups[1].Value)};
+                        var blockItem = new TextColorBlockItem();
-                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
+                        blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
-                        {
+                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
-                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.TextColor,
+                        {
-                                blockComment, blockItem.Color);
+                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.TextColor,
-                            blockItem.ThemeComponent = themeComponent;
+                                blockComment, blockItem.Color);
+                            blockItem.ThemeComponent = themeComponent;
                         }
                         blockItems.Add(blockItem);
                         break;
@@ -599,12 +613,13 @@ namespace Filtration.Parser.Services
                     {
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
 
-                        var blockItem = new BackgroundColorBlockItem {Color = GetColorFromString(result[0].Groups[1].Value)};
+                        var blockItem = new BackgroundColorBlockItem();
-                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
+                        blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
-                        {
+                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
-                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BackgroundColor,
+                        {
-                                blockComment, blockItem.Color);
+                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BackgroundColor,
-                            blockItem.ThemeComponent = themeComponent;
+                                blockComment, blockItem.Color);
+                            blockItem.ThemeComponent = themeComponent;
                         }
                         blockItems.Add(blockItem);
                         break;
@@ -613,12 +628,13 @@ namespace Filtration.Parser.Services
                     {
                         var result = Regex.Matches(trimmedLine, @"([\w\s]*)");
 
-                        var blockItem = new BorderColorBlockItem {Color = GetColorFromString(result[0].Groups[1].Value)};
+                        var blockItem = new BorderColorBlockItem();
-                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
+                        blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
-                        {
+                        if(_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
-                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BorderColor,
+                        {
-                                blockComment, blockItem.Color);
+                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.BorderColor,
-                            blockItem.ThemeComponent = themeComponent;
+                                blockComment, blockItem.Color);
+                            blockItem.ThemeComponent = themeComponent;
                         }
                         blockItems.Add(blockItem);
                         break;
@@ -628,19 +644,19 @@ namespace Filtration.Parser.Services
                         var match = Regex.Match(trimmedLine, @"\s+(\d+)");
                         if (!match.Success) break;
                         var blockItem = new FontSizeBlockItem(Convert.ToInt16(match.Value));
-                        if (_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
+                        if (_masterComponentCollection != null && !string.IsNullOrWhiteSpace(blockComment))
-                        {
+                        {
-                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.FontSize,
+                            ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.FontSize,
-                                blockComment, blockItem.Value);
+                                blockComment, blockItem.Value);
-                            blockItem.ThemeComponent = themeComponent;
+                            blockItem.ThemeComponent = themeComponent;
                         }
                         blockItems.Add(blockItem);
                         break;
                     }
-                } 
+                }
             }
         }
-        
+
         private void AddBlockGroupToBlock(IItemFilterBlock block, string inputString)
         {
             var blockGroupText = GetTextAfterFirstComment(inputString);
@@ -650,8 +666,8 @@ namespace Filtration.Parser.Services
 
             if (blockGroups.Count(b => !string.IsNullOrEmpty(b.Trim())) > 0)
             {
-                block.BlockGroup = _blockGroupHierarchyBuilder.IntegrateStringListIntoBlockGroupHierarchy(blockGroups,
+                block.BlockGroup = _blockGroupHierarchyBuilder.IntegrateStringListIntoBlockGroupHierarchy(blockGroups);
-                    block.Action == BlockAction.Show, block.Enabled);
+                block.BlockGroup.IsChecked = block.Action == BlockAction.Show;
             }
         }
 
@@ -672,7 +688,7 @@ namespace Filtration.Parser.Services
                 case 3:
                     return new Color
                     {
-                        A = 240,
+                        A = byte.MaxValue,
                         R = Convert.ToByte(argbValues[0].Value),
                         G = Convert.ToByte(argbValues[1].Value),
                         B = Convert.ToByte(argbValues[2].Value)
@@ -707,15 +723,15 @@ namespace Filtration.Parser.Services
         // TODO: Private
         public string TranslateItemFilterCommentBlockToString(IItemFilterCommentBlock itemFilterCommentBlock)
         {
-            if (!itemFilterCommentBlock.IsEdited)
+            if (!itemFilterCommentBlock.IsEdited)
-            {
+            {
-                return itemFilterCommentBlock.OriginalText;
+                return itemFilterCommentBlock.OriginalText;
             }
 
             // TODO: Tests
             // TODO: # Section: text?
-            var commentWithHashes = string.Empty;
+            var commentWithHashes = string.Empty;
-
+
             // Add "# " to the beginning of each line of the comment before saving it
             foreach (var line in new LineReader(() => new StringReader(itemFilterCommentBlock.Comment)))
             {
@@ -725,15 +741,15 @@ namespace Filtration.Parser.Services
             // Remove trailing newline
             return commentWithHashes.TrimEnd('\r', '\n');
         }
-        
+
         // This method converts an ItemFilterBlock object into a string. This is used for copying a ItemFilterBlock
         // to the clipboard, and when saving a ItemFilterScript.
         // TODO: Private
         public string TranslateItemFilterBlockToString(IItemFilterBlock block)
         {
-            if(!block.IsEdited)
+            if(!block.IsEdited)
-            {
+            {
-                return block.OriginalText;
+                return block.OriginalText;
             }
 
             var outputString = string.Empty;
@@ -761,14 +777,14 @@ namespace Filtration.Parser.Services
                 {
                     outputString += (!block.Enabled ? _disabledNewLine : _newLine) + blockItem.OutputText;
                 }
-            }
+            }
-
+
-            //TODO: Disabled for the time being. A better solution is needed.
+            //TODO: Disabled for the time being. A better solution is needed.
-            // Replace 'Maelström' to prevent encoding problems in other editors
+            // Replace 'Maelström' to prevent encoding problems in other editors
-            //outputString.Replace("Maelström Staff", "Maelstr");
+            //outputString.Replace("Maelström Staff", "Maelstr");
-            //outputString.Replace("Maelström of Chaos", "Maelstr");
+            //outputString.Replace("Maelström of Chaos", "Maelstr");
-            //outputString.Replace("Maelström", "Maelstr");
+            //outputString.Replace("Maelström", "Maelstr");
-
+
             return outputString;
         }
     }

Filtration.Parser/Services/ItemFilterScriptTranslator.cs

@@ -210,18 +210,7 @@ namespace Filtration.Parser.Services
             _blockGroupHierarchyBuilder.Cleanup();
             return script;
         }
-
+        
-        public IItemFilterScript TranslatePastedStringToItemFilterScript(string inputString, bool blockGroupsEnabled)
-        {
-            //Remove old disabled tags to prevent messagebox on paste
-            inputString = Regex.Replace(inputString, @"#Disabled\sBlock\s(Start|End).*?\n", "");
-            inputString = (inputString.EndsWith("\n#Disabled Block End")) ? inputString.Substring(0, inputString.Length - 19) : inputString;
-
-            inputString = (blockGroupsEnabled ? "# EnableBlockGroups" : "#") + Environment.NewLine + Environment.NewLine + inputString;
-
-            return TranslateStringToItemFilterScript(inputString);
-        }
-
         private static LinkedList<ItemFilterBlockBoundary> IdentifyBlockBoundaries(string inputString, List<bool> inBlock)
         {
             var blockBoundaries = new LinkedList<ItemFilterBlockBoundary>();

Filtration.Tests/Filtration.Tests.csproj

@@ -1,120 +1,121 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
+  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E0693972-72C5-4E05-A9C5-A5943E4015C6}</ProjectGuid>
+    <ProjectGuid>{E0693972-72C5-4E05-A9C5-A5943E4015C6}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Filtration.Tests</RootNamespace>
+    <RootNamespace>Filtration.Tests</RootNamespace>
-    <AssemblyName>Filtration.Tests</AssemblyName>
+    <AssemblyName>Filtration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFrameworkProfile />
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
+  </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
+      <Private>True</Private>
-    </Reference>
+    </Reference>
-    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
-    </Reference>
+    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
-    </Reference>
+    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
-    </Reference>
+    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
+    </Reference>
-    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
+    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
+    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml" />
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
+      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
+      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
+      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    </Compile>
-    <Compile Include="Repositories\TestItemFilterScriptRepository.cs" />
+    <Compile Include="Repositories\TestItemFilterScriptRepository.cs" />
-    <Compile Include="Services\TestHTTPService.cs" />
+    <Compile Include="Services\TestHTTPService.cs" />
-    <Compile Include="Services\TestItemFilterPersistenceService.cs" />
+    <Compile Include="Services\TestItemFilterPersistenceService.cs" />
-    <Compile Include="Services\TestUpdateService.cs" />
+    <Compile Include="Services\TestStaticDataService.cs" />
-  </ItemGroup>
+    <Compile Include="Services\TestUpdateService.cs" />
-  <ItemGroup>
+  </ItemGroup>
-    <None Include="app.config" />
+  <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="app.config" />
-  </ItemGroup>
+    <None Include="packages.config" />
-  <ItemGroup>
+  </ItemGroup>
-    <Folder Include="Models\" />
+  <ItemGroup>
-    <Folder Include="Resources\" />
+    <Folder Include="Models\" />
-    <Folder Include="Translators\" />
+    <Folder Include="Resources\" />
-    <Folder Include="ViewModels\" />
+    <Folder Include="Translators\" />
-  </ItemGroup>
+    <Folder Include="ViewModels\" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="..\Filtration.Common\Filtration.Common.csproj">
+  <ItemGroup>
-      <Project>{8cb44f28-2956-4c2a-9314-72727262edd4}</Project>
+    <ProjectReference Include="..\Filtration.Common\Filtration.Common.csproj">
-      <Name>Filtration.Common</Name>
+      <Project>{8cb44f28-2956-4c2a-9314-72727262edd4}</Project>
-    </ProjectReference>
+      <Name>Filtration.Common</Name>
-    <ProjectReference Include="..\Filtration.Interface\Filtration.Interface.csproj">
+    </ProjectReference>
-      <Project>{0f333344-7695-47b2-b0e6-172e4de74819}</Project>
+    <ProjectReference Include="..\Filtration.Interface\Filtration.Interface.csproj">
-      <Name>Filtration.Interface</Name>
+      <Project>{0f333344-7695-47b2-b0e6-172e4de74819}</Project>
-    </ProjectReference>
+      <Name>Filtration.Interface</Name>
-    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+    </ProjectReference>
-      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
-      <Name>Filtration.ObjectModel</Name>
+      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
-    </ProjectReference>
+      <Name>Filtration.ObjectModel</Name>
-    <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
+    </ProjectReference>
-      <Project>{46383F20-02DF-48B4-B092-9088FA4ACD5A}</Project>
+    <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
-      <Name>Filtration.Parser.Interface</Name>
+      <Project>{46383F20-02DF-48B4-B092-9088FA4ACD5A}</Project>
-    </ProjectReference>
+      <Name>Filtration.Parser.Interface</Name>
-    <ProjectReference Include="..\Filtration\Filtration.csproj">
+    </ProjectReference>
-      <Project>{55e0a34c-e039-43d7-a024-a4045401cdda}</Project>
+    <ProjectReference Include="..\Filtration\Filtration.csproj">
-      <Name>Filtration</Name>
+      <Project>{55e0a34c-e039-43d7-a024-a4045401cdda}</Project>
-    </ProjectReference>
+      <Name>Filtration</Name>
-  </ItemGroup>
+    </ProjectReference>
-  <ItemGroup>
+  </ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+  <ItemGroup>
-      <Generator>ResXFileCodeGenerator</Generator>
+    <EmbeddedResource Include="Properties\Resources.resx">
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-  </ItemGroup>
+    </EmbeddedResource>
-  <ItemGroup>
+  </ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  <ItemGroup>
-  </ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

Filtration.Tests/Services/TestStaticDataService.cs

@@ -0,0 +1,44 @@
+using Filtration.Common.Services;
+using Filtration.Services;
+using Moq;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Services
+{
+    [TestFixture]
+    public class TestStaticDataService
+    {
+        [Test]
+        public void Constructor_CallsFileSystemService()
+        {
+            // Arrange
+
+            var mockFileSystemService = new Mock<IFileSystemService>();
+            mockFileSystemService.Setup(f => f.ReadFileAsString(It.IsAny<string>())).Returns("TestResult").Verifiable();
+
+            var service = new StaticDataService(mockFileSystemService.Object);
+
+            // Act
+            
+            // Assert
+            mockFileSystemService.Verify();
+        }
+
+        [Ignore("Integration Test")]
+        [Test]
+        public void Constructor_ReadsFromFileCorrectly()
+        {
+            // Arrange
+
+            var fileSystemService = new FileSystemService();
+
+            var service = new StaticDataService(fileSystemService);
+
+            // Act
+
+            // Assert
+            
+        }
+
+    }
+}

Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs

@@ -200,7 +200,7 @@ namespace Filtration.ThemeEditor.ViewModels
                 case ThemeComponentType.BorderColor:
                 case ThemeComponentType.TextColor:
                     Components.Add(new ColorThemeComponent(themeComponentType, "Untitled Component",
-                        new Color { A = 240, R = 255, G = 255, B = 255 }));
+                        new Color { A = 255, R = 255, G = 255, B = 255 }));
                     break;
                 case ThemeComponentType.FontSize:
                     Components.Add(new IntegerThemeComponent(themeComponentType, "Untitled Component", 35));

Filtration.sln

@@ -45,10 +45,6 @@ Global
 		Release|ARM = Release|ARM
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
-		SquirrelReleasify|Any CPU = SquirrelReleasify|Any CPU
-		SquirrelReleasify|ARM = SquirrelReleasify|ARM
-		SquirrelReleasify|x64 = SquirrelReleasify|x64
-		SquirrelReleasify|x86 = SquirrelReleasify|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -67,14 +63,6 @@ Global
 		{55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x64.Build.0 = Release|Any CPU
 		{55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x86.ActiveCfg = Release|Any CPU
 		{55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x86.Build.0 = Release|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|Any CPU.ActiveCfg = Releasify|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|Any CPU.Build.0 = Releasify|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{55E0A34C-E039-43D7-A024-A4045401CDDA}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -91,14 +79,6 @@ Global
 		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{E0693972-72C5-4E05-A9C5-A5943E4015C6}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -115,14 +95,6 @@ Global
 		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x64.Build.0 = Release|Any CPU
 		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x86.ActiveCfg = Release|Any CPU
 		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x86.Build.0 = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -139,14 +111,6 @@ Global
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -163,14 +127,6 @@ Global
 		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x64.Build.0 = Release|Any CPU
 		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x86.ActiveCfg = Release|Any CPU
 		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x86.Build.0 = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -187,14 +143,6 @@ Global
 		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -211,14 +159,6 @@ Global
 		{0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x64.Build.0 = Release|Any CPU
 		{0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x86.ActiveCfg = Release|Any CPU
 		{0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x86.Build.0 = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{0F333344-7695-47B2-B0E6-172E4DE74819}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -235,14 +175,6 @@ Global
 		{8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x64.Build.0 = Release|Any CPU
 		{8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x86.ActiveCfg = Release|Any CPU
 		{8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x86.Build.0 = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{8CB44F28-2956-4C2A-9314-72727262EDD4}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -259,14 +191,6 @@ Global
 		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -283,14 +207,6 @@ Global
 		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x64.Build.0 = Release|Any CPU
 		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x86.ActiveCfg = Release|Any CPU
 		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x86.Build.0 = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -307,14 +223,6 @@ Global
 		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -331,14 +239,6 @@ Global
 		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x64.Build.0 = Release|Any CPU
 		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x86.ActiveCfg = Release|Any CPU
 		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x86.Build.0 = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -355,14 +255,6 @@ Global
 		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x64.Build.0 = Release|Any CPU
 		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x86.ActiveCfg = Release|Any CPU
 		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x86.Build.0 = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{46383F20-02DF-48B4-B092-9088FA4ACD5A}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -379,14 +271,6 @@ Global
 		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -403,14 +287,6 @@ Global
 		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.Release|x64.Build.0 = Release|Any CPU
 		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.Release|x86.ActiveCfg = Release|Any CPU
 		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.Release|x86.Build.0 = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|Any CPU.ActiveCfg = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|Any CPU.Build.0 = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|ARM.ActiveCfg = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|ARM.Build.0 = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|x64.ActiveCfg = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{855B38CC-EEF2-471D-BBBC-EB3E2FF3D387}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -427,19 +303,8 @@ Global
 		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.Release|x64.Build.0 = Release|Any CPU
 		{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
-		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|x64.Build.0 = Release|Any CPU
-		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|x86.ActiveCfg = Release|Any CPU
-		{7A5720DE-A41B-47EA-AAAB-7C5608FF0C1F}.SquirrelReleasify|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8A170BBA-F99C-4192-9467-A5669B1DE126}
-	EndGlobalSection
 EndGlobal

Filtration.sln.DotSettings

@@ -2,5 +2,4 @@
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Filtration_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Filtration_002EObjectModel_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
-	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Filtration.ItemFilterPreview.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.ObjectModel.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.ThemeEditor.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
+	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Filtration.ItemFilterPreview.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.ObjectModel.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.ThemeEditor.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Prerelease/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Filtration/App.config

@@ -31,33 +31,6 @@
             <setting name="StaticDataLastUpdated" serializeAs="String">
                 <value>2016-01-01</value>
             </setting>
-            <setting name="DownloadPrereleaseUpdates" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="ShowSectionBrowser" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ShowBlockGroupBrowser" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ShowBlockOutputPreview" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ShowAdvanced" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="WindowState" serializeAs="String">
-                <value>Normal</value>
-            </setting>
-            <setting name="WindowWidth" serializeAs="String">
-                <value>1200</value>
-            </setting>
-            <setting name="WindowHeight" serializeAs="String">
-                <value>800</value>
-            </setting>
-            <setting name="LastActiveDocument" serializeAs="String">
-                <value />
-            </setting>
         </Filtration.Properties.Settings>
     </userSettings>
   <runtime>

Filtration/App.xaml.cs

@@ -1,23 +1,32 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Windows;
+using System.Windows.Threading;
 using AutoMapper;
 using Castle.Facilities.TypedFactory;
 using Castle.MicroKernel.ModelBuilder.Inspectors;
 using Castle.Windsor;
 using Castle.Windsor.Installer;
+using Filtration.ObjectModel;
 using Filtration.ObjectModel.ThemeEditor;
 using Filtration.Properties;
 using Filtration.Services;
 using Filtration.ThemeEditor.ViewModels;
+using Filtration.ViewModels;
+using Filtration.Views;
+using NLog;
 
 namespace Filtration
 {
     public partial class App
     {
         private IWindsorContainer _container;
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        private async void Application_Startup(object sender, StartupEventArgs e)
+        private void Application_Startup(object sender, StartupEventArgs e)
         {
+            DispatcherUnhandledException += OnDispatcherUnhandledException;
+
             _container = new WindsorContainer();
 
             // Disable property injection
@@ -47,9 +56,26 @@ namespace Filtration
             });
 
             Mapper.AssertConfigurationIsValid();
-            
+
-            var bootstrapper = _container.Resolve<IBootstrapper>();
+            var mainWindow = _container.Resolve<IMainWindow>();
-            await bootstrapper.GoAsync();
+            mainWindow.Show();
+
+            var updateCheckService = _container.Resolve<IUpdateCheckService>();
+            updateCheckService.CheckForUpdates();
+        }
+
+        private static void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        {
+            Logger.Fatal(e.Exception);
+            var exception = e.Exception.Message + Environment.NewLine + e.Exception.StackTrace;
+            var innerException = e.Exception.InnerException != null
+                ? e.Exception.InnerException.Message + Environment.NewLine +
+                  e.Exception.InnerException.StackTrace
+                : string.Empty;
+
+            MessageBox.Show(
+                exception + Environment.NewLine + innerException,
+                "Unhandled Exception", MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         protected override void OnExit(ExitEventArgs e)

Filtration/Converters/IconShapeToSourceConverter.cs

@@ -0,0 +1,37 @@
+using Filtration.ObjectModel.Enums;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Filtration.Converters
+{
+    internal class IconShapeToSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var iconShape = (IconShape)(int)value;
+            switch (iconShape)
+            {
+                case IconShape.Circle:
+                    return "/Filtration;component/Resources/DropIcons/Circle.png";
+                case IconShape.Diamond:
+                    return "/Filtration;component/Resources/DropIcons/Diamond.png";
+                case IconShape.Hexagon:
+                    return "/Filtration;component/Resources/DropIcons/Hexagon.png";
+                case IconShape.Square:
+                    return "/Filtration;component/Resources/DropIcons/Square.png";
+                case IconShape.Star:
+                    return "/Filtration;component/Resources/DropIcons/Star.png";
+                case IconShape.Triangle:
+                    return "/Filtration;component/Resources/DropIcons/Triangle.png";
+            }
+
+            return "/Filtration;component/Resources/DropIcons/NoIcon.png";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Filtration/Converters/MinimapIconToCroppedBitmapConverter.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Media.Imaging;
-using Filtration.ObjectModel.Enums;
-
-namespace Filtration.Converters
-{
-	internal class MinimapIconToCroppedBitmapConverter : IMultiValueConverter
-	{
-		private static readonly int cellHeight = 64;
-		private static readonly int cellWidth = 64;
-		private static readonly int gridWidth = 14;
-		private static readonly int startColumn = 4;
-		private static readonly int startRow = 3;
-		private static readonly int emptyColumn = 2;
-		private static readonly int emptyRow = 11;
-		private static readonly int colorCount = 6;
-		private static readonly int shapeCount = 6;
-		private static readonly int sizeCount = 3;
-
-		private static readonly Uri uri;
-		private static readonly CroppedBitmap empty;
-		private static readonly List<CroppedBitmap> bitmaps;
-
-		static MinimapIconToCroppedBitmapConverter()
-		{
-			uri = new Uri("pack://application:,,,/Filtration;component/Resources/minimap_icons.png", UriKind.Absolute);
-			var sourceImage = new BitmapImage(uri);
-
-			var emptyRect = new Int32Rect
-			{
-				Width = cellWidth,
-				Height = cellHeight,
-				X = emptyColumn * cellWidth,
-				Y = emptyRow * cellHeight
-			};
-			
-			empty = new CroppedBitmap(new BitmapImage(uri), emptyRect);
-			bitmaps = new List<CroppedBitmap>(shapeCount * colorCount * sizeCount);
-
-			var row = startRow;
-			var column = startColumn;
-			for (var i = 0; i < shapeCount; i++) {
-				for (var j = 0; j < colorCount; j++) {
-					for (var k = 0; k < sizeCount; k++) {
-						if (column == gridWidth) {
-							column = 0;
-							row++;
-						}
-
-						var bitmapRect = new Int32Rect
-						{
-							Width = cellWidth,
-							Height = cellHeight,
-							X = column * cellWidth,
-							Y = row * cellHeight
-						};
-
-						bitmaps.Add(new CroppedBitmap(sourceImage, bitmapRect));
-						column++;
-					}
-				}
-			}
-		}
-		
-		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-		{
-			if (values[0] == DependencyProperty.UnsetValue ||
-				values[1] == DependencyProperty.UnsetValue ||
-				values[2] == DependencyProperty.UnsetValue)
-			{
-				return empty;
-			}
-
-			var iconSize = (int)(values[0]);
-			var iconColor = (int)(values[1]);
-			var iconShape = (int)(values[2]);
-
-			if (!Enum.IsDefined(typeof(IconSize), iconSize) ||
-				!Enum.IsDefined(typeof(IconColor), iconColor) ||
-				!Enum.IsDefined(typeof(IconShape), iconShape))
-			{
-				return empty;
-			}
-
-			var shapeOffset = iconShape * (sizeCount * colorCount);
-			var colorOffset = iconColor * sizeCount;
-			var iconIndex = shapeOffset + colorOffset + iconSize;
-
-			if (iconIndex >= bitmaps.Count)
-			{
-				return empty;
-			}
-			else
-			{
-				return bitmaps[iconIndex];
-			}
-		}
-
-		public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}

Filtration/Converters/SizeColorToRectConverter.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Filtration.Converters
+{
+    internal class SizeColorToRectConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values[0] == DependencyProperty.UnsetValue ||
+                values[1] == DependencyProperty.UnsetValue)
+                return new Rect(0, 0, 0, 0);
+
+            var size = (int)(values[0]);
+            var color = (int)(values[1]);
+
+            if (size < 0 || color < 0)
+                return new Rect(0, 0, 0, 0);
+
+            var cropArea = new Rect
+            {
+                Width = 64,
+                Height = 64,
+                X = 0 + size * 64,
+                Y = 0 + color * 64
+            };
+
+            return cropArea;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Filtration/Filtration.csproj

@@ -15,6 +15,21 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,16 +56,6 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\filtration.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Releasify|AnyCPU'">
-    <OutputPath>bin\Releasify\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
@@ -65,15 +70,6 @@
     <Reference Include="ControlzEx, Version=2.2.0.4, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.2.2.0.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
-    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
-    </Reference>
-    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
-    </Reference>
-    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
-    </Reference>
     <Reference Include="Fluent, Version=4.0.3.394, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <HintPath>..\packages\Fluent.Ribbon.4.0.3.394\lib\net45\Fluent.dll</HintPath>
       <Private>True</Private>
@@ -95,41 +91,10 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <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="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.8.0\lib\Net45\NuGet.Squirrel.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
-    </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
-    </Reference>
-    <Reference Include="Squirrel, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.8.0\lib\Net45\Squirrel.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Controls.Input.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -148,7 +113,6 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -180,6 +144,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libs\Xceed.Wpf.AvalonDock.Themes.VS2013.dll</HintPath>
     </Reference>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Xceed.Wpf.Toolkit, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
       <HintPath>..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
       <Private>True</Private>
@@ -199,20 +167,19 @@
     <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
     <Compile Include="Converters\BlockItemToRemoveEnabledVisibilityConverter.cs" />
-    <Compile Include="Converters\MinimapIconToCroppedBitmapConverter.cs" />
+    <Compile Include="Converters\SizeColorToRectConverter.cs" />
     <Compile Include="Converters\HashSignRemovalConverter.cs" />
+    <Compile Include="Converters\IconShapeToSourceConverter.cs" />
     <Compile Include="Converters\ItemRarityConverter.cs" />
     <Compile Include="Converters\TreeViewMarginConverter.cs" />
     <Compile Include="Models\UpdateData.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Repositories\ItemFilterScriptRepository.cs" />
-    <Compile Include="Services\Bootstrapper.cs" />
     <Compile Include="Services\ClipboardService.cs" />
     <Compile Include="Services\HTTPService.cs" />
     <Compile Include="Services\ItemFilterPersistenceService.cs" />
-    <Compile Include="Services\SettingsService.cs" />
     <Compile Include="Services\StaticDataService.cs" />
-    <Compile Include="Services\UpdateService.cs" />
+    <Compile Include="Services\UpdateCheckService.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="UserControls\AutoScrollingListBox.cs" />
     <Compile Include="UserControls\BlockItemControl.xaml.cs">
@@ -223,19 +190,18 @@
     <Compile Include="UserControls\EditableListBoxControl.xaml.cs">
       <DependentUpon>EditableListBoxControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControls\ImageComboBoxControl.xaml.cs">
+      <DependentUpon>ImageComboBoxControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControls\ItemPreviewControl.xaml.cs">
       <DependentUpon>ItemPreviewControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
       <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ViewModels\DesignTime\DesignTimeSettingsPageViewModel.cs" />
-    <Compile Include="Views\AttachedProperties\SelectedItemsAttachedProperty.cs" />
     <Compile Include="Utility\RoutedCommandHandler.cs" />
     <Compile Include="Utility\RoutedCommandHandlers.cs" />
     <Compile Include="ViewModels\AvalonDockWorkspaceViewModel.cs" />
-    <Compile Include="ViewModels\DesignTime\DesignTimeMainWindowViewModel.cs" />
-    <Compile Include="ViewModels\DesignTime\DesignTimeUpdateViewModel.cs" />
     <Compile Include="ViewModels\Factories\IItemFilterCommentBlockViewModelFactory.cs" />
     <Compile Include="ViewModels\Factories\ItemFilterBlockBaseViewModelFactory.cs" />
     <Compile Include="ViewModels\ItemFilterBlockViewModelBase.cs" />
@@ -252,7 +218,7 @@
     <Compile Include="ViewModels\ToolPanes\CommentBlockBrowserViewModel.cs" />
     <Compile Include="ViewModels\StartPageViewModel.cs" />
     <Compile Include="ViewModels\ToolPanes\ToolViewModel.cs" />
-    <Compile Include="ViewModels\UpdateViewModel.cs" />
+    <Compile Include="ViewModels\UpdateAvailableViewModel.cs" />
     <Compile Include="Views\AttachedProperties\SelectingItemAttachedProperty.cs" />
     <Compile Include="Views\AvalonDock\AvalonDockWorkspaceView.xaml.cs">
       <DependentUpon>AvalonDockWorkspaceView.xaml</DependentUpon>
@@ -267,6 +233,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControls\ImageComboBoxControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControls\ThemeComponentSelectionControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -308,11 +278,8 @@
     <Compile Include="Views\ToolPanes\CommentBlockBrowserView.xaml.cs">
       <DependentUpon>CommentBlockBrowserView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\UpdateTabView.xaml.cs">
+    <Compile Include="Views\UpdateAvailableView.xaml.cs">
-      <DependentUpon>UpdateTabView.xaml</DependentUpon>
+      <DependentUpon>UpdateAvailableView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\UpdateView.xaml.cs">
-      <DependentUpon>UpdateView.xaml</DependentUpon>
     </Compile>
     <Compile Include="WindsorInstallers\RepositoriesInstaller.cs" />
     <Compile Include="WindsorInstallers\ServicesInstaller.cs" />
@@ -415,11 +382,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\UpdateTabView.xaml">
+    <Page Include="Views\UpdateAvailableView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\UpdateView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -438,21 +401,17 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <EmbeddedResource Include="Resources\ItemMods.txt" />
     <Resource Include="Resources\loading_spinner.gif" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <Content Include="LICENSE.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
     </Content>
-    <None Include="Filtration.nuspec" />
     <None Include="NLog.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -506,89 +465,95 @@
     <Resource Include="Resources\Icons\ThemeComponentDelete.ico" />
     <Resource Include="Resources\Icons\standby_disabled_icon.png" />
     <Resource Include="Resources\Icons\standby_enabled_icon.png" />
+    <None Include="Resources\AlertSounds\AlertSound_01.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_02.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_03.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_04.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_05.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_06.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_07.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_08.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_09.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_10.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_11.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_12.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_13.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_14.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_15.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\AlertSound_16.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Alchemy.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Blessed.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Chaos.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Divine.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Exalted.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Fusing.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22General.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Mirror.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Regal.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\AlertSounds\SH22Vaal.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Resource Include="Resources\Icons\redo_icon.png" />
     <Resource Include="Resources\Icons\undo_icon.png" />
-    <Resource Include="Resources\minimap_icons.png" />
+    <Resource Include="Resources\DropIcons\NoIcon.png" />
-    <Content Include="Resources\AlertSounds\AlertSound_01.mp3">
+    <Resource Include="Resources\DropIcons\Circle.png" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Resource Include="Resources\DropIcons\Diamond.png" />
-    </Content>
+    <Resource Include="Resources\DropIcons\Hexagon.png" />
-    <Content Include="Resources\AlertSounds\AlertSound_02.mp3">
+    <Resource Include="Resources\DropIcons\Square.png" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Resource Include="Resources\DropIcons\Star.png" />
-    </Content>
+    <Resource Include="Resources\DropIcons\Triangle.png" />
-    <Content Include="Resources\AlertSounds\AlertSound_03.mp3">
+    <Content Include="Resources\ItemBaseTypes.txt" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="Resources\ItemClasses.txt" />
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_04.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_05.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_06.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_07.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_08.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_09.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_10.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_11.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_12.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_13.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_14.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_15.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\AlertSound_16.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Alchemy.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Blessed.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Chaos.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Divine.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Exalted.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Fusing.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22General.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Mirror.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Regal.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\AlertSounds\SH22Vaal.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Resources\ItemBaseTypes.txt" />
-    <EmbeddedResource Include="Resources\ItemClasses.txt" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Filtration.Common\Filtration.Common.csproj">
@@ -632,33 +597,12 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild" Condition=" '$(Configuration)' == 'Releasify'">
+  <Import Project="$(XamlSpyInstallPath)MSBuild\FirstFloor.XamlSpy.WPF.targets" Condition="'$(XamlSpyInstallPath)' != '' and '$(Configuration)' == 'DEBUG'" />
-    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-      <Output TaskParameter="Assemblies" ItemName="myAssemblyInfo" />
+       Other similar extension points exist, see Microsoft.Common.targets.
-    </GetAssemblyIdentity>
+  <Target Name="BeforeBuild">
-    <ReadLinesFromFile File="$(ProjectDir)\Properties\AssemblyInfo.cs">
+  </Target>
-      <Output TaskParameter="Lines" ItemName="ItemsFromFile" />
+  <Target Name="AfterBuild">
-    </ReadLinesFromFile>
+  </Target>
-    <ItemGroup>
+  -->
-      <!-- If your .NET version is <3.5 and you get build error, move this ItemGroup outside of Target -->
-      <NuGetExe Include="..\packages\NuGet.CommandLine.*\tools\nuget.exe" />
-      <SquirrelExe Include="..\packages\Squirrel.Windows.*\tools\squirrel.exe" />
-    </ItemGroup>
-    <PropertyGroup>
-      <ReleaseDir>..\Releases\</ReleaseDir>
-      <!-- Extra optional params for squirrel. can be empty -->
-      <SquirrelParams>--no-msi</SquirrelParams>
-      <Pattern>(?&lt;=\[assembly: AssemblyInformationalVersion\(").*?(?="\)\])</Pattern>
-      <In>@(ItemsFromFile)</In>
-      <SemVerNumber>$([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern)))</SemVerNumber>
-      <!-- <SemVerNumber>$([System.Version]::Parse(%(myAssemblyInfo.Version)).ToString(3))</SemVerNumber> -->
-    </PropertyGroup>
-    <!-- Add some nice errors for the next person that comes along -->
-    <Error Condition="!Exists(%(NuGetExe.FullPath))" Text="You are trying to use the NuGet.CommandLine package, but it is not installed. Please install NuGet.CommandLine from the Package Manager." />
-    <Error Condition="!Exists(%(SquirrelExe.FullPath))" Text="You are trying to use the Squirrel.Windows package, but it is not installed. Please install Squirrel.Windows from the Package Manager." />
-    <!-- Build nupkg into the project local bin\Release\ directory temporarily -->
-    <Exec Command="&quot;%(NuGetExe.FullPath)&quot; pack $(TargetName).nuspec -Version $(SemVerNumber) -OutputDirectory $(OutDir) -BasePath $(OutDir)" />
-    <!-- Squirrelify into the release dir (usually at solution level. Change the property above for a different location -->
-    <Exec Command="&quot;%(SquirrelExe.FullPath)&quot; --releasify $(OutDir)Filtration.$(SemVerNumber).nupkg --releaseDir=$(ReleaseDir) $(SquirrelParams)" />
-  </Target>
 </Project>

Filtration/Filtration.nuspec

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Filtration</id>
-    <!-- version will be replaced by MSBuild -->
-    <version>0.0.0.0</version>
-    <title>Filtration</title>
-    <authors>Ben Wallis</authors>
-    <description>A Path of Exile loot filter script editor</description>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>Copyright 2018</copyright>
-    <releaseNotes>Still no 1.0.0 release notes
-
-Changes since 1.0.0-beta1:
-
-* Static data (ItemBaseTypes and ItemClasses) is now correctly loaded from embedded resources instead of the legacy text files in appdata
-* Updates to static data files
-* Disabled setting themes for MinimapIcon, PlayEffect and SetFontSize blocks as a temporary fix for issue #68</releaseNotes>
-    <dependencies />
-  </metadata>
-  <files>
-    <file src="*.*" target="lib\net45\" exclude="*.pdb;*.nupkg;*.vshost.*;*.xml"/>
-  </files>
-</package>

Filtration/NLog.config

@@ -10,7 +10,6 @@
             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="Debugger" name="cDebug" layout="${longdate} ${uppercase:${level}} ${message}"/>
   </targets>
 
   <rules>
@@ -18,7 +17,6 @@
     <!-- 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

@@ -1,6 +1,11 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
 
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
 [assembly: AssemblyTitle("Filtration")]
 [assembly: AssemblyDescription("An item filter script editor for Path of Exile")]
 [assembly: AssemblyConfiguration("")]
@@ -10,8 +15,42 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.0")]
+// Setting ComVisible to false makes the types in this assembly not visible 
-[assembly: AssemblyInformationalVersion("1.0.0-beta2")]
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.19")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

Filtration/Properties/Resources.Designer.cs

@@ -224,164 +224,6 @@ namespace Filtration.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to A Mother&apos;s Parting Gift
-        ///Abandoned Wealth
-        ///Aberrant Fossil
-        ///Abyssal Axe
-        ///Abyssal Cry
-        ///Abyssal Sceptre
-        ///Academy Map
-        ///Acid Lakes Map
-        ///Added Chaos Damage Support
-        ///Added Cold Damage Support
-        ///Added Fire Damage Support
-        ///Added Lightning Damage Support
-        ///Additional Accuracy Support
-        ///Aetheric Fossil
-        ///Agate Amulet
-        ///Albino Rhoa Feather
-        ///Alchemy Shard
-        ///Alder Spiked Shield
-        ///Alira&apos;s Amulet
-        ///Alleyways Map
-        ///Allflame
-        ///Alloyed Spiked Shield
-        ///Alteration Shard
-        ///Amber Amulet
-        ///Ambush Boots
-        ///Ambush Leaguestone
-        ///Ambush Mitts
-        ///Ambusher
-        ///Amethyst Flask
-        ///Amethyst [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string ItemBaseTypes {
-            get {
-                return ResourceManager.GetString("ItemBaseTypes", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Abyss Jewel
-        ///Active Skill Gems
-        ///Amulets
-        ///Axe
-        ///Belts
-        ///Body Armours
-        ///Boots
-        ///Bows
-        ///Claws
-        ///Currency
-        ///Daggers
-        ///Delve Socketable Currency
-        ///Divination Card
-        ///Fishing Rods
-        ///Flasks
-        ///Gems
-        ///Gloves
-        ///Helmets
-        ///Hybrid Flasks
-        ///Incursion Item
-        ///Jewel
-        ///Labyrinth Item
-        ///Labyrinth Map Item
-        ///Labyrinth Trinket
-        ///Large Relics
-        ///Leaguestone
-        ///Life Flasks
-        ///Mace
-        ///Mana Flasks
-        ///Map Fragments
-        ///Maps
-        ///Misc Map Items
-        ///One Hand Axes
-        ///One Hand Maces
-        ///One Hand Swords
-        ///Pantheon Soul
-        ///Piece
-        ///Quest Items
-        ///Quivers
-        ///Rings
-        ///Sceptres
-        ///Shields
-        ///Stackable Currency
-        ///Staves
-        ///Support Skill Gems
-        ///Sword
-        ///T [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string ItemClasses {
-            get {
-                return ResourceManager.GetString("ItemClasses", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Abbot&apos;s
-        ///Abhorrent
-        ///Acrobat&apos;s
-        ///Adept&apos;s
-        ///Agile
-        ///Alchemist&apos;s
-        ///Alluring
-        ///Alpine
-        ///Ample
-        ///Anarchic
-        ///Anarchist&apos;s
-        ///Annealed
-        ///Antagonist&apos;s
-        ///Apprentice&apos;s
-        ///Aqua
-        ///Archmage&apos;s
-        ///Arcing
-        ///Arctic
-        ///Armadillo&apos;s
-        ///Arming
-        ///Armoured
-        ///Athlete&apos;s
-        ///Avalanching
-        ///Avenger&apos;s
-        ///Azure
-        ///Bandit&apos;s
-        ///Barbed
-        ///Battlemage&apos;s
-        ///Beating
-        ///Beautiful
-        ///Beetle&apos;s
-        ///Beryl
-        ///Betrayer&apos;s
-        ///Bipedal
-        ///Biting
-        ///Bitter
-        ///Blasting
-        ///Blazing
-        ///Blistering
-        ///Bloodthirsty
-        ///Blue
-        ///Blunt
-        ///Blurred
-        ///Boggart&apos;s
-        ///Bolting
-        ///Brawler&apos;s
-        ///Breathtaking
-        ///Brinerot
-        ///Brutal
-        ///Bubbling
-        ///Burning
-        ///Burnished
-        ///Butterfly&apos;s
-        ///Buttressed
-        ///Buzzing
-        ///Calming
-        ///Capric [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string ItemMods {
-            get {
-                return ResourceManager.GetString("ItemMods", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
         /// </summary>

Filtration/Properties/Resources.resx

@@ -119,52 +119,52 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="AlertSound_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_01.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_01.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_02" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_02.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_02.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_03" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_03.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_03.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_04" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_04.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_04.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_05" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_05.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_05.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_06" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_06.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_06.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_07" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_07.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_07.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_08" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_08.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_08.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_09" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_09.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_09.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_10" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_10.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_10.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_11" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_11.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_11.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_12.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_12.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_13" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_13.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_13.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_14" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_14.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_14.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_15" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_15.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_15.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="AlertSound_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\AlertSound_16.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\AlertSound_16.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="Fontin_SmallCaps" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Fontin-SmallCaps.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -173,42 +173,33 @@
     <value>..\Resources\groundtile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SH22Alchemy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Alchemy.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Alchemy.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Blessed" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Blessed.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Blessed.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Chaos" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Chaos.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Chaos.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Divine" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Divine.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Divine.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Exalted" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Exalted.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Exalted.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Fusing" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Fusing.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Fusing.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22General" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22General.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22General.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Mirror" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Mirror.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Mirror.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Regal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Regal.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Regal.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SH22Vaal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AlertSounds\SH22Vaal.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\AlertSounds\SH22Vaal.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="ItemBaseTypes" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ItemBaseTypes.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-  <data name="ItemClasses" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ItemClasses.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
-  <data name="ItemMods" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ItemMods.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>

Filtration/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace Filtration.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -121,113 +121,5 @@ namespace Filtration.Properties {
                 return ((string)(this["UpdateDataUrl"]));
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool DownloadPrereleaseUpdates {
-            get {
-                return ((bool)(this["DownloadPrereleaseUpdates"]));
-            }
-            set {
-                this["DownloadPrereleaseUpdates"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ShowSectionBrowser {
-            get {
-                return ((bool)(this["ShowSectionBrowser"]));
-            }
-            set {
-                this["ShowSectionBrowser"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ShowBlockGroupBrowser {
-            get {
-                return ((bool)(this["ShowBlockGroupBrowser"]));
-            }
-            set {
-                this["ShowBlockGroupBrowser"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ShowBlockOutputPreview {
-            get {
-                return ((bool)(this["ShowBlockOutputPreview"]));
-            }
-            set {
-                this["ShowBlockOutputPreview"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool ShowAdvanced {
-            get {
-                return ((bool)(this["ShowAdvanced"]));
-            }
-            set {
-                this["ShowAdvanced"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
-        public global::System.Windows.WindowState WindowState {
-            get {
-                return ((global::System.Windows.WindowState)(this["WindowState"]));
-            }
-            set {
-                this["WindowState"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1200")]
-        public int WindowWidth {
-            get {
-                return ((int)(this["WindowWidth"]));
-            }
-            set {
-                this["WindowWidth"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("800")]
-        public int WindowHeight {
-            get {
-                return ((int)(this["WindowHeight"]));
-            }
-            set {
-                this["WindowHeight"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string LastActiveDocument {
-            get {
-                return ((string)(this["LastActiveDocument"]));
-            }
-            set {
-                this["LastActiveDocument"] = value;
-            }
-        }
     }
 }

Filtration/Properties/Settings.settings

@@ -29,32 +29,5 @@
     <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>
-    <Setting Name="ShowSectionBrowser" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="ShowBlockGroupBrowser" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="ShowBlockOutputPreview" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="ShowAdvanced" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="WindowState" Type="System.Windows.WindowState" Scope="User">
-      <Value Profile="(Default)">Normal</Value>
-    </Setting>
-    <Setting Name="WindowWidth" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">1200</Value>
-    </Setting>
-    <Setting Name="WindowHeight" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">800</Value>
-    </Setting>
-    <Setting Name="LastActiveDocument" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
   </Settings>
 </SettingsFile>