diff --git a/Filtration/Extensions/EnumerationExtension.cs b/Filtration.Common/Extensions/EnumerationExtension.cs
similarity index 94%
rename from Filtration/Extensions/EnumerationExtension.cs
rename to Filtration.Common/Extensions/EnumerationExtension.cs
index 3498157..93630bd 100644
--- a/Filtration/Extensions/EnumerationExtension.cs
+++ b/Filtration.Common/Extensions/EnumerationExtension.cs
@@ -3,9 +3,9 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows.Markup;
 
-namespace Filtration.Extensions
+namespace Filtration.Common.Extensions
 {
-    internal class EnumerationExtension : MarkupExtension
+    public class EnumerationExtension : MarkupExtension
     {
         private Type _enumType;
 
diff --git a/Filtration/Extensions/HyperlinkExtensions.cs b/Filtration.Common/Extensions/HyperlinkExtensions.cs
similarity index 97%
rename from Filtration/Extensions/HyperlinkExtensions.cs
rename to Filtration.Common/Extensions/HyperlinkExtensions.cs
index fd46841..140236c 100644
--- a/Filtration/Extensions/HyperlinkExtensions.cs
+++ b/Filtration.Common/Extensions/HyperlinkExtensions.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Navigation;
 
-namespace Filtration.Extensions
+namespace Filtration.Common.Extensions
 {
     public static class HyperlinkExtensions
     {
diff --git a/Filtration.Common/Filtration.Common.csproj b/Filtration.Common/Filtration.Common.csproj
index 13f3165..38b47e8 100644
--- a/Filtration.Common/Filtration.Common.csproj
+++ b/Filtration.Common/Filtration.Common.csproj
@@ -75,6 +75,8 @@
     <Compile Include="Converters\ColorToSolidColorBrushConverter.cs" />
     <Compile Include="Converters\InverseBooleanVisibilityConverter.cs" />
     <Compile Include="Converters\StringToVisibilityConverter.cs" />
+    <Compile Include="Extensions\EnumerationExtension.cs" />
+    <Compile Include="Extensions\HyperlinkExtensions.cs" />
     <Compile Include="Messages\ThemeClosedMessage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\FileSystemService.cs" />
diff --git a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs
index 2a20555..6d8296c 100644
--- a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs
+++ b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs
@@ -67,6 +67,7 @@ namespace Filtration.ItemFilterPreview.Tests.Services
         }
 
         [Test]
+        [Ignore("Outdated item filter")]
         public void ProcessItemsAgainstItemFilterScript_IntegrationTest()
         {
             //Arrange
@@ -102,6 +103,7 @@ namespace Filtration.ItemFilterPreview.Tests.Services
         }
 
         [Test]
+        [Ignore("Outdated item filter")]
         public void ProcessItemsAgainstItemFilterScript_IntegrationTest_10Items()
         {
             //Arrange
diff --git a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
index 69dd6ef..62cfed3 100644
--- a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
+++ b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
@@ -66,6 +66,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
index f955782..7592642 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
@@ -4,7 +4,7 @@ using Filtration.ObjectModel.ThemeEditor;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    public abstract class ColorBlockItem : BlockItemBase, IAudioVisualBlockItem
+    public abstract class ColorBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
     {
         private Color _color;
         private ThemeComponent _themeComponent;
@@ -63,7 +63,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
 
         private void OnThemeComponentUpdated(object sender, EventArgs e)
         {
-            Color = ((ThemeComponent) sender).Color;
+            Color = ((ColorThemeComponent) sender).Color;
         }
 
         private void OnThemeComponentDeleted(object sender, EventArgs e)
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBooleanBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBooleanBlockItem.cs
new file mode 100644
index 0000000..c046842
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBooleanBlockItem.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class ColorBooleanBlockItem : BlockItemBase, IAudioVisualBlockItem
+    {
+        private Color _color;
+        private bool _booleanValue;
+
+        protected ColorBooleanBlockItem()
+        {
+        }
+
+        protected ColorBooleanBlockItem(Color color, bool booleanValue)
+        {
+            Color = color;
+            BooleanValue = booleanValue;
+        }
+
+        public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " "
+                                             + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
+                                             (BooleanValue ? " True" : " False");
+
+        public override string SummaryText => string.Empty;
+
+        public override Color SummaryBackgroundColor => Colors.Transparent;
+        public override Color SummaryTextColor => Colors.Transparent;
+
+        public Color Color
+        {
+            get { return _color; }
+            set
+            {
+                _color = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        public bool BooleanValue
+        {
+            get { return _booleanValue; }
+            set
+            {
+                _booleanValue = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/EffectColorBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/EffectColorBlockItem.cs
new file mode 100644
index 0000000..df71499
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/EffectColorBlockItem.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.Extensions;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class EffectColorBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
+    {
+        private EffectColor _color;
+        private bool _temporary;
+        private ThemeComponent _themeComponent;
+
+        protected EffectColorBlockItem()
+        {
+        }
+
+        protected EffectColorBlockItem(EffectColor color, bool temporary)
+        {
+            Color = color;
+            Temporary = temporary;
+        }
+
+        public override string OutputText => PrefixText + " " + Color.GetAttributeDescription() +
+                                             (Temporary ? " " + "Temp" : string.Empty) +
+                                             (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
+
+        public override string SummaryText => string.Empty;
+
+        public ThemeComponent ThemeComponent
+        {
+            get { return _themeComponent; }
+            set
+            {
+                if (_themeComponent == value) { return; }
+
+                if (_themeComponent != null)
+                {
+                    _themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
+                    _themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
+                }
+                if (value != null)
+                {
+                    value.ThemeComponentUpdated += OnThemeComponentUpdated;
+                    value.ThemeComponentDeleted += OnThemeComponentDeleted;
+                }
+
+                _themeComponent = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public override Color SummaryBackgroundColor => Colors.Transparent;
+        public override Color SummaryTextColor => Colors.Transparent;
+
+        public EffectColor Color
+        {
+            get { return _color; }
+            set
+            {
+                _color = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        public bool Temporary
+        {
+            get { return _temporary; }
+            set
+            {
+                _temporary = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        private void OnThemeComponentUpdated(object sender, EventArgs e)
+        {
+            Color = ((EffectColorThemeComponent)sender).EffectColor;
+            Temporary = ((EffectColorThemeComponent)sender).Temporary;
+        }
+
+        private void OnThemeComponentDeleted(object sender, EventArgs e)
+        {
+            ThemeComponent = null;
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/IconBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/IconBlockItem.cs
new file mode 100644
index 0000000..d6b92d5
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/IconBlockItem.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.Extensions;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class IconBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
+    {
+        private IconSize _size;
+        private IconColor _color;
+        private IconShape _shape;
+        private ThemeComponent _themeComponent;
+
+        protected IconBlockItem()
+        {
+        }
+
+        protected IconBlockItem(IconSize size, IconColor color, IconShape shape)
+        {
+            Size = size;
+            Color = color;
+            Shape = shape;
+        }
+
+        public override string OutputText => PrefixText + " " + (int)Size + " " + Color.GetAttributeDescription() + " " + Shape.GetAttributeDescription() +
+                                             (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
+
+        public override string SummaryText => string.Empty;
+
+        public ThemeComponent ThemeComponent
+        {
+            get { return _themeComponent; }
+            set
+            {
+                if (_themeComponent == value) { return; }
+
+                if (_themeComponent != null)
+                {
+                    _themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
+                    _themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
+                }
+                if (value != null)
+                {
+                    value.ThemeComponentUpdated += OnThemeComponentUpdated;
+                    value.ThemeComponentDeleted += OnThemeComponentDeleted;
+                }
+
+                _themeComponent = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public override Color SummaryBackgroundColor => Colors.Transparent;
+        public override Color SummaryTextColor => Colors.Transparent;
+
+        public IconSize Size
+        {
+            get { return _size; }
+            set
+            {
+                _size = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        public IconColor Color
+        {
+            get { return _color; }
+            set
+            {
+                _color = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        public IconShape Shape
+        {
+            get { return _shape; }
+            set
+            {
+                _shape = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        private void OnThemeComponentUpdated(object sender, EventArgs e)
+        {
+            Size = ((IconThemeComponent)sender).IconSize;
+            Color = ((IconThemeComponent)sender).IconColor;
+            Shape = ((IconThemeComponent)sender).IconShape;
+        }
+
+        private void OnThemeComponentDeleted(object sender, EventArgs e)
+        {
+            ThemeComponent = null;
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs
index 6beb767..2299140 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/IntegerBlockItem.cs
@@ -1,10 +1,13 @@
-using System.Windows.Media;
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.ThemeEditor;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    public abstract class IntegerBlockItem : BlockItemBase, IAudioVisualBlockItem
+    public abstract class IntegerBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
     {
         private int _value;
+        private ThemeComponent _themeComponent;
 
         protected IntegerBlockItem()
         {
@@ -15,7 +18,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             Value = value;
         }
 
-        public override string OutputText => PrefixText + " " + Value;
+        public override string OutputText => PrefixText + " " + Value + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
 
         public override string SummaryText => string.Empty;
         public override Color SummaryBackgroundColor => Colors.Transparent;
@@ -24,6 +27,29 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
         public abstract int Minimum { get; }
         public abstract int Maximum { get; }
 
+        public ThemeComponent ThemeComponent
+        {
+            get { return _themeComponent; }
+            set
+            {
+                if (_themeComponent == value) { return; }
+
+                if (_themeComponent != null)
+                {
+                    _themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
+                    _themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
+                }
+                if (value != null)
+                {
+                    value.ThemeComponentUpdated += OnThemeComponentUpdated;
+                    value.ThemeComponentDeleted += OnThemeComponentDeleted;
+                }
+
+                _themeComponent = value;
+                OnPropertyChanged();
+            }
+        }
+
         public int Value
         {
             get { return _value; }
@@ -34,5 +60,15 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
                 OnPropertyChanged();
             }
         }
+
+        private void OnThemeComponentUpdated(object sender, EventArgs e)
+        {
+            Value = ((IntegerBlockItem)sender).Value;
+        }
+
+        private void OnThemeComponentDeleted(object sender, EventArgs e)
+        {
+            ThemeComponent = null;
+        }
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/StrIntBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/StrIntBlockItem.cs
new file mode 100644
index 0000000..2f66db2
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/StrIntBlockItem.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class StrIntBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
+    {
+        private string _value;
+        private int _secondValue;
+        private ThemeComponent _themeComponent;
+
+        protected StrIntBlockItem()
+        {
+        }
+
+        protected StrIntBlockItem(string value, int secondValue)
+        {
+            Value = value;
+            SecondValue = secondValue;
+            Value = value;
+            SecondValue = secondValue;
+        }
+
+        public override string OutputText => PrefixText + " " + Value + " " + SecondValue + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
+
+        public override string SummaryText => string.Empty;
+        public override Color SummaryBackgroundColor => Colors.Transparent;
+        public override Color SummaryTextColor => Colors.Transparent;
+
+        public ThemeComponent ThemeComponent
+        {
+            get { return _themeComponent; }
+            set
+            {
+                if (_themeComponent == value) { return; }
+
+                if (_themeComponent != null)
+                {
+                    _themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
+                    _themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
+                }
+                if (value != null)
+                {
+                    value.ThemeComponentUpdated += OnThemeComponentUpdated;
+                    value.ThemeComponentDeleted += OnThemeComponentDeleted;
+                }
+
+                _themeComponent = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        public int SecondValue
+        {
+            get { return _secondValue; }
+            set
+            {
+                _secondValue = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        private void OnThemeComponentUpdated(object sender, EventArgs e)
+        {
+            Value = ((StrIntBlockItem)sender).Value;
+            SecondValue = ((StrIntBlockItem)sender).SecondValue;
+        }
+
+        private void OnThemeComponentDeleted(object sender, EventArgs e)
+        {
+            ThemeComponent = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs
new file mode 100644
index 0000000..fd70174
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel.BlockItemBaseTypes
+{
+    public abstract class StringBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
+    {
+        private string _value;
+        private ThemeComponent _themeComponent;
+
+        protected StringBlockItem()
+        {
+        }
+
+        protected StringBlockItem(string value)
+        {
+            Value = value;
+        }
+
+        public override string OutputText => PrefixText + " \"" + Value + "\""
+             + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
+
+        public override string SummaryText => string.Empty;
+        public override Color SummaryBackgroundColor => Colors.Transparent;
+        public override Color SummaryTextColor => Colors.Transparent;
+
+        public ThemeComponent ThemeComponent
+        {
+            get { return _themeComponent; }
+            set
+            {
+                if (_themeComponent == value) { return; }
+
+                if (_themeComponent != null)
+                {
+                    _themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
+                    _themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
+                }
+                if (value != null)
+                {
+                    value.ThemeComponentUpdated += OnThemeComponentUpdated;
+                    value.ThemeComponentDeleted += OnThemeComponentDeleted;
+                }
+
+                _themeComponent = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                IsDirty = true;
+                OnPropertyChanged();
+            }
+        }
+
+        private void OnThemeComponentUpdated(object sender, EventArgs e)
+        {
+            Value = ((StringThemeComponent)sender).Value;
+        }
+
+        private void OnThemeComponentDeleted(object sender, EventArgs e)
+        {
+            ThemeComponent = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/StringIntBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/StringIntBlockItem.cs
deleted file mode 100644
index 405879c..0000000
--- a/Filtration.ObjectModel/BlockItemBaseTypes/StringIntBlockItem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Windows.Media;
-
-namespace Filtration.ObjectModel.BlockItemBaseTypes
-{
-    public abstract class StrIntBlockItem : BlockItemBase, IAudioVisualBlockItem
-    {
-        private string _value;
-        private int _secondValue;
-
-        protected StrIntBlockItem()
-        {
-        }
-
-        protected StrIntBlockItem(string value, int secondValue)
-        {
-            Value = value;
-            SecondValue = secondValue;
-            Value = value;
-            SecondValue = secondValue;
-        }
-
-        public override string OutputText => PrefixText + " " + Value + " " + SecondValue;
-
-        public override string SummaryText => string.Empty;
-        public override Color SummaryBackgroundColor => Colors.Transparent;
-        public override Color SummaryTextColor => Colors.Transparent;
-
-        public string Value
-        {
-            get { return _value; }
-            set
-            {
-                _value = value;
-                IsDirty = true;
-                OnPropertyChanged();
-            }
-        }
-
-        public int SecondValue
-        {
-            get { return _secondValue; }
-            set
-            {
-                _secondValue = value;
-                IsDirty = true;
-                OnPropertyChanged();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs
index 3765b3a..21b31cf 100644
--- a/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs
@@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string PrefixText => "SetBackgroundColor";
         public override int MaximumAllowed => 1;
         public override string DisplayHeading => "Background Color";
-        public override int SortOrder => 18;
+        public override int SortOrder => 23;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs
index cb78a03..1107f6d 100644
--- a/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs
@@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
 
         public override Color SummaryBackgroundColor => Colors.MediumTurquoise;
         public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 16;
+        public override int SortOrder => 20;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs
index 3668f33..1b79136 100644
--- a/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs
@@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string PrefixText => "SetBorderColor";
         public override int MaximumAllowed => 1;
         public override string DisplayHeading => "Border Color";
-        public override int SortOrder => 19;
+        public override int SortOrder => 24;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs
index 3da7e0a..450c914 100644
--- a/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs
@@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
 
         public override Color SummaryBackgroundColor => Colors.MediumSeaGreen;
         public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 15;
+        public override int SortOrder => 19;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
new file mode 100644
index 0000000..7e60eb9
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
@@ -0,0 +1,21 @@
+using Filtration.ObjectModel.BlockItemBaseTypes;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class CustomSoundBlockItem : StringBlockItem
+    {
+        public CustomSoundBlockItem()
+        {
+            Value = "placeholder.mp3";
+        }
+
+        public CustomSoundBlockItem(string value) : base(value)
+        {
+        }
+
+        public override string PrefixText => "CustomAlertSound";
+        public override int MaximumAllowed => 1;
+        public override string DisplayHeading => "Custom Alert Sound";
+        public override int SortOrder => 31;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/DisableDropSoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/DisableDropSoundBlockItem.cs
new file mode 100644
index 0000000..10a1fb5
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/DisableDropSoundBlockItem.cs
@@ -0,0 +1,23 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public sealed class DisableDropSoundBlockItem : BooleanBlockItem, IAudioVisualBlockItem
+    {
+        public DisableDropSoundBlockItem()
+        {
+        }
+
+        public DisableDropSoundBlockItem(bool booleanValue) : base(booleanValue)
+        {
+        }
+
+        public override string PrefixText => "DisableDropSound";
+        public override string DisplayHeading => "Disable Drop Sound";
+        public override Color SummaryBackgroundColor => Colors.Transparent;
+        public override Color SummaryTextColor => Colors.Transparent;
+        public override int SortOrder => 28;
+
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs
index a9f77c7..6701155 100644
--- a/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string SummaryText => "Drop Level " + FilterPredicate;
         public override Color SummaryBackgroundColor => Colors.DodgerBlue;
         public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 13;
+        public override int SortOrder => 15;
         public override int Minimum => 0;
         public override int Maximum => 100;
     }
diff --git a/Filtration.ObjectModel/BlockItemTypes/ElderMapBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ElderMapBlockItem.cs
new file mode 100644
index 0000000..ec27b42
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/ElderMapBlockItem.cs
@@ -0,0 +1,23 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public sealed class ElderMapBlockItem : BooleanBlockItem
+    {
+        public ElderMapBlockItem()
+        {
+        }
+
+        public ElderMapBlockItem(bool booleanValue) : base(booleanValue)
+        {
+        }
+
+        public override string PrefixText => "ElderMap";
+        public override string DisplayHeading => "Elder Map";
+        public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
+        public override Color SummaryTextColor => Colors.White;
+        public override int SortOrder => 10;
+
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs
index 62feaf7..cb90776 100644
--- a/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs
@@ -16,7 +16,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string PrefixText => "SetFontSize";
         public override int MaximumAllowed => 1;
         public override string DisplayHeading => "Font Size";
-        public override int SortOrder => 20;
+        public override int SortOrder => 25;
         public override int Minimum => 11;
         public override int Maximum => 45;
     }
diff --git a/Filtration.ObjectModel/BlockItemTypes/GemLevelBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/GemLevelBlockItem.cs
new file mode 100644
index 0000000..8825fb5
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/GemLevelBlockItem.cs
@@ -0,0 +1,28 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class GemLevelBlockItem : NumericFilterPredicateBlockItem
+    {
+        public GemLevelBlockItem()
+        {
+        }
+
+        public GemLevelBlockItem(FilterPredicateOperator predicateOperator, int predicateOperand)
+            : base(predicateOperator, predicateOperand)
+        {
+        }
+
+        public override string PrefixText => "GemLevel";
+        public override int MaximumAllowed => 2;
+        public override string DisplayHeading => "Gem Level";
+        public override string SummaryText => "Gem Level " + FilterPredicate;
+        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
+        public override Color SummaryTextColor => Colors.White;
+        public override int SortOrder => 16;
+        public override int Minimum => 0;
+        public override int Maximum => 21;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/HasExplicitModBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/HasExplicitModBlockItem.cs
new file mode 100644
index 0000000..b47e29b
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/HasExplicitModBlockItem.cs
@@ -0,0 +1,38 @@
+using System.Linq;
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class HasExplicitModBlockItem : StringListBlockItem
+    {
+        public override string PrefixText => "HasExplicitMod";
+        public override int MaximumAllowed => 1;
+        public override string DisplayHeading => "Has Explicit Mod";
+
+        public override string SummaryText
+        {
+            get
+            {
+                if (Items.Count > 0 && Items.Count < 4)
+                {
+                    return "Item Explicit Mods: " +
+                           Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
+                }
+                if (Items.Count >= 4)
+                {
+                    var remaining = Items.Count - 3;
+                    return "Item Explicit Mods: " + Items.Take(3)
+                        .Aggregate(string.Empty, (current, i) => current + i + ", ")
+                        .TrimEnd(' ')
+                        .TrimEnd(',') + " (+" + remaining + " more)";
+                }
+                return "Item Explicit Mods: (none)";
+            }
+        }
+
+        public override Color SummaryBackgroundColor => Colors.MidnightBlue;
+        public override Color SummaryTextColor => Colors.White;
+        public override int SortOrder => 21;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs
index cd06ae0..02c63e0 100644
--- a/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string SummaryText => "Height " + FilterPredicate;
         public override Color SummaryBackgroundColor => Colors.LightBlue;
         public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 10;
+        public override int SortOrder => 12;
         public override int Minimum => 0;
         public override int Maximum => 6;
     }
diff --git a/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs
index ace3d69..c2faccb 100644
--- a/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs
@@ -20,7 +20,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string SummaryText => "Item Level " + FilterPredicate;
         public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
         public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 12;
+        public override int SortOrder => 14;
         public override int Minimum => 0;
         public override int Maximum => 100;
     }
diff --git a/Filtration.ObjectModel/BlockItemTypes/MapIconBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/MapIconBlockItem.cs
new file mode 100644
index 0000000..a22f644
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/MapIconBlockItem.cs
@@ -0,0 +1,24 @@
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class MapIconBlockItem : IconBlockItem
+    {
+        public MapIconBlockItem()
+        {
+            Size = IconSize.Largest;
+            Color = IconColor.Red;
+            Shape = IconShape.Circle;
+        }
+
+        public MapIconBlockItem(IconSize size, IconColor iconColor, IconShape iconShape) : base(size, iconColor, iconShape)
+        {
+        }
+
+        public override string PrefixText => "MinimapIcon";
+        public override int MaximumAllowed => 1;
+        public override string DisplayHeading => "Minimap Icon";
+        public override int SortOrder => 29;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/MapTierBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/MapTierBlockItem.cs
new file mode 100644
index 0000000..34e3837
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/MapTierBlockItem.cs
@@ -0,0 +1,18 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class MapTierBlockItem : NumericFilterPredicateBlockItem
+    {
+        public override string PrefixText => "MapTier";
+        public override int MaximumAllowed => 2;
+        public override string DisplayHeading => "Map Tier";
+        public override string SummaryText => "Map Tier " + FilterPredicate;
+        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
+        public override Color SummaryTextColor => Colors.White;
+        public override int SortOrder => 8;
+        public override int Minimum => 1;
+        public override int Maximum => 16;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/PlayEffectBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/PlayEffectBlockItem.cs
new file mode 100644
index 0000000..6d5d00a
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/PlayEffectBlockItem.cs
@@ -0,0 +1,23 @@
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class PlayEffectBlockItem : EffectColorBlockItem
+    {
+        public PlayEffectBlockItem()
+        {
+            Color = EffectColor.Red;
+            Temporary = false;
+        }
+
+        public PlayEffectBlockItem(EffectColor effectColor, bool temporary) : base(effectColor, temporary)
+        {
+        }
+
+        public override string PrefixText => "PlayEffect";
+        public override int MaximumAllowed => 1;
+        public override string DisplayHeading => "Play Effect";
+        public override int SortOrder => 30;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs
index 076b845..4225f85 100644
--- a/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs
@@ -17,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string PrefixText => "PlayAlertSoundPositional";
         public override int MaximumAllowed => 1;
         public override string DisplayHeading => "Play Positional Alert Sound";
-        public override int SortOrder => 22;
+        public override int SortOrder => 27;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs
index 24ac5ef..4346739 100644
--- a/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs
@@ -30,7 +30,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
                                               ((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();
         public override Color SummaryBackgroundColor => Colors.LightCoral;
         public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 14;
+        public override int SortOrder => 18;
         public override int Minimum => 0;
         public override int Maximum => (int)ItemRarity.Unique;
     }
diff --git a/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs
index 550a6da..05a20e8 100644
--- a/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs
@@ -17,7 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string DisplayHeading => "Shaped Map";
         public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
         public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 8;
+        public override int SortOrder => 9;
 
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs
index 932d264..36a6a5f 100644
--- a/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs
@@ -39,7 +39,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
 
         public override Color SummaryBackgroundColor => Colors.GhostWhite;
         public override Color SummaryTextColor => Colors.Black;
-        public override int SortOrder => 9;
+        public override int SortOrder => 11;
 
         private SocketColor StringToSocketColor(char socketColorString)
         {
diff --git a/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs
index 1d8233a..a8311f5 100644
--- a/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs
@@ -17,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string PrefixText => "PlayAlertSound";
         public override int MaximumAllowed => 1;
         public override string DisplayHeading => "Play Alert Sound";
-        public override int SortOrder => 21;
+        public override int SortOrder => 26;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/StackSizeBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/StackSizeBlockItem.cs
new file mode 100644
index 0000000..43b903a
--- /dev/null
+++ b/Filtration.ObjectModel/BlockItemTypes/StackSizeBlockItem.cs
@@ -0,0 +1,28 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.BlockItemTypes
+{
+    public class StackSizeBlockItem : NumericFilterPredicateBlockItem
+    {
+        public StackSizeBlockItem()
+        {
+        }
+
+        public StackSizeBlockItem(FilterPredicateOperator predicateOperator, int predicateOperand)
+            : base(predicateOperator, predicateOperand)
+        {
+        }
+
+        public override string PrefixText => "StackSize";
+        public override int MaximumAllowed => 2;
+        public override string DisplayHeading => "Stack Size";
+        public override string SummaryText => "Stack Size " + FilterPredicate;
+        public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
+        public override Color SummaryTextColor => Colors.White;
+        public override int SortOrder => 17;
+        public override int Minimum => 0;
+        public override int Maximum => 1000;
+    }
+}
diff --git a/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs
index 81f36a6..41161f8 100644
--- a/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs
@@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string PrefixText => "SetTextColor";
         public override int MaximumAllowed => 1;
         public override string DisplayHeading => "Text Color";
-        public override int SortOrder => 17;
+        public override int SortOrder => 22;
     }
 }
diff --git a/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs
index b646547..10b8a51 100644
--- a/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs
@@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
         public override string SummaryText => "Width " + FilterPredicate;
         public override Color SummaryBackgroundColor => Colors.MediumPurple;
         public override Color SummaryTextColor => Colors.White;
-        public override int SortOrder => 11;
+        public override int SortOrder => 13;
         public override int Minimum => 0;
         public override int Maximum => 2;
     }
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveSectionToIndexCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveSectionToIndexCommand.cs
new file mode 100644
index 0000000..40d0bae
--- /dev/null
+++ b/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();
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/PasteSectionCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/PasteSectionCommand.cs
new file mode 100644
index 0000000..52458c6
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/PasteSectionCommand.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class PasteSectionCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly List<IItemFilterBlockBase> _pastedItemFilterBlocks;
+        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
+
+        public PasteSectionCommand(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();
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveSectionCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveSectionCommand.cs
new file mode 100644
index 0000000..2718eb3
--- /dev/null
+++ b/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();
+    }
+}
diff --git a/Filtration.ObjectModel/Enums/EffectColor.cs b/Filtration.ObjectModel/Enums/EffectColor.cs
new file mode 100644
index 0000000..8247823
--- /dev/null
+++ b/Filtration.ObjectModel/Enums/EffectColor.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel;
+
+namespace Filtration.ObjectModel.Enums
+{
+    public enum EffectColor
+    {
+        [Description("Red")]
+        Red,
+        [Description("Green")]
+        Green,
+        [Description("Blue")]
+        Blue,
+        [Description("Brown")]
+        Brown,
+        [Description("White")]
+        White,
+        [Description("Yellow")]
+        Yellow
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Enums/IconColor.cs b/Filtration.ObjectModel/Enums/IconColor.cs
new file mode 100644
index 0000000..7b143ba
--- /dev/null
+++ b/Filtration.ObjectModel/Enums/IconColor.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel;
+
+namespace Filtration.ObjectModel.Enums
+{
+    public enum IconColor
+    {
+        [Description("Red")]
+        Red,
+        [Description("Green")]
+        Green,
+        [Description("Blue")]
+        Blue,
+        [Description("Brown")]
+        Brown,
+        [Description("White")]
+        White,
+        [Description("Yellow")]
+        Yellow
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Enums/IconShape.cs b/Filtration.ObjectModel/Enums/IconShape.cs
new file mode 100644
index 0000000..9123d27
--- /dev/null
+++ b/Filtration.ObjectModel/Enums/IconShape.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel;
+
+namespace Filtration.ObjectModel.Enums
+{
+    public enum IconShape
+    {
+        [Description("Circle")]
+        Circle,
+        [Description("Diamond")]
+        Diamond,
+        [Description("Hexagon")]
+        Hexagon,
+        [Description("Square")]
+        Square,
+        [Description("Star")]
+        Star,
+        [Description("Triangle")]
+        Triangle
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Enums/IconSize.cs b/Filtration.ObjectModel/Enums/IconSize.cs
new file mode 100644
index 0000000..5cb086b
--- /dev/null
+++ b/Filtration.ObjectModel/Enums/IconSize.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel;
+
+namespace Filtration.ObjectModel.Enums
+{
+    public enum IconSize
+    {
+        [Description("Largest")]
+        Largest,
+        [Description("Medium")]
+        Medium,
+        [Description("Small")]
+        Small
+    }
+}
diff --git a/Filtration.ObjectModel/Enums/ThemeComponentType.cs b/Filtration.ObjectModel/Enums/ThemeComponentType.cs
index 4f17dc5..74b2498 100644
--- a/Filtration.ObjectModel/Enums/ThemeComponentType.cs
+++ b/Filtration.ObjectModel/Enums/ThemeComponentType.cs
@@ -9,6 +9,16 @@ namespace Filtration.ObjectModel.Enums
         [Description("Background")]
         BackgroundColor,
         [Description("Border")]
-        BorderColor
+        BorderColor,
+        [Description("Font Size")]
+        FontSize,
+        [Description("Alert Sound")]
+        AlertSound,
+        [Description("Custom Sound")]
+        CustomSound,
+        [Description("Icon")]
+        Icon,
+        [Description("Effect")]
+        Effect
     }
 }
diff --git a/Filtration.ObjectModel/Filtration.ObjectModel.csproj b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
index 0c3638b..22514bc 100644
--- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj
+++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
@@ -37,10 +37,26 @@
     <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
+    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    </Reference>
+    <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="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <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" />
@@ -52,15 +68,27 @@
     <Compile Include="BlockItemBaseTypes\BlockItemBase.cs" />
     <Compile Include="BlockItemBaseTypes\BooleanBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\ColorBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\ColorBooleanBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\DualIntegerBlockItem.cs" />
-    <Compile Include="BlockItemBaseTypes\StringIntBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\EffectColorBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\IconBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\StringBlockItem.cs" />
+    <Compile Include="BlockItemBaseTypes\StrIntBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\IntegerBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\NumericFilterPredicateBlockItem.cs" />
     <Compile Include="BlockItemBaseTypes\StringListBlockItem.cs" />
     <Compile Include="BlockItemTypes\BackgroundColorBlockItem.cs" />
     <Compile Include="BlockItemTypes\BaseTypeBlockItem.cs" />
+    <Compile Include="BlockItemTypes\MapTierBlockItem.cs" />
+    <Compile Include="BlockItemTypes\PlayEffectBlockItem.cs" />
     <Compile Include="BlockItemTypes\BorderColorBlockItem.cs" />
     <Compile Include="BlockItemTypes\ClassBlockItem.cs" />
+    <Compile Include="BlockItemTypes\CustomSoundBlockItem.cs" />
+    <Compile Include="BlockItemTypes\DisableDropSoundBlockItem.cs" />
+    <Compile Include="BlockItemTypes\ElderMapBlockItem.cs" />
+    <Compile Include="BlockItemTypes\GemLevelBlockItem.cs" />
+    <Compile Include="BlockItemTypes\HasExplicitModBlockItem.cs" />
+    <Compile Include="BlockItemTypes\MapIconBlockItem.cs" />
     <Compile Include="BlockItemTypes\ShapedMapBlockItem.cs" />
     <Compile Include="BlockItemTypes\ShaperItemBlockItem.cs" />
     <Compile Include="BlockItemTypes\ElderItemBlockItem.cs" />
@@ -77,38 +105,47 @@
     <Compile Include="BlockItemTypes\SocketsBlockItem.cs" />
     <Compile Include="BlockItemTypes\PositionalSoundBlockItem.cs" />
     <Compile Include="BlockItemTypes\SoundBlockItem.cs" />
+    <Compile Include="BlockItemTypes\StackSizeBlockItem.cs" />
     <Compile Include="BlockItemTypes\TextColorBlockItem.cs" />
     <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
-		<Compile Include="Commands\CommandManager.cs" />
+    <Compile Include="Commands\CommandManager.cs" />
     <Compile Include="Commands\ICommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveSectionToIndexCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\PasteBlockCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlockToBottomCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\AddCommentBlockCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlockDownCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlockUpCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\MoveBlockToTopCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\PasteSectionCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveSectionCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\SetScriptDescriptionCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\RemoveBlockCommand.cs" />
     <Compile Include="Commands\ItemFilterScript\AddBlockCommand.cs" />
     <Compile Include="Commands\IUndoableCommand.cs" />
     <Compile Include="Enums\BlockAction.cs" />
     <Compile Include="Enums\BlockItemType.cs" />
+    <Compile Include="Enums\EffectColor.cs" />
     <Compile Include="Enums\FilterPredicateOperator.cs" />
     <Compile Include="Enums\FilterType.cs" />
+    <Compile Include="Enums\IconColor.cs" />
+    <Compile Include="Enums\IconShape.cs" />
+    <Compile Include="Enums\IconSize.cs" />
     <Compile Include="Enums\ItemRarity.cs" />
     <Compile Include="Enums\SocketColor.cs" />
     <Compile Include="Enums\ThemeComponentType.cs" />
     <Compile Include="Extensions\EnumHelper.cs" />
     <Compile Include="Extensions\ItemRarityExtensions.cs" />
-		<Compile Include="Factories\IItemFilterScriptFactory.cs" />
+    <Compile Include="Factories\IItemFilterScriptFactory.cs" />
     <Compile Include="FilteredItem.cs" />
     <Compile Include="IAudioVisualBlockItem.cs" />
+    <Compile Include="IBlockItemWithTheme.cs" />
     <Compile Include="IItemFilterBlockItem.cs" />
     <Compile Include="Item.cs" />
     <Compile Include="ItemFilterBlock.cs" />
     <Compile Include="ItemFilterBlockGroup.cs" />
     <Compile Include="ItemFilterScript.cs" />
-		<Compile Include="ItemFilterScriptSettings.cs" />
+    <Compile Include="ItemFilterScriptSettings.cs" />
     <Compile Include="ItemSet.cs" />
     <Compile Include="NumericFilterPredicate.cs" />
     <Compile Include="PathOfExileNamedColors.cs" />
@@ -118,12 +155,21 @@
     <Compile Include="ReplaceColorsParameterSet.cs" />
     <Compile Include="Socket.cs" />
     <Compile Include="SocketGroup.cs" />
+    <Compile Include="ThemeEditor\EffectColorThemeComponent.cs" />
+    <Compile Include="ThemeEditor\IconThemeComponent.cs" />
+    <Compile Include="ThemeEditor\StringThemeComponent.cs" />
+    <Compile Include="ThemeEditor\StrIntThemeComponent.cs" />
+    <Compile Include="ThemeEditor\IntegerThemeComponent.cs" />
     <Compile Include="ThemeEditor\Theme.cs" />
+    <Compile Include="ThemeEditor\ColorThemeComponent.cs" />
     <Compile Include="ThemeEditor\ThemeComponent.cs" />
     <Compile Include="ThemeEditor\ThemeComponentCollection.cs" />
     <Compile Include="WindsorInstallers\CommandsInstaller.cs" />
     <Compile Include="WindsorInstallers\ModelsInstaller.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.
diff --git a/Filtration.ObjectModel/IBlockItemWithTheme.cs b/Filtration.ObjectModel/IBlockItemWithTheme.cs
new file mode 100644
index 0000000..5971eb0
--- /dev/null
+++ b/Filtration.ObjectModel/IBlockItemWithTheme.cs
@@ -0,0 +1,9 @@
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel
+{
+    public interface IBlockItemWithTheme : IItemFilterBlockItem
+    {
+        ThemeComponent ThemeComponent { get; }
+    }
+}
diff --git a/Filtration.ObjectModel/ItemFilterBlock.cs b/Filtration.ObjectModel/ItemFilterBlock.cs
index 6fd27c9..aa148d9 100644
--- a/Filtration.ObjectModel/ItemFilterBlock.cs
+++ b/Filtration.ObjectModel/ItemFilterBlock.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
@@ -22,12 +23,18 @@ namespace Filtration.ObjectModel
         Color DisplayTextColor { get; }
         Color DisplayBorderColor { get; }
         double DisplayFontSize { get; }
+        int DisplayIconSize { get; }
+        int DisplayIconColor { get; }
+        int DisplayIconShape { get; }
+        Color DisplayEffectColor { get; }
         bool HasBlockItemOfType<T>();
         bool HasBlockGroupInParentHierarchy(ItemFilterBlockGroup targetBlockGroup, ItemFilterBlockGroup startingBlockGroup);
     }
 
     public interface IItemFilterBlockBase
     {
+        bool IsEdited { get; set; }
+        string OriginalText { get; set; } 
     }
 
     public abstract class ItemFilterBlockBase : IItemFilterBlockBase
@@ -44,6 +51,8 @@ namespace Filtration.ObjectModel
 
         public ICommandManager CommandManager { get; }
         public IItemFilterScript ParentScript { get; set; }
+        public bool IsEdited { get; set; }
+        public string OriginalText { get; set; }
     }
 
     public interface IItemFilterCommentBlock : IItemFilterBlockBase
@@ -53,29 +62,60 @@ namespace Filtration.ObjectModel
 
     public class ItemFilterCommentBlock : ItemFilterBlockBase, IItemFilterCommentBlock
     {
+        private string _comment;
         public ItemFilterCommentBlock(IItemFilterScript parentScript) : base(parentScript)
         {
         }
 
-        public string Comment { get; set; }
+        public string Comment
+        {
+            get { return _comment; }
+            set
+            {
+                _comment = value;
+                IsEdited = true;
+            }
+        }
     }
 
     public class ItemFilterBlock : ItemFilterBlockBase, IItemFilterBlock
     {
         private ItemFilterBlockGroup _blockGroup;
+        private bool _enabled;
+        private string _description;
 
         internal ItemFilterBlock()
         {
             BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
+            BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
+            _enabled = true;
         }
 
         public ItemFilterBlock(IItemFilterScript parentScript) : base(parentScript)
         {
             BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
+            BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
+            _enabled = true;
         }
 
-        public bool Enabled { get; set; } = true;
-        public string Description { get; set; }
+        public bool Enabled
+        {
+            get { return _enabled; }
+            set
+            {
+                _enabled = value;
+                IsEdited = true;
+            }
+        }
+        public string Description
+        {
+            get { return _description; }
+            set
+            {
+                _description = value;
+                IsEdited = true;
+            }
+        }
 
         public ItemFilterBlockGroup BlockGroup
         {
@@ -114,12 +154,17 @@ namespace Filtration.ObjectModel
             {
                 var actionBlock = BlockItems.OfType<ActionBlockItem>().First();
                 actionBlock.Action = value;
+                IsEdited = true;
             }
         }
 
         public ActionBlockItem ActionBlockItem { get; } = new ActionBlockItem(BlockAction.Show);
 
         public ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
+        private void OnBlockItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            IsEdited = true;
+        }
 
         public bool AddBlockItemAllowed(Type type)
         {
@@ -219,5 +264,70 @@ namespace Filtration.ObjectModel
                 return fontSizeBlockItem?.Value ?? 34;
             }
         }
+
+        public int DisplayIconSize
+        {
+            get
+            {
+                var mapIconBlockItem = BlockItems.OfType<MapIconBlockItem>().FirstOrDefault();
+                if (mapIconBlockItem != null)
+                    return (int)mapIconBlockItem.Size;
+
+                return -1;
+            }
+        }
+
+        public int DisplayIconColor
+        {
+            get
+            {
+                var mapIconBlockItem = BlockItems.OfType<MapIconBlockItem>().FirstOrDefault();
+                if (mapIconBlockItem != null)
+                    return (int)mapIconBlockItem.Color;
+
+                return -1;
+            }
+        }
+
+        public int DisplayIconShape
+        {
+            get
+            {
+                var mapIconBlockItem = BlockItems.OfType<MapIconBlockItem>().FirstOrDefault();
+                if (mapIconBlockItem != null)
+                    return (int)mapIconBlockItem.Shape;
+
+                return -1;
+            }
+        }
+
+        public Color DisplayEffectColor
+        {
+            get
+            {
+                var beamBlockItem = BlockItems.OfType<PlayEffectBlockItem>().FirstOrDefault();
+
+                if (beamBlockItem != null)
+                {
+                    switch (beamBlockItem.Color)
+                    {
+                        case EffectColor.Red:
+                            return Colors.Red;
+                        case EffectColor.Green:
+                            return Colors.Green;
+                        case EffectColor.Blue:
+                            return Colors.Blue;
+                        case EffectColor.Brown:
+                            return Colors.Brown;
+                        case EffectColor.White:
+                            return Colors.White;
+                        case EffectColor.Yellow:
+                            return Colors.Yellow;
+                    }
+                }
+
+                return Colors.Transparent;
+            }
+        }
     }
 }
diff --git a/Filtration.ObjectModel/ThemeEditor/ColorThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/ColorThemeComponent.cs
new file mode 100644
index 0000000..044f468
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/ColorThemeComponent.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class ColorThemeComponent : ThemeComponent
+    {
+        private Color _color;
+
+        public ColorThemeComponent(ThemeComponentType componentType, string componentName, Color componentColor)
+        {
+            if (componentName == null || componentColor == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in ColorThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            Color = componentColor;
+            ComponentName = componentName;
+        }
+
+        public Color Color
+        {
+            get { return _color; }
+            set
+            {
+                _color = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/EffectColorThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/EffectColorThemeComponent.cs
new file mode 100644
index 0000000..ec99fc6
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/EffectColorThemeComponent.cs
@@ -0,0 +1,47 @@
+using System;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class EffectColorThemeComponent : ThemeComponent
+    {
+        private EffectColor _effectColor;
+        private bool _temporary;
+
+        public EffectColorThemeComponent(ThemeComponentType componentType, string componentName, EffectColor componentEffectColor, bool componentTemporary)
+        {
+            if (componentName == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in EffectColorThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            ComponentName = componentName;
+            EffectColor = componentEffectColor;
+            Temporary = componentTemporary;
+        }
+
+        public EffectColor EffectColor
+        {
+            get { return _effectColor; }
+            set
+            {
+                _effectColor = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public bool Temporary
+        {
+            get { return _temporary; }
+            set
+            {
+                _temporary = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/IconThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/IconThemeComponent.cs
new file mode 100644
index 0000000..fd7f082
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/IconThemeComponent.cs
@@ -0,0 +1,60 @@
+using System;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class IconThemeComponent : ThemeComponent
+    {
+        private IconSize _iconSize;
+        private IconColor _iconColor;
+        private IconShape _iconShape;
+
+        public IconThemeComponent(ThemeComponentType componentType, string componentName, IconSize componentIconSize, IconColor componentIconColor, IconShape componentIconShape)
+        {
+            if (componentName == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in IconThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            ComponentName = componentName;
+            IconSize = componentIconSize;
+            IconColor = componentIconColor;
+            IconShape = componentIconShape;
+        }
+
+        public IconSize IconSize
+        {
+            get { return _iconSize; }
+            set
+            {
+                _iconSize = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public IconColor IconColor
+        {
+            get { return _iconColor; }
+            set
+            {
+                _iconColor = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public IconShape IconShape
+        {
+            get { return _iconShape; }
+            set
+            {
+                _iconShape = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/IntegerThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/IntegerThemeComponent.cs
new file mode 100644
index 0000000..a72d822
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/IntegerThemeComponent.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class IntegerThemeComponent : ThemeComponent
+    {
+        private int _value;
+
+        public IntegerThemeComponent(ThemeComponentType componentType, string componentName, int componentValue)
+        {
+            if (componentName == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in IntegerThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            Value = componentValue;
+            ComponentName = componentName;
+        }
+
+        public int Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
new file mode 100644
index 0000000..945eac8
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
@@ -0,0 +1,47 @@
+using System;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class StrIntThemeComponent : ThemeComponent
+    {
+        private string _value;
+        private int _secondValue;
+
+        public StrIntThemeComponent(ThemeComponentType componentType, string componentName, string componentValue, int componentSecondValue)
+        {
+            if (componentName == null || componentValue == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in StrIntThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            Value = componentValue;
+            SecondValue = componentSecondValue;
+            ComponentName = componentName;
+        }
+
+        public string Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public int SecondValue
+        {
+            get { return _secondValue; }
+            set
+            {
+                _secondValue = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
new file mode 100644
index 0000000..98b98e4
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.ObjectModel;
+using Filtration.ObjectModel.Enums;
+using GalaSoft.MvvmLight.Command;
+using Microsoft.Win32;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class StringThemeComponent : ThemeComponent
+    {
+        private string _value;
+        public static ObservableCollection<string> _customSoundsAvailable;
+
+        public StringThemeComponent(ThemeComponentType componentType, string componentName, string componentValue)
+        {
+            if (componentName == null || componentValue == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in StringThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            Value = componentValue;
+            ComponentName = componentName;
+
+            if (_customSoundsAvailable == null || _customSoundsAvailable.Count < 1)
+            {
+                _customSoundsAvailable = new ObservableCollection<string> {
+                    "1maybevaluable.mp3", "2currency.mp3", "3uniques.mp3", "4maps.mp3", "5highmaps.mp3",
+                    "6veryvaluable.mp3", "7chancing.mp3", "12leveling.mp3", "placeholder.mp3"
+                };
+            }
+
+            if (_customSoundsAvailable.IndexOf(Value) < 0)
+            {
+                _customSoundsAvailable.Add(Value);
+            }
+            
+            CustomSoundFileDialogCommand = new RelayCommand(OnCustomSoundFileDialog);
+        }
+
+        public RelayCommand CustomSoundFileDialogCommand { get; set; }
+
+        public ObservableCollection<string> CustomSoundsAvailable => _customSoundsAvailable;
+
+        public string Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void OnCustomSoundFileDialog()
+        {
+            OpenFileDialog fileDialog = new OpenFileDialog();
+            fileDialog.DefaultExt = ".mp3";
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            fileDialog.InitialDirectory = poePath;
+
+            Nullable<bool> result = fileDialog.ShowDialog();
+            if (result == true)
+            {
+                var fileName = fileDialog.FileName;
+                if (fileName.StartsWith(poePath))
+                {
+                    fileName = fileName.Replace(poePath, "");
+                }
+
+                if (CustomSoundsAvailable.IndexOf(fileName) < 0)
+                {
+                    CustomSoundsAvailable.Add(fileName);
+                    OnPropertyChanged(nameof(CustomSoundsAvailable));
+                }
+                Value = fileName;
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/Theme.cs b/Filtration.ObjectModel/ThemeEditor/Theme.cs
index d21f2b4..7d9d3fc 100644
--- a/Filtration.ObjectModel/ThemeEditor/Theme.cs
+++ b/Filtration.ObjectModel/ThemeEditor/Theme.cs
@@ -32,7 +32,17 @@ namespace Filtration.ObjectModel.ThemeEditor
 
         public void AddComponent(ThemeComponentType componentType, string componentName, Color componentColor)
         {
-            _components.Add(new ThemeComponent(componentType, componentName, componentColor));
+            _components.Add(new ColorThemeComponent(componentType, componentName, componentColor));
+        }
+
+        public void AddComponent(ThemeComponentType componentType, string componentName, int componentValue)
+        {
+            _components.Add(new IntegerThemeComponent(componentType, componentName, componentValue));
+        }
+
+        public void AddComponent(ThemeComponentType componentType, string componentName, string componentValue, int componentSecondValue)
+        {
+            _components.Add(new StrIntThemeComponent(componentType, componentName, componentValue, componentSecondValue));
         }
     }
 }
diff --git a/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
index 635dbb7..07169bd 100644
--- a/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
@@ -10,8 +10,7 @@ namespace Filtration.ObjectModel.ThemeEditor
     [Serializable]
     public class ThemeComponent : INotifyPropertyChanged
     {
-        private Color _color;
-        private EventHandler _themeComponentUpdatedEventHandler;
+        protected EventHandler _themeComponentUpdatedEventHandler;
         private readonly object _eventLock = new object();
 
         public ThemeComponent()
@@ -19,18 +18,6 @@ namespace Filtration.ObjectModel.ThemeEditor
             
         }
 
-        public ThemeComponent(ThemeComponentType componentType, string componentName, Color componentColor)
-        {
-            if (componentName == null || componentColor == null)
-            {
-                throw new ArgumentException("Null parameters not allowed in ThemeComponent constructor");
-            }
-
-            ComponentType = componentType;
-            Color = componentColor;
-            ComponentName = componentName;
-        }
-
         // By implementing a custom event accessor here we can keep the UsageCount up to date.
         public event EventHandler ThemeComponentUpdated
         {
@@ -58,17 +45,6 @@ namespace Filtration.ObjectModel.ThemeEditor
         public string ComponentName { get; set; }
         public ThemeComponentType ComponentType{ get; set; }
 
-        public Color Color
-        {
-            get { return _color; }
-            set
-            {
-                _color = value;
-                OnPropertyChanged();
-                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
         public int UsageCount
         {
             get
diff --git a/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs b/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
index 12eaf7e..ef41379 100644
--- a/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
+++ b/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
@@ -16,7 +16,72 @@ namespace Filtration.ObjectModel.ThemeEditor
                 return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
             }
 
-            var component = new ThemeComponent(componentType, componentName, componentColor);
+            var component = new ColorThemeComponent(componentType, componentName, componentColor);
+            Items.Add(component);
+
+            return component;
+        }
+
+        public ThemeComponent AddComponent(ThemeComponentType componentType, string componentName, int componentValue)
+        {
+            if (ComponentExists(componentType, componentName))
+            {
+                return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
+            }
+
+            var component = new IntegerThemeComponent(componentType, componentName, componentValue);
+            Items.Add(component);
+
+            return component;
+        }
+
+        public ThemeComponent AddComponent(ThemeComponentType componentType, string componentName, string componentValue, int componentSecondValue)
+        {
+            if (ComponentExists(componentType, componentName))
+            {
+                return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
+            }
+
+            var component = new StrIntThemeComponent(componentType, componentName, componentValue, componentSecondValue);
+            Items.Add(component);
+
+            return component;
+        }
+
+        public ThemeComponent AddComponent(ThemeComponentType componentType, string componentName, string componentValue)
+        {
+            if (ComponentExists(componentType, componentName))
+            {
+                return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
+            }
+
+            var component = new StringThemeComponent(componentType, componentName, componentValue);
+            Items.Add(component);
+
+            return component;
+        }
+
+        public ThemeComponent AddComponent(ThemeComponentType componentType, string componentName, IconSize componentIconSize, IconColor componentIconColor, IconShape componentIconShape)
+        {
+            if (ComponentExists(componentType, componentName))
+            {
+                return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
+            }
+
+            var component = new IconThemeComponent(componentType, componentName, componentIconSize, componentIconColor, componentIconShape);
+            Items.Add(component);
+
+            return component;
+        }
+
+        public ThemeComponent AddComponent(ThemeComponentType componentType, string componentName, EffectColor componentEffectColor, bool componentTemporary)
+        {
+            if (ComponentExists(componentType, componentName))
+            {
+                return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
+            }
+
+            var component = new EffectColorThemeComponent(componentType, componentName, componentEffectColor, componentTemporary);
             Items.Add(component);
 
             return component;
diff --git a/Filtration.ObjectModel/packages.config b/Filtration.ObjectModel/packages.config
index 2eb5957..9533110 100644
--- a/Filtration.ObjectModel/packages.config
+++ b/Filtration.ObjectModel/packages.config
@@ -2,4 +2,6 @@
 <packages>
   <package id="Castle.Core" version="3.3.0" targetFramework="net461" />
   <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs b/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
index 859e276..1810f33 100644
--- a/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
+++ b/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
@@ -5,8 +5,8 @@ namespace Filtration.Parser.Interface.Services
 {
     public interface IItemFilterBlockTranslator
     {
-        IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, bool initialiseBlockGroupHierarchyBuilder = false);
-        IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript);
+        IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, string originalString = "", bool initialiseBlockGroupHierarchyBuilder = false);
+        IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript, string originalString = "");
 
         string TranslateItemFilterBlockToString(IItemFilterBlock block);
         void ReplaceAudioVisualBlockItemsFromString(ObservableCollection<IItemFilterBlockItem> blockItems, string inputString);
diff --git a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
index e05f9d4..ca849fe 100644
--- a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
+++ b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
@@ -318,6 +318,42 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(FilterPredicateOperator.Equal, blockItem.FilterPredicate.PredicateOperator);
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_GemLevel_ReturnsCorrectObject()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              "    GemLevel = 20";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is GemLevelBlockItem));
+            var blockItem = result.BlockItems.OfType<GemLevelBlockItem>().First();
+            Assert.AreEqual(20, blockItem.FilterPredicate.PredicateOperand);
+            Assert.AreEqual(FilterPredicateOperator.Equal, blockItem.FilterPredicate.PredicateOperator);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_StackSize_ReturnsCorrectObject()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              "    StackSize > 5";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is StackSizeBlockItem));
+            var blockItem = result.BlockItems.OfType<StackSizeBlockItem>().First();
+            Assert.AreEqual(5, blockItem.FilterPredicate.PredicateOperand);
+            Assert.AreEqual(FilterPredicateOperator.GreaterThan, blockItem.FilterPredicate.PredicateOperator);
+        }
+
         [Test]
         public void TranslateStringToItemFilterBlock_Corrupted_ReturnsCorrectObject()
         {
@@ -386,6 +422,23 @@ namespace Filtration.Parser.Tests.Services
             Assert.IsFalse(blockItem.BooleanValue);
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_ElderMap_ReturnsCorrectObject()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              "    ElderMap false";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is ElderMapBlockItem));
+            var blockItem = result.BlockItems.OfType<ElderMapBlockItem>().First();
+            Assert.IsFalse(blockItem.BooleanValue);
+        }
+
         [Test]
         public void TranslateStringToItemFilterBlock_Identified_ReturnsCorrectObject()
         {
@@ -494,6 +547,25 @@ namespace Filtration.Parser.Tests.Services
             Assert.Contains("Test BaseType 2", blockItem.Items);
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_HasExplicitMod_ReturnsCorrectObject()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              @"    HasExplicitMod ""Test Mod 1"" ""TestOneWordModInQuotes"" TestOneWordModNotInQuotes ""Test Mod 2""";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is HasExplicitModBlockItem));
+            var blockItem = result.BlockItems.OfType<HasExplicitModBlockItem>().First();
+            Assert.Contains("Test Mod 1", blockItem.Items);
+            Assert.Contains("TestOneWordModInQuotes", blockItem.Items);
+            Assert.Contains("TestOneWordModNotInQuotes", blockItem.Items);
+            Assert.Contains("Test Mod 2", blockItem.Items);
+        }
+
         [Test]
         public void TranslateStringToItemFilterBlock_Sockets_ReturnsCorrectObject()
         {
@@ -701,7 +773,7 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var inputString = "Show" + Environment.NewLine +
                               "    SetTextColor 255 20 100 # Rare Item Text";
-            var testComponent = new ThemeComponent(ThemeComponentType.TextColor, "Rare Item Text", new Color { 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
@@ -802,7 +874,24 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual("7", blockItem.Value);
             Assert.AreEqual(95, blockItem.SecondValue);
         }
-        
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_DisableDropSound_ReturnsCorrectObject()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              "    DisableDropSound True";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is DisableDropSoundBlockItem));
+            var blockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
+            Assert.IsTrue(blockItem.BooleanValue);
+        }
+
         [Test]
         public void TranslateStringToItemFilterBlock_Everything_ReturnsCorrectObject()
         {
@@ -813,6 +902,8 @@ namespace Filtration.Parser.Tests.Services
                               "Show" + Environment.NewLine +
                               "    ItemLevel >= 50" + Environment.NewLine +
                               "    DropLevel < 70" + Environment.NewLine +
+                              "    GemLevel = 20" + Environment.NewLine +
+                              "    StackSize > 2" + Environment.NewLine +
                               "    Quality = 15" + Environment.NewLine +
                               "    Rarity <= Unique" + Environment.NewLine +
                               "    Identified True" + Environment.NewLine +
@@ -820,8 +911,10 @@ namespace Filtration.Parser.Tests.Services
                               "    ElderItem true" + Environment.NewLine +
                               "    ShaperItem False" + Environment.NewLine +
                               "    ShapedMap TRUE" + Environment.NewLine +
+                              "    ElderMap False" + Environment.NewLine +
                               @"    Class ""My Item Class"" AnotherClass ""AndAnotherClass""" + Environment.NewLine +
                               @"    BaseType MyBaseType ""Another BaseType""" + Environment.NewLine +
+                              @"    HasExplicitMod MyMod ""Another Mod""" + Environment.NewLine +
                               "    JunkLine Let's ignore this one!" + Environment.NewLine +
                               "    #Quality Commented out quality line" + Environment.NewLine +
                               "    Sockets >= 3" + Environment.NewLine +
@@ -831,7 +924,8 @@ namespace Filtration.Parser.Tests.Services
                               "    SetBackgroundColor 255 100 5" + Environment.NewLine +
                               "    SetBorderColor 0 0 0" + Environment.NewLine +
                               "    SetFontSize 50" + Environment.NewLine +
-                              "    PlayAlertSound 3" + Environment.NewLine;
+                              "    PlayAlertSound 3" + Environment.NewLine +
+                              "    DisableDropSound False" + Environment.NewLine;
 
             // Act
             var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
@@ -857,10 +951,21 @@ namespace Filtration.Parser.Tests.Services
             var shapedMapBlockItem = result.BlockItems.OfType<ShapedMapBlockItem>().First();
             Assert.IsTrue(shapedMapBlockItem.BooleanValue);
 
+            var elderMapBlockItem = result.BlockItems.OfType<ElderMapBlockItem>().First();
+            Assert.IsFalse(elderMapBlockItem.BooleanValue);
+
             var dropLevelblockItem = result.BlockItems.OfType<DropLevelBlockItem>().First();
             Assert.AreEqual(FilterPredicateOperator.LessThan, dropLevelblockItem.FilterPredicate.PredicateOperator);
             Assert.AreEqual(70, dropLevelblockItem.FilterPredicate.PredicateOperand);
 
+            var gemLevelBlockItem = result.BlockItems.OfType<GemLevelBlockItem>().First();
+            Assert.AreEqual(FilterPredicateOperator.Equal, gemLevelBlockItem.FilterPredicate.PredicateOperator);
+            Assert.AreEqual(20, gemLevelBlockItem.FilterPredicate.PredicateOperand);
+
+            var stackSizeBlockItem = result.BlockItems.OfType<StackSizeBlockItem>().First();
+            Assert.AreEqual(FilterPredicateOperator.GreaterThan, stackSizeBlockItem.FilterPredicate.PredicateOperator);
+            Assert.AreEqual(2, stackSizeBlockItem.FilterPredicate.PredicateOperand);
+
             var qualityblockItem = result.BlockItems.OfType<QualityBlockItem>().First();
             Assert.AreEqual(FilterPredicateOperator.Equal, qualityblockItem.FilterPredicate.PredicateOperator);
             Assert.AreEqual(15, qualityblockItem.FilterPredicate.PredicateOperand);
@@ -880,6 +985,11 @@ namespace Filtration.Parser.Tests.Services
             Assert.Contains("MyBaseType", baseTypeblockItem.Items);
             Assert.Contains("Another BaseType", baseTypeblockItem.Items);
 
+            var hasExplicitModBlockItem = result.BlockItems.OfType<HasExplicitModBlockItem>().First();
+            Assert.AreEqual(2, hasExplicitModBlockItem.Items.Count);
+            Assert.Contains("MyMod", hasExplicitModBlockItem.Items);
+            Assert.Contains("Another Mod", hasExplicitModBlockItem.Items);
+
             var socketsblockItem = result.BlockItems.OfType<SocketsBlockItem>().First();
             Assert.AreEqual(FilterPredicateOperator.GreaterThanOrEqual, socketsblockItem.FilterPredicate.PredicateOperator);
             Assert.AreEqual(3, socketsblockItem.FilterPredicate.PredicateOperand);
@@ -917,6 +1027,9 @@ namespace Filtration.Parser.Tests.Services
             var soundblockItem = result.BlockItems.OfType<SoundBlockItem>().First();
             Assert.AreEqual("3", soundblockItem.Value);
             Assert.AreEqual(79, soundblockItem.SecondValue);
+
+            var disableDropSoundBlockItem = result.BlockItems.OfType<DisableDropSoundBlockItem>().First();
+            Assert.IsFalse(disableDropSoundBlockItem.BooleanValue);
         }
 
         [Test]
@@ -1151,6 +1264,8 @@ namespace Filtration.Parser.Tests.Services
             var expectedResult = "Show";
 
             // Act
+            // TODO: Shouldn't be set to edited this way
+            _testUtility.TestBlock.IsEdited = true;
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
 
             // Assert
@@ -1166,8 +1281,10 @@ namespace Filtration.Parser.Tests.Services
             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
+            _testUtility.TestBlock.IsEdited = true;
             // Act
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
 
@@ -1183,6 +1300,8 @@ namespace Filtration.Parser.Tests.Services
             var expectedResult = $"Show #{testInputActionBlockComment}";
 
             _testUtility.TestBlock.BlockItems.OfType<ActionBlockItem>().First().Comment = testInputActionBlockComment;
+            // TODO: Shouldn't be set to edited this way
+            _testUtility.TestBlock.IsEdited = true;
 
             // Act
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
@@ -1334,6 +1453,38 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(expectedResult, result);
         }
 
+        [Test]
+        public void TranslateItemFilterBlockToString_GemLevel_ReturnsCorrectString()
+        {
+            // Arrange
+            var expectedResult = "Show" + Environment.NewLine +
+                                 "    GemLevel <= 15";
+
+            _testUtility.TestBlock.BlockItems.Add(new GemLevelBlockItem(FilterPredicateOperator.LessThanOrEqual, 15));
+
+            // Act
+            var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
+
+            // Assert
+            Assert.AreEqual(expectedResult, result);
+        }
+
+        [Test]
+        public void TranslateItemFilterBlockToString_StackSize_ReturnsCorrectString()
+        {
+            // Arrange
+            var expectedResult = "Show" + Environment.NewLine +
+                                 "    StackSize = 5";
+
+            _testUtility.TestBlock.BlockItems.Add(new StackSizeBlockItem(FilterPredicateOperator.Equal, 5));
+
+            // Act
+            var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
+
+            // Assert
+            Assert.AreEqual(expectedResult, result);
+        }
+
         [Test]
         public void TranslateItemFilterBlockToString_Quality_ReturnsCorrectString()
         {
@@ -1425,6 +1576,26 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(expectedResult, result);
         }
 
+        [Test]
+        public void TranslateItemFilterBlockToString_HasExplicitMod_ReturnsCorrectString()
+        {
+            // Arrange
+            var expectedResult = "Show" + Environment.NewLine +
+                                 "    HasExplicitMod \"Test Mod\" \"Another Mod\" \"Yet Another Mod\"";
+
+            var hasExplicitModBlockItem = new HasExplicitModBlockItem();
+            hasExplicitModBlockItem.Items.Add("Test Mod");
+            hasExplicitModBlockItem.Items.Add("Another Mod");
+            hasExplicitModBlockItem.Items.Add("Yet Another Mod");
+            _testUtility.TestBlock.BlockItems.Add(hasExplicitModBlockItem);
+
+            // Act
+            var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
+
+            // Assert
+            Assert.AreEqual(expectedResult, result);
+        }
+
         [Test]
         public void TranslateItemFilterBlockToString_Sockets_ReturnsCorrectString()
         {
@@ -1533,7 +1704,7 @@ namespace Filtration.Parser.Tests.Services
 
             var blockItem = new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255})
             {
-                ThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Test Theme Component", new Color())
+                ThemeComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Test Theme Component", new Color())
             };
 
             _testUtility.TestBlock.BlockItems.Add(blockItem);
@@ -1671,10 +1842,8 @@ namespace Filtration.Parser.Tests.Services
         public void TranslateItemFilterBlockToString_DisabledBlock_ReturnsCorrectString()
         {
             // Arrange
-            var expectedResult = "#Disabled Block Start" + Environment.NewLine +
-                                 "#Show" + Environment.NewLine +
-                                 "#    Width = 4" + Environment.NewLine +
-                                 "#Disabled Block End";
+            var expectedResult = "#Show" + Environment.NewLine +
+                                 "#    Width = 4";
                                  
 
             _testUtility.TestBlock.Enabled = false;
@@ -1700,20 +1869,25 @@ namespace Filtration.Parser.Tests.Services
                                  "    ElderItem True" + Environment.NewLine +
                                  "    ShaperItem False" + Environment.NewLine +
                                  "    ShapedMap True" + Environment.NewLine +
+                                 "    ElderMap True" + Environment.NewLine +
                                  "    Height <= 6" + Environment.NewLine +
                                  "    Height >= 2" + Environment.NewLine +
                                  "    Width = 3" + Environment.NewLine +
                                  "    ItemLevel > 70" + Environment.NewLine +
                                  "    ItemLevel <= 85" + Environment.NewLine +
                                  "    DropLevel > 56" + Environment.NewLine +
+                                 "    GemLevel < 15" + Environment.NewLine +
+                                 "    StackSize >= 4" + Environment.NewLine +
                                  "    Rarity = Unique" + Environment.NewLine +
                                  "    Class \"Body Armour\" \"Gloves\" \"Belt\" \"Two Hand Axes\"" + Environment.NewLine +
                                  "    BaseType \"Greater Life Flask\" \"Simple Robe\" \"Full Wyrmscale\"" + Environment.NewLine +
+                                 "    HasExplicitMod \"Guatelitzi's\" \"of Tacati\" \"Tyrannical\"" + Environment.NewLine +
                                  "    SetTextColor 255 89 0 56" + Environment.NewLine +
                                  "    SetBackgroundColor 0 0 0" + Environment.NewLine +
                                  "    SetBorderColor 255 1 254" + Environment.NewLine +
                                  "    SetFontSize 50" + Environment.NewLine +
-                                 "    PlayAlertSound 6 90";
+                                 "    PlayAlertSound 6 90" + Environment.NewLine +
+                                 "    DisableDropSound True";
 
             _testUtility.TestBlock.BlockItems.Add(new ActionBlockItem(BlockAction.Show));
             _testUtility.TestBlock.BlockItems.Add(new IdentifiedBlockItem(true));
@@ -1722,6 +1896,8 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 70));
             _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.LessThanOrEqual, 85));
             _testUtility.TestBlock.BlockItems.Add(new DropLevelBlockItem(FilterPredicateOperator.GreaterThan, 56));
+            _testUtility.TestBlock.BlockItems.Add(new GemLevelBlockItem(FilterPredicateOperator.LessThan, 15));
+            _testUtility.TestBlock.BlockItems.Add(new StackSizeBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 4));
             _testUtility.TestBlock.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.GreaterThan, 2));
             _testUtility.TestBlock.BlockItems.Add(new RarityBlockItem(FilterPredicateOperator.Equal, (int)ItemRarity.Unique));
             var classItemblockItem = new ClassBlockItem();
@@ -1735,6 +1911,11 @@ namespace Filtration.Parser.Tests.Services
             baseTypeItemblockItem.Items.Add("Simple Robe");
             baseTypeItemblockItem.Items.Add("Full Wyrmscale");
             _testUtility.TestBlock.BlockItems.Add(baseTypeItemblockItem);
+            var hasExplicitModBlockItem = new HasExplicitModBlockItem();
+            hasExplicitModBlockItem.Items.Add("Guatelitzi's");
+            hasExplicitModBlockItem.Items.Add("of Tacati");
+            hasExplicitModBlockItem.Items.Add("Tyrannical");
+            _testUtility.TestBlock.BlockItems.Add(hasExplicitModBlockItem);
             _testUtility.TestBlock.BlockItems.Add(new SocketsBlockItem(FilterPredicateOperator.LessThanOrEqual, 6));
             _testUtility.TestBlock.BlockItems.Add(new LinkedSocketsBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 4));
             _testUtility.TestBlock.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 3));
@@ -1748,6 +1929,8 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new ElderItemBlockItem(true));
             _testUtility.TestBlock.BlockItems.Add(new ShaperItemBlockItem(false));
             _testUtility.TestBlock.BlockItems.Add(new ShapedMapBlockItem(true));
+            _testUtility.TestBlock.BlockItems.Add(new ElderMapBlockItem(true));
+            _testUtility.TestBlock.BlockItems.Add(new DisableDropSoundBlockItem(true));
 
             // Act
             var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
diff --git a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
index 2412bc0..31290a8 100644
--- a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
+++ b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
@@ -27,6 +27,7 @@ namespace Filtration.Parser.Tests.Services
         }
 
         [Test]
+        [Ignore("Outdated item filter")]
         public void TranslateStringToItemFilterScript_ReturnsScriptWithCorrectNumberOfBlocks()
         {
             // Arrange
@@ -40,7 +41,7 @@ namespace Filtration.Parser.Tests.Services
 
             // Assert
             Assert.AreEqual(5, script.ItemFilterBlocks.Count);
-            mockItemFilterBlockTranslator.Verify(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>(), It.IsAny<IItemFilterScript>(), false));
+            mockItemFilterBlockTranslator.Verify(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>(), It.IsAny<IItemFilterScript>(), "", false));
         }
 
         [Test]
@@ -95,13 +96,29 @@ namespace Filtration.Parser.Tests.Services
             // Assert
             var expectedResult = Mock.Of<IItemFilterScript>(s => s.ItemFilterBlocks == new ObservableCollection<IItemFilterBlockBase>
             {
-                Mock.Of<IItemFilterBlock>(c => c.Description == "Blockdescription"),
-                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == " commentymccommentface"),
-                Mock.Of<IItemFilterBlock>(),
-                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "commment\r\nmorecomment\r\nblah"),
-                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "anothercomment"),
-                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "notpartofblockdescription    "),
-                Mock.Of<IItemFilterBlock>(c => c.Description == "blockdescription2")
+                Mock.Of<IItemFilterBlock>(c => c.Description == "Blockdescription" 
+                && c.OriginalText == "#Blockdescription" + Environment.NewLine +
+                    "Show	#Flasks - Endgame - Life/Mana - Divine/Eternal - Q10+ - Normal" + Environment.NewLine +
+                    "	Class \"Life Flasks\" \"Mana Flasks\"" + Environment.NewLine +
+                    "	Rarity Normal" + Environment.NewLine +
+                    "	SetFontSize 28"
+                ),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == " commentymccommentface" && c.OriginalText == "# commentymccommentface"),
+                Mock.Of<IItemFilterBlock>(c => c.OriginalText == "Show" + Environment.NewLine +
+                    "	Class \"Life Flasks\" \"Mana Flasks\"" + Environment.NewLine +
+                    "	Rarity Normal" + Environment.NewLine +
+                    "	DropLevel >= 60"
+                ),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "commment\r\nmorecomment\r\nblah" 
+                && c.OriginalText == "#commment" + Environment.NewLine + "#morecomment" + Environment.NewLine + "#blah"),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "anothercomment" && c.OriginalText == "#anothercomment"),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "notpartofblockdescription    " && c.OriginalText == "#notpartofblockdescription    "),
+                Mock.Of<IItemFilterBlock>(c => c.Description == "blockdescription2"
+                && c.OriginalText == "#blockdescription2" + Environment.NewLine +
+                    "Show	#TestBlock" + Environment.NewLine +
+                    "	Class \"Life Flasks\" \"Mana Flasks\"" + Environment.NewLine +
+                    "	Rarity Normal	"
+                )
             } && s.ItemFilterBlockGroups == new ObservableCollection<ItemFilterBlockGroup> { new ItemFilterBlockGroup("Root", null, false) }
             && s.ThemeComponents == new ThemeComponentCollection() 
             && s.ItemFilterScriptSettings == new ItemFilterScriptSettings(new ThemeComponentCollection())
@@ -155,7 +172,7 @@ namespace Filtration.Parser.Tests.Services
             script.ItemFilterBlocks.Add(block1);
             script.ItemFilterBlocks.Add(block2);
 
-            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine +
+            var expectedOutput = "# Script edited with Filtration - https://github.com/ben-wallis/Filtration" + Environment.NewLine + Environment.NewLine +
                                  "# Test Filter 1" + Environment.NewLine +
                                  "Show" + Environment.NewLine +
                                  "    ItemLevel > 5" + Environment.NewLine +
diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
index 1168731..aecb295 100644
--- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
+++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
@@ -30,9 +30,10 @@ namespace Filtration.Parser.Services
         }
 
         // Converts a string into an ItemFilterCommentBlock maintaining newlines and spaces but removing # characters
-        public IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript)
+        public IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript, string originalString = "")
         {
             var itemFilterCommentBlock = new ItemFilterCommentBlock(parentItemFilterScript);
+            itemFilterCommentBlock.OriginalText = originalString;
 
             foreach (var line in new LineReader(() => new StringReader(inputString)))
             {
@@ -40,14 +41,15 @@ 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 
         // and reading ItemFilterScripts from a file.
-        public IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, bool initialiseBlockGroupHierarchyBuilder = false)
+        public IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, string originalString = "", bool initialiseBlockGroupHierarchyBuilder = false)
         {
             if (initialiseBlockGroupHierarchyBuilder)
             {
@@ -57,6 +59,7 @@ namespace Filtration.Parser.Services
             _masterComponentCollection = parentItemFilterScript.ItemFilterScriptSettings.ThemeComponentCollection;
             var block = new ItemFilterBlock(parentItemFilterScript);
             var showHideFound = false;
+            block.OriginalText = originalString;
 
             foreach (var line in new LineReader(() => new StringReader(inputString)))
             {
@@ -214,11 +217,15 @@ namespace Filtration.Parser.Services
                         // Only ever use the last SetFontSize item encountered as multiples aren't valid.
                         RemoveExistingBlockItemsOfType<FontSizeBlockItem>(block);
 
-                        var match = Regex.Match(trimmedLine, @"\s+(\d+)");
-                        if (match.Success)
+                        var match = Regex.Matches(trimmedLine, @"(\s+(\d+)\s*)([#]?)(.*)");
+                        if (match.Count > 0)
                         {
-                            var blockItemValue = new FontSizeBlockItem(Convert.ToInt16(match.Value));
-                            block.BlockItems.Add(blockItemValue);
+                            var blockItem = new FontSizeBlockItem(Convert.ToInt16(match[0].Groups[2].Value));
+                            if(match[0].Groups[3].Value == "#" && !string.IsNullOrWhiteSpace(match[0].Groups[4].Value))
+                            {
+                                blockItem.ThemeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.FontSize, match[0].Groups[4].Value.Trim(), blockItem.Value);
+                            }
+                            block.BlockItems.Add(blockItem);
                         }
                         break;
                     }
@@ -228,8 +235,9 @@ namespace Filtration.Parser.Services
                         // Only ever use the last PlayAlertSound item encountered as multiples aren't valid.
                         RemoveExistingBlockItemsOfType<SoundBlockItem>(block);
                         RemoveExistingBlockItemsOfType<PositionalSoundBlockItem>(block);
+                        RemoveExistingBlockItemsOfType<CustomSoundBlockItem>(block);
 
-                        var match = Regex.Match(trimmedLine, @"\S+\s+(\S+)\s?(\d+)?");
+                        var match = Regex.Match(trimmedLine, @"\S+\s+(\S+)\s?(\d+)?\s*([#]?)(.*)");
                         
                         if (match.Success)
                         {
@@ -243,6 +251,12 @@ namespace Filtration.Parser.Services
                             else
                             {
                                 secondValue = 79;
+                            }
+
+                            ThemeComponent themeComponent = null;
+                            if(match.Groups[3].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[4].Value))
+                            {
+                                themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.AlertSound, match.Groups[4].Value.Trim(), firstValue, secondValue);
                             }
 
                             if (lineOption == "PlayAlertSound")
@@ -252,6 +266,7 @@ namespace Filtration.Parser.Services
                                     Value = firstValue,
                                     SecondValue = secondValue
                                 };
+                                blockItemValue.ThemeComponent = themeComponent;
                                 block.BlockItems.Add(blockItemValue);
                             }
                             else
@@ -261,14 +276,129 @@ namespace Filtration.Parser.Services
                                     Value = firstValue,
                                     SecondValue = secondValue
                                 };
+                                blockItemValue.ThemeComponent = themeComponent;
                                 block.BlockItems.Add(blockItemValue);
                             }
                         }
                         break;
                     }
-                }
-            }
+                    case "GemLevel":
+                    {
+                        AddNumericFilterPredicateItemToBlockItems<GemLevelBlockItem>(block, trimmedLine);
+                        break;
+                    }
+                    case "StackSize":
+                    {
+                        AddNumericFilterPredicateItemToBlockItems<StackSizeBlockItem>(block, trimmedLine);
+                        break;
+                    }
+                    case "HasExplicitMod":
+                    {
+                        AddStringListItemToBlockItems<HasExplicitModBlockItem>(block, trimmedLine);
+                        break;
+                    }
+                    case "ElderMap":
+                    {
+                        AddBooleanItemToBlockItems<ElderMapBlockItem>(block, trimmedLine);
+                        break;
+                    }
+                    case "DisableDropSound":
+                    {
+                        // Only ever use the last DisableDropSound item encountered as multiples aren't valid.
+                        RemoveExistingBlockItemsOfType<DisableDropSoundBlockItem>(block);
 
+                        AddBooleanItemToBlockItems<DisableDropSoundBlockItem>(block, trimmedLine);
+                        break;
+                    }
+                    case "MinimapIcon":
+                    {
+                        // 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)
+                        {
+                            var blockItemValue = new MapIconBlockItem
+                            {
+                                Size = (IconSize)Int16.Parse(match.Groups[1].Value),
+                                Color = EnumHelper.GetEnumValueFromDescription<IconColor>(match.Groups[2].Value),
+                                Shape = EnumHelper.GetEnumValueFromDescription<IconShape>(match.Groups[3].Value)
+                            };
+                                
+                            if(match.Groups[4].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[5].Value))
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Icon, match.Groups[5].Value.Trim(),
+                                    blockItemValue.Size, blockItemValue.Color, blockItemValue.Shape);
+                                blockItemValue.ThemeComponent = themeComponent;
+                            }
+                            block.BlockItems.Add(blockItemValue);
+                        }
+                        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)?\s*([#]?)(.*)", RegexOptions.IgnoreCase);
+                        
+                        if (match.Success)
+                        {
+                            var blockItemValue = new PlayEffectBlockItem
+                            {
+                                Color = EnumHelper.GetEnumValueFromDescription<EffectColor>(match.Groups[1].Value),
+                                Temporary = match.Groups[2].Value.Trim().ToLower() == "temp"
+                            };
+                                
+                            if(match.Groups[3].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[4].Value))
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.Effect, match.Groups[4].Value.Trim(),
+                                    blockItemValue.Color, blockItemValue.Temporary);
+                                blockItemValue.ThemeComponent = themeComponent;
+                            }
+                            block.BlockItems.Add(blockItemValue);
+                        }
+                        break;
+                    }
+                    case "CustomAlertSound":
+                    {
+                        // Only ever use the last CustomSoundBlockItem item encountered as multiples aren't valid.
+                        RemoveExistingBlockItemsOfType<CustomSoundBlockItem>(block);
+                        RemoveExistingBlockItemsOfType<SoundBlockItem>(block);
+                        RemoveExistingBlockItemsOfType<PositionalSoundBlockItem>(block);
+
+                        var match = Regex.Match(trimmedLine, @"\S+\s+""(\S+)""\s*([#]?)(.*)");
+                        
+                        if (match.Success)
+                        {
+                            var blockItemValue = new CustomSoundBlockItem
+                            {
+                                Value = match.Groups[1].Value
+                            };
+                                
+                            if(match.Groups[2].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[3].Value))
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.CustomSound, match.Groups[3].Value.Trim(), blockItemValue.Value);
+                                blockItemValue.ThemeComponent = themeComponent;
+                            }
+                            block.BlockItems.Add(blockItemValue);
+                        }
+                        break;
+                    }
+                    case "MapTier":
+                    {
+                        AddNumericFilterPredicateItemToBlockItems<MapTierBlockItem>(block, trimmedLine);
+                        break;
+                    }
+                }
+            }
+
+            block.IsEdited = false;
             return block;
         }
 
@@ -284,6 +414,7 @@ namespace Filtration.Parser.Services
 
         private static void AddBooleanItemToBlockItems<T>(IItemFilterBlock block, string inputString) where T : BooleanBlockItem
         {
+            inputString = Regex.Replace(inputString, @"\s+", " ");
             var blockItem = Activator.CreateInstance<T>();
             var splitString = inputString.Split(' ');
             if (splitString.Length == 2)
@@ -487,6 +618,11 @@ namespace Filtration.Parser.Services
         // TODO: Private
         public string TranslateItemFilterCommentBlockToString(IItemFilterCommentBlock itemFilterCommentBlock)
         {
+            if (!itemFilterCommentBlock.IsEdited)
+            {
+                return itemFilterCommentBlock.OriginalText;
+            }
+
             // TODO: Tests
             // TODO: # Section: text?
             var commentWithHashes = string.Empty;
@@ -506,13 +642,13 @@ namespace Filtration.Parser.Services
         // TODO: Private
         public string TranslateItemFilterBlockToString(IItemFilterBlock block)
         {
-            var outputString = string.Empty;
-
-            if (!block.Enabled)
-            {
-                outputString += "#Disabled Block Start" + Environment.NewLine;
+            if(!block.IsEdited)
+            {
+                return block.OriginalText;
             }
 
+            var outputString = string.Empty;
+
             if (!string.IsNullOrEmpty(block.Description))
             {
                 outputString += "# " + block.Description + Environment.NewLine;
@@ -536,13 +672,14 @@ namespace Filtration.Parser.Services
                 {
                     outputString += (!block.Enabled ? _disabledNewLine : _newLine) + blockItem.OutputText;
                 }
-            }
-
-            if (!block.Enabled)
-            {
-                outputString += Environment.NewLine +  "#Disabled Block End";
-            }
-            
+            }
+
+            //TODO: Disabled for the time being. A better solution is needed.
+            // Replace 'Maelström' to prevent encoding problems in other editors
+            //outputString.Replace("Maelström Staff", "Maelstr");
+            //outputString.Replace("Maelström of Chaos", "Maelstr");
+            //outputString.Replace("Maelström", "Maelstr");
+
             return outputString;
         }
     }
diff --git a/Filtration.Parser/Services/ItemFilterScriptTranslator.cs b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs
index c245487..6407226 100644
--- a/Filtration.Parser/Services/ItemFilterScriptTranslator.cs
+++ b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs
@@ -51,60 +51,35 @@ namespace Filtration.Parser.Services
         public static string PreprocessDisabledBlocks(string inputString)
         {
             bool inDisabledBlock = false;
-            var showHideFound = false;
 
             var lines = Regex.Split(inputString, "\r\n|\r|\n").ToList();
-            var linesToRemove = new List<int>();
 
             for (var i = 0; i < lines.Count; i++)
             {
-                if (lines[i].StartsWith("#Disabled Block Start"))
+                if (!inDisabledBlock && lines[i].StartsWith("#"))
                 {
-                    inDisabledBlock = true;
-                    linesToRemove.Add(i);
-                    continue;
+                    string curLine = Regex.Replace(lines[i].Substring(1), @"\s+", "");
+                    if ((curLine.StartsWith("Show") || curLine.StartsWith("Hide")) && (curLine.Length == 4 || curLine[4] == '#'))
+                    {
+                        inDisabledBlock = true;
+                        lines[i] = lines[i].Substring(1).TrimStart(' ');
+                        lines[i] = lines[i].Substring(0, 4) + "Disabled" + lines[i].Substring(4);
+                        continue;
+                    }
                 }
                 if (inDisabledBlock)
                 {
-                    if (lines[i].StartsWith("#Disabled Block End"))
+                    if (!lines[i].StartsWith("#"))
                     {
                         inDisabledBlock = false;
-                        showHideFound = false;
-                        linesToRemove.Add(i);
-                        continue;
                     }
-
-                    lines[i] = lines[i].TrimStart('#');
-                    lines[i] = lines[i].Replace("#", " # ");
-                    var spaceOrEndOfLinePos = lines[i].IndexOf(" ", StringComparison.Ordinal) > 0 ? lines[i].IndexOf(" ", StringComparison.Ordinal) : lines[i].Length;
-                    var lineOption = lines[i].Substring(0, spaceOrEndOfLinePos);
-
-                    // If we haven't found a Show or Hide line yet, then this is probably the block comment.
-                    // Put its # back on and skip to the next line.
-                    if (lineOption != "Show" && lineOption != "Hide" && showHideFound == false)
+                    else
                     {
-                        lines[i] = "#" + lines[i];
-                        continue;
-                    }
-
-                    if (lineOption == "Show")
-                    {
-                        lines[i] = lines[i].Replace("Show", "ShowDisabled");
-                        showHideFound = true;
-                    }
-                    else if (lineOption == "Hide")
-                    {
-                        lines[i] = lines[i].Replace("Hide", "HideDisabled");
-                        showHideFound = true;
+                        lines[i] = lines[i].Substring(1);
                     }
                 }
             }
 
-            for (var i = linesToRemove.Count - 1; i >= 0; i--)
-            {
-                lines.RemoveAt(linesToRemove[i]);
-            }
-
             return lines.Aggregate((c, n) => c + Environment.NewLine + n);
         }
 
@@ -113,11 +88,14 @@ namespace Filtration.Parser.Services
             var script = _itemFilterScriptFactory.Create();
             _blockGroupHierarchyBuilder.Initialise(script.ItemFilterBlockGroups.First());
 
+            //Remove old disabled tags
+            inputString = Regex.Replace(inputString, @"#Disabled\sBlock\s(Start|End).*?\n", "");
+            inputString = (inputString.EndsWith("\n#Disabled Block End")) ? inputString.Substring(0, inputString.Length - 19) : inputString;
+
+            var originalLines = Regex.Split(inputString, "\r\n|\r|\n");
+
             inputString = inputString.Replace("\t", "");
-            if (inputString.Contains("#Disabled Block Start"))
-            {
-                inputString = PreprocessDisabledBlocks(inputString);
-            }
+            inputString = PreprocessDisabledBlocks(inputString);
 
             var conditionBoundaries = IdentifyBlockBoundaries(inputString);
 
@@ -155,14 +133,24 @@ namespace Filtration.Parser.Services
                 var block = new string[end - begin];
                 Array.Copy(lines, begin, block, 0, end - begin);
                 var blockString = string.Join("\r\n", block);
+                Array.Copy(originalLines, begin, block, 0, end - begin);
+                var originalString = "";
+                for (var i = block.Length - 1; i >= 0; i--)
+                {
+                    if(block[i].Replace(" ", "").Replace("\t", "").Length > 0)
+                    {
+                        originalString = string.Join("\r\n", block, 0, i + 1);
+                        break;
+                    }
+                }
 
                 if (boundary.Value.BoundaryType == ItemFilterBlockBoundaryType.ItemFilterBlock)
                 {
-                    script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterBlock(blockString, script));
+                    script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterBlock(blockString, script, originalString));
                 }
                 else
                 {
-                    script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterCommentBlock(blockString, script));
+                    script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterCommentBlock(blockString, script, originalString));
                 }
             }
 
@@ -251,8 +239,8 @@ namespace Filtration.Parser.Services
                         outputString += "# " + line + Environment.NewLine;
                     }
                 }
-                outputString += Environment.NewLine;
             }
+            outputString += Environment.NewLine;
 
             // ReSharper disable once LoopCanBeConvertedToQuery
             foreach (var block in script.ItemFilterBlocks)
diff --git a/Filtration.Tests/Filtration.Tests.csproj b/Filtration.Tests/Filtration.Tests.csproj
index 4d15320..d623069 100644
--- a/Filtration.Tests/Filtration.Tests.csproj
+++ b/Filtration.Tests/Filtration.Tests.csproj
@@ -107,6 +107,9 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.
diff --git a/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj b/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
index 88b49fc..3cf29d5 100644
--- a/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
+++ b/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
@@ -73,6 +73,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.
diff --git a/Filtration.ThemeEditor.Tests/Services/TestThemeService.cs b/Filtration.ThemeEditor.Tests/Services/TestThemeService.cs
index 086f4f1..f3d9c43 100644
--- a/Filtration.ThemeEditor.Tests/Services/TestThemeService.cs
+++ b/Filtration.ThemeEditor.Tests/Services/TestThemeService.cs
@@ -26,7 +26,7 @@ namespace Filtration.ThemeEditor.Tests.Services
             
             var testInputTheme = new Theme();
             var testInputThemeComponentColor = new Color{ R = 255, G = 0, B = 1 };
-            var testInputThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Test Component 1", testInputThemeComponentColor);
+            var testInputThemeComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Test Component 1", testInputThemeComponentColor);
             testInputTheme.Components.Add(testInputThemeComponent);
             testInputBlockItem.ThemeComponent = testInputThemeComponent;
             var mockMessageBoxService = new Mock<IMessageBoxService>();
@@ -53,8 +53,8 @@ namespace Filtration.ThemeEditor.Tests.Services
 
             var testInputTheme = new Theme();
             var testInputThemeComponentColor = new Color { R = 255, G = 0, B = 1 };
-            var testInputThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Test Component 1", testInputThemeComponentColor);
-            var testInputBlockItemThemeComponent = new ThemeComponent(ThemeComponentType.TextColor, "Different Component", testInputThemeComponentColor);
+            var testInputThemeComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Test Component 1", testInputThemeComponentColor);
+            var testInputBlockItemThemeComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Different Component", testInputThemeComponentColor);
             testInputTheme.Components.Add(testInputThemeComponent);
             testInputBlockItem.ThemeComponent = testInputBlockItemThemeComponent;
             
diff --git a/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs b/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
index 37c9829..6cdf800 100644
--- a/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
+++ b/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
@@ -31,6 +31,18 @@ namespace Filtration.ThemeEditor.Converters
                 {
                     return "Background Color Theme Components";
                 }
+                case "Font Size":
+                {
+                    return "Font Size Theme Components";
+                }
+                case "Alert Sound":
+                {
+                    return "Alert Sound Theme Components";
+                }
+                case "Custom Sound":
+                {
+                    return "Custom Alert Sound Theme Components";
+                }
             }
 
             return type.GetAttributeDescription();
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
index 0cc1a04..20cd268 100644
--- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -108,6 +108,12 @@
     <Compile Include="Providers\ThemeProvider.cs" />
     <Compile Include="Services\ThemePersistenceService.cs" />
     <Compile Include="Services\ThemeService.cs" />
+    <Compile Include="ViewModels\ColorThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\EffectColorThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\IconThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\StringThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\StrIntThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\IntegerThemeComponentViewModel.cs" />
     <Compile Include="ViewModels\IThemeViewModelFactory.cs" />
     <Compile Include="ViewModels\ThemeComponentViewModel.cs" />
     <Compile Include="ViewModels\ThemeEditorViewModel.cs" />
@@ -135,7 +141,10 @@
       <Name>Filtration.ObjectModel</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\open_icon.png" />
+    <Resource Include="Resources\speaker_icon.png" />
+  </ItemGroup>
   <ItemGroup>
     <Page Include="Views\ThemeComponentControl.xaml">
       <SubType>Designer</SubType>
diff --git a/Filtration.ThemeEditor/Providers/ThemeProvider.cs b/Filtration.ThemeEditor/Providers/ThemeProvider.cs
index 238c392..4e8fe20 100644
--- a/Filtration.ThemeEditor/Providers/ThemeProvider.cs
+++ b/Filtration.ThemeEditor/Providers/ThemeProvider.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using Filtration.ObjectModel;
+using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.ThemeEditor;
 using Filtration.ThemeEditor.Services;
 using Filtration.ThemeEditor.ViewModels;
@@ -34,7 +35,20 @@ namespace Filtration.ThemeEditor.Providers
             var themeComponentCollection = script.ThemeComponents.Aggregate(new ThemeComponentCollection(),
                 (c, component) =>
                 {
-                    c.Add(new ThemeComponent(component.ComponentType, component.ComponentName, component.Color));
+                    switch(component.ComponentType)
+                    {
+                        case ThemeComponentType.BackgroundColor:
+                        case ThemeComponentType.BorderColor:
+                        case ThemeComponentType.TextColor:
+                            c.Add(new ColorThemeComponent(component.ComponentType, component.ComponentName, ((ColorThemeComponent)component).Color));
+                            break;
+                        case ThemeComponentType.FontSize:
+                            c.Add(new IntegerThemeComponent(component.ComponentType, component.ComponentName, ((IntegerThemeComponent)component).Value));
+                            break;
+                        case ThemeComponentType.AlertSound:
+                            c.Add(new StrIntThemeComponent(component.ComponentType, component.ComponentName, ((StrIntThemeComponent)component).Value, ((StrIntThemeComponent)component).SecondValue));
+                            break;
+                    }
                     return c;
                 });
                 
diff --git a/Filtration.ThemeEditor/Resources/open_icon.png b/Filtration.ThemeEditor/Resources/open_icon.png
new file mode 100644
index 0000000..b9e1d55
Binary files /dev/null and b/Filtration.ThemeEditor/Resources/open_icon.png differ
diff --git a/Filtration.ThemeEditor/Resources/speaker_icon.png b/Filtration.ThemeEditor/Resources/speaker_icon.png
new file mode 100644
index 0000000..b8c7c02
Binary files /dev/null and b/Filtration.ThemeEditor/Resources/speaker_icon.png differ
diff --git a/Filtration.ThemeEditor/Services/ThemeService.cs b/Filtration.ThemeEditor/Services/ThemeService.cs
index 6ebaa94..392abcd 100644
--- a/Filtration.ThemeEditor/Services/ThemeService.cs
+++ b/Filtration.ThemeEditor/Services/ThemeService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using Filtration.Common.Services;
@@ -29,38 +30,25 @@ namespace Filtration.ThemeEditor.Services
             var mismatchedComponents = false;
             foreach (var component in theme.Components)
             {
-                var componentMatched = false;
-                Type targetType = null;
+                var blocks = script.ItemFilterBlocks.OfType<ItemFilterBlock>();
                 switch (component.ComponentType)
                 {
                     case ThemeComponentType.BackgroundColor:
-                        targetType = typeof (BackgroundColorBlockItem);
+                        mismatchedComponents = ApplyColorTheme(blocks, typeof(BackgroundColorBlockItem), component);
                         break;
                     case ThemeComponentType.TextColor:
-                        targetType = typeof (TextColorBlockItem);
+                        mismatchedComponents = ApplyColorTheme(blocks, typeof(TextColorBlockItem), component);
                         break;
                     case ThemeComponentType.BorderColor:
-                        targetType = typeof (BorderColorBlockItem);
+                        mismatchedComponents = ApplyColorTheme(blocks, typeof(BorderColorBlockItem), component);
+                        break;
+                    case ThemeComponentType.FontSize:
+                        mismatchedComponents = ApplyIntegerTheme(blocks, typeof(FontSizeBlockItem), component);
+                        break;
+                    case ThemeComponentType.AlertSound:
+                        mismatchedComponents = ApplyStrIntTheme(blocks, typeof(SoundBlockItem), component);
+                        mismatchedComponents = ApplyStrIntTheme(blocks, typeof(PositionalSoundBlockItem), component);
                         break;
-                }
-
-                foreach (var block in script.ItemFilterBlocks.OfType<ItemFilterBlock>())
-                {
-                    foreach (var blockItem in block.BlockItems.Where(i => i.GetType() == targetType))
-                    {
-                        var colorBlockItem = (ColorBlockItem) blockItem;
-                        if (colorBlockItem.ThemeComponent != null &&
-                            colorBlockItem.ThemeComponent.ComponentName == component.ComponentName)
-                        {
-                            colorBlockItem.Color = component.Color;
-                            componentMatched = true;
-                        }
-                    }   
-                }
-
-                if (!componentMatched)
-                {
-                    mismatchedComponents = true;
                 }
             }
 
@@ -71,5 +59,66 @@ namespace Filtration.ThemeEditor.Services
                     MessageBoxButton.OK, MessageBoxImage.Exclamation);
             }
         }
+
+        private bool ApplyColorTheme(IEnumerable<ItemFilterBlock> blocks, Type type, ThemeComponent component)
+        {
+            var componentMatched = false;
+            foreach (var block in blocks)
+            {
+                foreach (var blockItem in block.BlockItems.Where(i => i.GetType() == type))
+                {
+                    var colorBlockItem = (ColorBlockItem)blockItem;
+                    if (colorBlockItem.ThemeComponent != null &&
+                        colorBlockItem.ThemeComponent.ComponentName == component.ComponentName)
+                    {
+                        colorBlockItem.Color = ((ColorThemeComponent)component).Color;
+                        componentMatched = true;
+                    }
+                }
+            }
+
+            return !componentMatched;
+        }
+
+        private bool ApplyIntegerTheme(IEnumerable<ItemFilterBlock> blocks, Type type, ThemeComponent component)
+        {
+            var componentMatched = false;
+            foreach (var block in blocks)
+            {
+                foreach (var blockItem in block.BlockItems.Where(i => i.GetType() == type))
+                {
+                    var colorBlockItem = (IntegerBlockItem)blockItem;
+                    if (colorBlockItem.ThemeComponent != null &&
+                        colorBlockItem.ThemeComponent.ComponentName == component.ComponentName)
+                    {
+                        colorBlockItem.Value = ((IntegerThemeComponent)component).Value;
+                        componentMatched = true;
+                    }
+                }
+            }
+
+            return !componentMatched;
+        }
+
+        private bool ApplyStrIntTheme(IEnumerable<ItemFilterBlock> blocks, Type type, ThemeComponent component)
+        {
+            var componentMatched = false;
+            foreach (var block in blocks)
+            {
+                foreach (var blockItem in block.BlockItems.Where(i => i.GetType() == type))
+                {
+                    var colorBlockItem = (StrIntBlockItem)blockItem;
+                    if (colorBlockItem.ThemeComponent != null &&
+                        colorBlockItem.ThemeComponent.ComponentName == component.ComponentName)
+                    {
+                        colorBlockItem.Value = ((StrIntThemeComponent)component).Value;
+                        colorBlockItem.SecondValue = ((StrIntThemeComponent)component).SecondValue;
+                        componentMatched = true;
+                    }
+                }
+            }
+
+            return !componentMatched;
+        }
     }
 }
diff --git a/Filtration.ThemeEditor/ViewModels/ColorThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/ColorThemeComponentViewModel.cs
new file mode 100644
index 0000000..849d61d
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/ColorThemeComponentViewModel.cs
@@ -0,0 +1,9 @@
+using System.Windows.Media;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class ColorThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public Color Color { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/EffectColorThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/EffectColorThemeComponentViewModel.cs
new file mode 100644
index 0000000..07d64cf
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/EffectColorThemeComponentViewModel.cs
@@ -0,0 +1,10 @@
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class EffectColorThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public EffectColor EffectColor { get; set; }
+        public bool Temporary { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/IconThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/IconThemeComponentViewModel.cs
new file mode 100644
index 0000000..0a61f1f
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/IconThemeComponentViewModel.cs
@@ -0,0 +1,11 @@
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class IconThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public IconSize IconSize { get; set; }
+        public IconColor IconColor { get; set; }
+        public IconShape IconShape { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/IntegerThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/IntegerThemeComponentViewModel.cs
new file mode 100644
index 0000000..64d71e4
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/IntegerThemeComponentViewModel.cs
@@ -0,0 +1,7 @@
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class IntegerThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public int Value { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/StrIntThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/StrIntThemeComponentViewModel.cs
new file mode 100644
index 0000000..a1bfe6d
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/StrIntThemeComponentViewModel.cs
@@ -0,0 +1,8 @@
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class StrIntThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public int Value { get; set; }
+        public int SecondValue { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs
new file mode 100644
index 0000000..b54f237
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs
@@ -0,0 +1,9 @@
+using System.Windows.Media;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class StringThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public string Value { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/ThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeComponentViewModel.cs
index 76f2836..28e363a 100644
--- a/Filtration.ThemeEditor/ViewModels/ThemeComponentViewModel.cs
+++ b/Filtration.ThemeEditor/ViewModels/ThemeComponentViewModel.cs
@@ -7,13 +7,11 @@ namespace Filtration.ThemeEditor.ViewModels
     {
         string ComponentName { get; set; }
         ThemeComponentType ComponentType { get; set; }
-        Color Color { get; set; }
     }
 
     public class ThemeComponentViewModel : IThemeComponentViewModel
     {
         public string ComponentName { get; set; }
         public ThemeComponentType ComponentType { get; set; }
-        public Color Color { get; set; }
     }
 }
diff --git a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
index ab9f796..c18a8c9 100644
--- a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
+++ b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
@@ -194,8 +194,30 @@ namespace Filtration.ThemeEditor.ViewModels
         
         private void OnAddThemeComponentCommand(ThemeComponentType themeComponentType)
         {
-            Components.Add(new ThemeComponent(themeComponentType, "Untitled Component",
-                new Color {A = 255, R = 255, G = 255, B = 255}));
+            switch (themeComponentType)
+            {
+                case ThemeComponentType.BackgroundColor:
+                case ThemeComponentType.BorderColor:
+                case ThemeComponentType.TextColor:
+                    Components.Add(new ColorThemeComponent(themeComponentType, "Untitled Component",
+                        new Color { A = 255, R = 255, G = 255, B = 255 }));
+                    break;
+                case ThemeComponentType.FontSize:
+                    Components.Add(new IntegerThemeComponent(themeComponentType, "Untitled Component", 35));
+                    break;
+                case ThemeComponentType.AlertSound:
+                    Components.Add(new StrIntThemeComponent(themeComponentType, "Untitled Component", "1", 100));
+                    break;
+                case ThemeComponentType.CustomSound:
+                    Components.Add(new StringThemeComponent(themeComponentType, "Untitled Component", "placeholder.mp3"));
+                    break;
+                case ThemeComponentType.Icon:
+                    Components.Add(new IconThemeComponent(themeComponentType, "Untitled Component", IconSize.Largest, IconColor.Red, IconShape.Circle));
+                    break;
+                case ThemeComponentType.Effect:
+                    Components.Add(new EffectColorThemeComponent(themeComponentType, "Untitled Component", EffectColor.Red, false));
+                    break;
+            }
         }
 
         private void OnDeleteThemeComponentCommand(ThemeComponent themeComponent)
diff --git a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
index ea830e2..2130c90 100644
--- a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
@@ -7,6 +7,8 @@
              xmlns:commonConverters="clr-namespace:Filtration.Common.Converters;assembly=Filtration.Common"
              xmlns:themeEditor="clr-namespace:Filtration.ObjectModel.ThemeEditor;assembly=Filtration.ObjectModel"
              xmlns:views="clr-namespace:Filtration.ThemeEditor.Views"
+             xmlns:extensions="clr-namespace:Filtration.Common.Extensions;assembly=Filtration.Common"
+             xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=themeEditor:ThemeComponent}"
              d:DesignHeight="100" d:DesignWidth="200">
@@ -17,7 +19,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="25" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid.Resources>
             <DataTemplate x:Key="EditableComponentNameTemplate">
@@ -58,6 +60,79 @@
                 </Style>
             </ContentControl.Style>
         </ContentControl>
-        <xctk:ColorPicker Grid.Row="2" SelectedColor="{Binding Color}" />
+        <ContentControl Grid.Row="2" Content="{Binding Mode=OneWay}">
+            <ContentControl.Resources>
+                <!-- Color Theme Template -->
+                <DataTemplate  DataType="{x:Type themeEditor:ColorThemeComponent}">
+                    <xctk:ColorPicker SelectedColor="{Binding Color}" />
+                </DataTemplate>
+
+                <!-- Integer Theme Template -->
+                <DataTemplate  DataType="{x:Type themeEditor:IntegerThemeComponent}">
+                    <xctk:ShortUpDown Value="{Binding Value}" />
+                </DataTemplate>
+
+                <!-- String Integer Theme Template -->
+                <DataTemplate  DataType="{x:Type themeEditor:StrIntThemeComponent}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Grid.Column="0" Text="{Binding Value}" Height="25" Padding="2,-15,0,0" />
+                        <xctk:ShortUpDown Grid.Column="1" Value="{Binding SecondValue}" HorizontalAlignment="Right"/>
+                    </Grid>
+                </DataTemplate>
+
+                <!--TODO:File block type and string block type should be separate-->
+                <!-- Custom Sound Theme Template -->
+                <DataTemplate DataType="{x:Type themeEditor:StringThemeComponent}">
+                    <Grid>
+                        <!--TODO: Add play sound support-->
+                        <!--<Button Grid.Column="0" Command="{Binding PlayCustomSoundCommand}" Width="20" Height="20" Background="Transparent" BorderBrush="Transparent">
+                            <Image Source="/Filtration.ThemeEditor;component/Resources/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                        </Button>-->
+                        <ComboBox ItemsSource="{Binding CustomSoundsAvailable}" 
+                                      SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}"/>
+                        <Button Command="{Binding CustomSoundFileDialogCommand}"
+                                    Width="20" Height="20" Background="Transparent" BorderBrush="Transparent" Margin="0,0,30,0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                            <Image Source="/Filtration.ThemeEditor;component/Resources/open_icon.png"/>
+                        </Button>
+                    </Grid>
+                </DataTemplate>
+
+                 <!--Icon Theme Template--> 
+                <DataTemplate  DataType="{x:Type themeEditor:IconThemeComponent}">
+                    <StackPanel Orientation="Vertical" Margin="5,5,5,5">
+                        <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:IconSize}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding IconSize}"
+                                                              SelectedValuePath="Value" />
+                        <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:IconColor}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding IconColor}"
+                                                              SelectedValuePath="Value" />
+                        <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:IconShape}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding IconShape}"
+                                                              SelectedValuePath="Value" />
+                    </StackPanel>
+                </DataTemplate>
+
+                 <!--Effect Color Theme Template--> 
+                <DataTemplate  DataType="{x:Type themeEditor:EffectColorThemeComponent}">
+                    <StackPanel>
+                        <WrapPanel VerticalAlignment="Center" Margin="5,5,5,5">
+                            <RadioButton IsChecked="{Binding Temporary, Converter={StaticResource BoolInverterConverter}}" Margin="0,0,10,0">Permanent</RadioButton>
+                            <RadioButton IsChecked="{Binding Temporary}" >Temporary</RadioButton>
+                        </WrapPanel>
+                        <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:EffectColor}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding EffectColor}"
+                                                              SelectedValuePath="Value" />
+                    </StackPanel>
+                </DataTemplate>
+            </ContentControl.Resources>
+        </ContentControl>
     </Grid>
 </UserControl>
diff --git a/Filtration/App.xaml.cs b/Filtration/App.xaml.cs
index 6690e58..624f22e 100644
--- a/Filtration/App.xaml.cs
+++ b/Filtration/App.xaml.cs
@@ -46,6 +46,12 @@ namespace Filtration
                 cfg.ConstructServicesUsing(_container.Resolve);
                 cfg.CreateMap<Theme, IThemeEditorViewModel>().ConstructUsingServiceLocator();
                 cfg.CreateMap<ThemeComponent, ThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<ColorThemeComponent, ColorThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<IntegerThemeComponent, IntegerThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<StrIntThemeComponent, StrIntThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<StringThemeComponent, StringThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<IconThemeComponent, IconThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<EffectColorThemeComponent, EffectColorThemeComponentViewModel>().ReverseMap();
                 cfg.CreateMap<IThemeEditorViewModel, Theme>();
             });
 
diff --git a/Filtration/Converters/AvailableThemeComponentsConverter.cs b/Filtration/Converters/AvailableThemeComponentsConverter.cs
index 0d4b3f3..e4c5d61 100644
--- a/Filtration/Converters/AvailableThemeComponentsConverter.cs
+++ b/Filtration/Converters/AvailableThemeComponentsConverter.cs
@@ -16,7 +16,7 @@ namespace Filtration.Converters
             var themeComponentsList = values[0] as ThemeComponentCollection;
             if (themeComponentsList == null || themeComponentsList.Count == 0) return null;
 
-            var blockItem = values[1] as ColorBlockItem;
+            var blockItem = values[1] as BlockItemBase;
             if (blockItem == null) return null;
 
             ThemeComponentType themeComponentType;
@@ -33,6 +33,26 @@ namespace Filtration.Converters
             {
                 themeComponentType = ThemeComponentType.BorderColor;
             }
+            else if (blockItem.GetType() == typeof(FontSizeBlockItem))
+            {
+                themeComponentType = ThemeComponentType.FontSize;
+            }
+            else if (blockItem.GetType() == typeof(SoundBlockItem) || blockItem.GetType() == typeof(PositionalSoundBlockItem))
+            {
+                themeComponentType = ThemeComponentType.AlertSound;
+            }
+            else if (blockItem.GetType() == typeof(CustomSoundBlockItem))
+            {
+                themeComponentType = ThemeComponentType.CustomSound;
+            }
+            else if (blockItem.GetType() == typeof(MapIconBlockItem))
+            {
+                themeComponentType = ThemeComponentType.Icon;
+            }
+            else if (blockItem.GetType() == typeof(PlayEffectBlockItem))
+            {
+                themeComponentType = ThemeComponentType.Effect;
+            }
             else
             {
                 return null;
diff --git a/Filtration/Converters/IconShapeToSourceConverter.cs b/Filtration/Converters/IconShapeToSourceConverter.cs
new file mode 100644
index 0000000..c727045
--- /dev/null
+++ b/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();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Filtration/Converters/SizeColorToRectConverter.cs b/Filtration/Converters/SizeColorToRectConverter.cs
new file mode 100644
index 0000000..0be1814
--- /dev/null
+++ b/Filtration/Converters/SizeColorToRectConverter.cs
@@ -0,0 +1,33 @@
+using Filtration.ObjectModel.Enums;
+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)
+        {
+            var size = (int)(values[0]);
+            var color = (int)(values[1]);
+
+            if (size < 0 || color < 0)
+                return new Rect(0, 0, 0, 0);
+
+            Rect cropArea = new Rect();
+            cropArea.Width = 64;
+            cropArea.Height = 64;
+            cropArea.X = 0 + size * 64;
+            cropArea.Y = 0 + color * 64;
+
+            return cropArea;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 4e0f402..6a1ac98 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -167,11 +167,11 @@
     <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
     <Compile Include="Converters\BlockItemToRemoveEnabledVisibilityConverter.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="Extensions\EnumerationExtension.cs" />
-    <Compile Include="Extensions\HyperlinkExtensions.cs" />
     <Compile Include="Models\UpdateData.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Repositories\ItemFilterScriptRepository.cs" />
@@ -190,6 +190,9 @@
     <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>
@@ -230,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>
@@ -538,6 +545,13 @@
     </None>
     <Resource Include="Resources\Icons\redo_icon.png" />
     <Resource Include="Resources\Icons\undo_icon.png" />
+    <Resource Include="Resources\DropIcons\NoIcon.png" />
+    <Resource Include="Resources\DropIcons\Circle.png" />
+    <Resource Include="Resources\DropIcons\Diamond.png" />
+    <Resource Include="Resources\DropIcons\Hexagon.png" />
+    <Resource Include="Resources\DropIcons\Square.png" />
+    <Resource Include="Resources\DropIcons\Star.png" />
+    <Resource Include="Resources\DropIcons\Triangle.png" />
     <Content Include="Resources\ItemBaseTypes.txt" />
     <Content Include="Resources\ItemClasses.txt" />
   </ItemGroup>
diff --git a/Filtration/Resources/DropIcons/Circle.png b/Filtration/Resources/DropIcons/Circle.png
new file mode 100644
index 0000000..7b59891
Binary files /dev/null and b/Filtration/Resources/DropIcons/Circle.png differ
diff --git a/Filtration/Resources/DropIcons/Diamond.png b/Filtration/Resources/DropIcons/Diamond.png
new file mode 100644
index 0000000..ab917dd
Binary files /dev/null and b/Filtration/Resources/DropIcons/Diamond.png differ
diff --git a/Filtration/Resources/DropIcons/Hexagon.png b/Filtration/Resources/DropIcons/Hexagon.png
new file mode 100644
index 0000000..549fa94
Binary files /dev/null and b/Filtration/Resources/DropIcons/Hexagon.png differ
diff --git a/Filtration/Resources/DropIcons/NoIcon.png b/Filtration/Resources/DropIcons/NoIcon.png
new file mode 100644
index 0000000..fb56f36
Binary files /dev/null and b/Filtration/Resources/DropIcons/NoIcon.png differ
diff --git a/Filtration/Resources/DropIcons/Square.png b/Filtration/Resources/DropIcons/Square.png
new file mode 100644
index 0000000..9e143cf
Binary files /dev/null and b/Filtration/Resources/DropIcons/Square.png differ
diff --git a/Filtration/Resources/DropIcons/Star.png b/Filtration/Resources/DropIcons/Star.png
new file mode 100644
index 0000000..9158e90
Binary files /dev/null and b/Filtration/Resources/DropIcons/Star.png differ
diff --git a/Filtration/Resources/DropIcons/Triangle.png b/Filtration/Resources/DropIcons/Triangle.png
new file mode 100644
index 0000000..3d8d6d9
Binary files /dev/null and b/Filtration/Resources/DropIcons/Triangle.png differ
diff --git a/Filtration/Resources/ItemBaseTypes.txt b/Filtration/Resources/ItemBaseTypes.txt
index b056064..c978d72 100644
--- a/Filtration/Resources/ItemBaseTypes.txt
+++ b/Filtration/Resources/ItemBaseTypes.txt
@@ -1,5 +1,6 @@
 A Mother's Parting Gift
 Abandoned Wealth
+Aberrant Fossil
 Abyssal Axe
 Abyssal Cry
 Abyssal Sceptre
@@ -10,6 +11,7 @@ Added Cold Damage Support
 Added Fire Damage Support
 Added Lightning Damage Support
 Additional Accuracy Support
+Aetheric Fossil
 Agate Amulet
 Albino Rhoa Feather
 Alchemy Shard
@@ -111,9 +113,11 @@ Battle Sword
 Bazaar Map
 Beach Map
 Bear Trap
+Beauty Through Death
 Behemoth Mace
 Belfry Map
 Bestel's Manuscript
+Bestiary Orb
 Beyond Leaguestone
 Binding Shard
 Birth of the Three
@@ -131,6 +135,7 @@ Blast Rain
 Blessed Orb
 Blessing of Chayula
 Blessing of Esh
+Blessing of God
 Blessing of Tul
 Blessing of Uul-Netol
 Blessing of Xoph
@@ -146,6 +151,7 @@ Blood Raiment
 Blood Sceptre
 Bloodlines Leaguestone
 Bloodlust Support
+Bloodstained Fossil
 Blue Pearl Amulet
 Blunt Arrow Quiver
 Boarding Axe
@@ -159,9 +165,11 @@ Bone Helmet
 Bone Offering
 Bone Spirit Shield
 Bonespire Talisman
+Boon of the First Ones
 Boot Blade
 Boot Knife
 Bottled Storm
+Bound Fossil
 Boundless Realms
 Bowyer's Dream
 Branded Kite Shield
@@ -244,6 +252,7 @@ Chaos Orb
 Chaos Shard
 Chaotic Disposition
 Charged Dash
+Charged Traps Support
 Chateau Map
 Chayula's Breachstone
 Chest Splitter
@@ -290,6 +299,7 @@ Conjurer Boots
 Conjurer Gloves
 Conjurer's Vestment
 Conquest Chainmail
+Consecrated Path
 Conservatory Map
 Contagion
 Controlled Destruction Support
@@ -306,6 +316,7 @@ Core Map
 Coronal Leather
 Coronal Maul
 Corroded Blade
+Corroded Fossil
 Corroded Tower Shield
 Corrugated Buckler
 Corsair Sword
@@ -385,6 +396,7 @@ Defiled Cathedral Map
 Deicide Mask
 Demon Dagger
 Demon's Horn
+Dense Fossil
 Desecrate
 Desert Brigandine
 Desert Map
@@ -460,6 +472,8 @@ Emperor of Purity
 Emperor's Luck
 Empower Support
 Enameled Buckler
+Enchanted Fossil
+Encrusted Fossil
 Endurance Charge on Melee Stun Support
 Enduring Cry
 Enfeeble
@@ -492,6 +506,7 @@ Exalted Orb
 Exalted Shard
 Excavation Map
 Explosive Arrow
+Explosive Trap
 Exquisite Blade
 Exquisite Leather
 Eye Gouger
@@ -504,6 +519,7 @@ Ezomyte Dagger
 Ezomyte Spiked Shield
 Ezomyte Staff
 Ezomyte Tower Shield
+Faceted Fossil
 Factory Map
 Fancy Foil
 Fangjaw Talisman
@@ -531,8 +547,10 @@ Flame Dash
 Flame Surge
 Flame Totem
 Flameblast
+Flamethrower Trap
 Flammability
 Flanged Mace
+Flashpowder Keg
 Flaying Knife
 Flesh Offering
 Fleshripper
@@ -540,11 +558,13 @@ Flicker Strike
 Flooded Mine Map
 Fluted Bascinet
 Footman Sword
+Forbidden Power
 Forge of the Phoenix Map
 Fork Support
 Fortify Support
 Fossilised Spirit Shield
 Foul Staff
+Fractured Fossil
 Fragment of the Chimera
 Fragment of the Hydra
 Fragment of the Minotaur
@@ -554,6 +574,7 @@ Freezing Pulse
 Frenzy
 Fright Claw
 Fright Maul
+Frigid Fossil
 Frontier Leather
 Frost Blades
 Frost Bomb
@@ -583,6 +604,7 @@ Giant Mana Flask
 Gift of the Gemling Queen
 Gilded Axe
 Gilded Buckler
+Gilded Fossil
 Gilded Sallet
 Girded Tower Shield
 Glacial Cascade
@@ -595,6 +617,7 @@ Glassblower's Bauble
 Glimmer of Hope
 Glorious Leather
 Glorious Plate
+Glyphic Fossil
 Gnarled Branch
 Goat's Horn
 Goathide Boots
@@ -654,6 +677,7 @@ Harbinger's Orb
 Harbinger's Shard
 Harlequin Mask
 Harmonic Spirit Shield
+Harmony of Souls
 Harpy Rapier
 Haste
 Hatred
@@ -667,8 +691,10 @@ Heavy Quiver
 Heavy Strike
 Hellion's Paw
 Her Mask
+Herald of Agony
 Herald of Ash
 Herald of Ice
+Herald of Purity
 Herald of Thunder
 Heterochromia
 Hexclaw Talisman
@@ -676,6 +702,7 @@ Highborn Bow
 Highborn Staff
 Highland Blade
 Hinekora's Hair
+Hollow Fossil
 Holy Chainmail
 Hook Sword
 Hope
@@ -705,6 +732,7 @@ Ignite Proliferation Support
 Imbued Wand
 Immolate Support
 Immortal Call
+Immortal Resolve
 Imp Dagger
 Imperial Bow
 Imperial Buckler
@@ -712,6 +740,7 @@ Imperial Claw
 Imperial Maul
 Imperial Skean
 Imperial Staff
+Imprinted Bestiary Orb
 Incinerate
 Increased Area of Effect Support
 Increased Critical Damage Support
@@ -749,6 +778,7 @@ Jade Chopper
 Jade Flask
 Jade Hatchet
 Jagged Foil
+Jagged Fossil
 Jagged Maul
 Jasper Axe
 Jasper Chopper
@@ -813,6 +843,7 @@ Light Quiver
 Lighthouse Map
 Lightning Arrow
 Lightning Penetration Support
+Lightning Spire Trap
 Lightning Strike
 Lightning Tendrils
 Lightning Trap
@@ -832,6 +863,7 @@ Lordly Plate
 Loricated Ringmail
 Lost Worlds
 Loyalty
+Lucent Fossil
 Lucky Connections
 Lucky Deck
 Lunaris Circlet
@@ -873,6 +905,7 @@ Merciless Armament
 Mesa Map
 Mesh Boots
 Mesh Gloves
+Metallic Fossil
 Miasmeter
 Midnight Blade
 Might is Right
@@ -923,6 +956,7 @@ Muttering Essence of Woe
 Nailed Fist
 Necromancer Circlet
 Necromancer Silks
+Necromancy Net
 Necropolis Map
 Nemesis Leaguestone
 Nightmare Bascinet
@@ -983,12 +1017,13 @@ Penetrating Arrow Quiver
 Peninsula Map
 Perandus Coin
 Perandus Leaguestone
+Perfect Fossil
+Perfection
 Pernarch
 Petrified Club
 Phantasmagoria Map
 Phantom Mace
 Phase Run
-Physical Projectile Attack Damage Support
 Physical to Lightning Support
 Pier Map
 Pierce Support
@@ -1018,19 +1053,29 @@ Port Map
 Portal
 Portal Scroll
 Portal Shredder
+Potent Alchemical Resonator
+Potent Chaotic Resonator
 Power Charge On Critical Support
 Power Siphon
+Powerful Alchemical Resonator
+Powerful Chaotic Resonator
 Praetor Crown
 Precinct Map
 Prehistoric Claw
 Pride Before the Fall
 Primal Skull Talisman
+Prime Alchemical Resonator
+Prime Chaotic Resonator
 Primeval Rapier
+Primitive Alchemical Resonator
+Primitive Chaotic Resonator
 Primitive Staff
 Primordial Pool Map
 Primordial Staff
+Prismatic Fossil
 Prismatic Jewel
 Prismatic Ring
+Pristine Fossil
 Profane Wand
 Projectile Weakness
 Promenade Map
@@ -1082,7 +1127,10 @@ Regal Orb
 Regal Shard
 Regicide Mask
 Reinforced Greaves
+Reinforced Iron Net
 Reinforced Kite Shield
+Reinforced Rope Net
+Reinforced Steel Net
 Reinforced Tower Shield
 Rejuvenation Totem
 Relic Chambers Map
@@ -1141,6 +1189,7 @@ Sambar Sceptre
 Samite Gloves
 Samite Helmet
 Samite Slippers
+Sanctified Fossil
 Sanctified Life Flask
 Sanctified Mana Flask
 Sand of Eternity
@@ -1157,7 +1206,9 @@ Scarlet Round Shield
 Scholar Boots
 Scholar of the Seas
 Scholar's Robe
+Scorched Fossil
 Scorching Ray
+Scourge Arrow
 Screaming Essence
 Screaming Essence of Anger
 Screaming Essence of Anguish
@@ -1185,6 +1236,7 @@ Scroll of Wisdom
 Searching Eye Jewel
 Searing Bond
 Secutor Helm
+Seismic Trap
 Sekhem
 Sekhema Feather
 Sentinel Jacket
@@ -1195,6 +1247,7 @@ Serpentscale Boots
 Serpentscale Gauntlets
 Serrated Arrow Quiver
 Serrated Foil
+Serrated Fossil
 Shabby Jerkin
 Shackled Boots
 Shadow Axe
@@ -1204,7 +1257,6 @@ Shagreen Gloves
 Shagreen Tower Shield
 Shaper's Orb
 Shaper's Orb (Tier 1)
-Shaper's Orb (Tier 10)
 Shaper's Orb (Tier 2)
 Shaper's Orb (Tier 3)
 Shaper's Orb (Tier 4)
@@ -1213,6 +1265,7 @@ Shaper's Orb (Tier 6)
 Shaper's Orb (Tier 7)
 Shaper's Orb (Tier 8)
 Shaper's Orb (Tier 9)
+Shaper's Orb (Tier 10)
 Shard of Fate
 Sharkskin Boots
 Sharkskin Gloves
@@ -1248,6 +1301,7 @@ Shrieking Essence of Woe
 Shrieking Essence of Wrath
 Shrieking Essence of Zeal
 Shrine Map
+Shuddering Fossil
 Siege Axe
 Siege Ballista
 Siege Helmet
@@ -1264,8 +1318,12 @@ Silver Coin
 Silver Flask
 Silver Key
 Silver Locket
+Simple Iron Net
 Simple Robe
+Simple Rope Net
+Simple Steel Net
 Sinner Tricorne
+Siphoning Trap
 Skean
 Skinning Knife
 Slaughter Knife
@@ -1278,6 +1336,7 @@ Small Hybrid Flask
 Small Life Flask
 Small Mana Flask
 Smallsword
+Smite
 Smoke Mine
 Sniper Bow
 Solar Maul
@@ -1292,6 +1351,7 @@ Sovereign Spiked Shield
 Spark
 Sparkling Claw
 Spectral Axe
+Spectral Shield Throw
 Spectral Sword
 Spectral Throw
 Spell Cascade Support
@@ -1341,6 +1401,7 @@ Stibnite Flask
 Stiletto
 Stone Axe
 Stone Hammer
+Stone of Passage
 Storm Barrier Support
 Storm Blade
 Storm Burst
@@ -1349,6 +1410,9 @@ Strand Map
 Strapped Boots
 Strapped Leather
 Strapped Mitts
+Strong Iron Net
+Strong Rope Net
+Strong Steel Net
 Struck by Lightning
 Studded Belt
 Studded Round Shield
@@ -1359,8 +1423,10 @@ Sulphur Vents Map
 Summit Map
 Summon Chaos Golem
 Summon Flame Golem
+Summon Holy Relic
 Summon Ice Golem
 Summon Lightning Golem
+Summon Phantasm on Kill Support
 Summon Raging Spirit
 Summon Skeleton
 Summon Stone Golem
@@ -1375,8 +1441,10 @@ Sweep
 Swift Affliction Support
 Talisman Leaguestone
 Talon Axe
+Tangled Fossil
 Tarnished Spirit Shield
 Teak Round Shield
+Tectonic Slam
 Tempered Foil
 Tempest Leaguestone
 Tempest Shield
@@ -1386,38 +1454,50 @@ Tenderizer
 Terrace Map
 Terror Claw
 Terror Maul
+Thaumaturgical Net
 Thaumetic Emblem
 Thaumetic Sulphite
+The Admirer
 The Aesthete
 The Arena Champion
+The Army of Blood
 The Artist
 The Avenger
 The Battle Born
+The Beast
 The Betrayal
 The Black Flag
 The Blazing Fire
 The Body
+The Breach
 The Brittle Emperor
+The Cacophony
 The Calling
 The Carrion Crow
 The Cartographer
 The Cataclysm
 The Catalyst
 The Celestial Justicar
+The Celestial Stone
 The Chains that Bind
 The Coming Storm
 The Conduit
 The Cursed King
 The Dapper Prodigy
 The Dark Mage
+The Darkest Dream
+The Deceiver
 The Demoness
 The Devastator
 The Doctor
 The Doppelganger
 The Dragon
 The Dragon's Heart
+The Dreamer
+The Dreamland
 The Drunken Aristocrat
 The Encroaching Darkness
+The Endless Darkness
 The Endurance
 The Enlightened
 The Ethereal
@@ -1425,6 +1505,7 @@ The Explorer
 The Eye of Desire
 The Eye of Fury
 The Eye of the Dragon
+The Fathomless Depths
 The Feast
 The Fiend
 The Fletcher
@@ -1437,15 +1518,20 @@ The Garish Power
 The Gemcutter
 The Gentleman
 The Gladiator
+The Hale Heart
 The Harvester
 The Hermit
 The Hoarder
 The Hunger
 The Immortal
 The Incantation
+The Innocent
 The Inoculated
+The Insatiable
 The Inventor
+The Iron Bard
 The Jester
+The Jeweller's Boon
 The King's Blade
 The King's Heart
 The Last One Standing
@@ -1454,9 +1540,12 @@ The Lion
 The Lord in Black
 The Lover
 The Lunaris Priestess
+The Master
+The Mayor
 The Mercenary
 The Metalsmith's Gift
 The Oath
+The Obscured
 The Offering
 The One With All
 The Opulent
@@ -1466,17 +1555,23 @@ The Penitent
 The Poet
 The Polymath
 The Porcupine
+The Price of Protection
+The Professor
+The Puzzle
 The Queen
 The Rabid Rhoa
 The Realm
 The Risk
+The Rite of Elements
 The Road to Power
 The Ruthless Ceinture
 The Saint's Treasure
+The Samurai's Eye
 The Scarred Meadow
 The Scavenger
 The Scholar
 The Sephirot
+The Shaper's Key
 The Sigil
 The Siren
 The Soul
@@ -1490,14 +1585,18 @@ The Sun
 The Surgeon
 The Surveyor
 The Survivalist
+The Sword King's Salute
 The Teardrop
 The Thaumaturgist
 The Throne
 The Tower
 The Traitor
 The Trial
+The Twilight Moon
 The Twins
 The Tyrant
+The Undaunted
+The Undisputed
 The Union
 The Valkyrie
 The Valley of Steel Boxes
@@ -1508,11 +1607,14 @@ The Warden
 The Warlord
 The Watcher
 The Web
+The Wilted Rose
 The Wind
+The Witch
 The Wolf
 The Wolf's Shadow
 The Wolven King's Bite
 The Wolverine
+The World Eater
 The Wrath
 The Wretched
 Thicket Bow
@@ -1523,6 +1625,7 @@ Thorn Rapier
 Three Faces in the Dark
 Three Hands Talisman
 Three Rat Talisman
+Three Voices
 Thresher Claw
 Throat Stabber
 Thunderous Skies
@@ -1532,6 +1635,7 @@ Tiger's Paw
 Timber Axe
 Time-Lost Relic
 Timeworn Claw
+Timeworn Reliquary Key
 Titan Gauntlets
 Titan Greaves
 Titanium Spirit Shield
@@ -1547,6 +1651,7 @@ Torture Chamber Map
 Totemic Maul
 Tower Key
 Tower Map
+Toxic Rain
 Toxic Sewer Map
 Tranquillity
 Transmutation Shard
@@ -1587,9 +1692,12 @@ Unset Ring
 Unshaping Orb
 Ursine Pelt
 Uul-Netol's Breachstone
+Vaal Ancestral Warchief
 Vaal Arc
 Vaal Axe
 Vaal Blade
+Vaal Blade Vortex
+Vaal Blight
 Vaal Breach
 Vaal Buckler
 Vaal Burning Arrow
@@ -1600,6 +1708,7 @@ Vaal Cyclone
 Vaal Detonate Dead
 Vaal Discipline
 Vaal Double Strike
+Vaal Earthquake
 Vaal Fireball
 Vaal Flameblast
 Vaal Gauntlets
@@ -1612,6 +1721,9 @@ Vaal Haste
 Vaal Hatchet
 Vaal Ice Nova
 Vaal Immortal Call
+Vaal Impurity of Fire
+Vaal Impurity of Ice
+Vaal Impurity of Lightning
 Vaal Lightning Strike
 Vaal Lightning Trap
 Vaal Lightning Warp
@@ -1640,7 +1752,17 @@ Vault Map
 Velvet Gloves
 Velvet Slippers
 Vengeance
+Vial of Awakening
+Vial of Consequence
+Vial of Dominance
+Vial of Fate
 Vial Of Power
+Vial of Sacrifice
+Vial of Summoning
+Vial of the Ghost
+Vial of the Ritual
+Vial of Transcendence
+Vicious Projectiles Support
 Vigilant Strike
 Vile Staff
 Vile Toxins Support
@@ -1718,6 +1840,7 @@ Wild Leather
 Wild Strike
 Wings of Vastiri
 Wither
+Withering Touch Support
 Wolf Pelt
 Woodful Staff
 Woodsplitter
diff --git a/Filtration/Resources/ItemClasses.txt b/Filtration/Resources/ItemClasses.txt
index fd87671..d38526b 100644
--- a/Filtration/Resources/ItemClasses.txt
+++ b/Filtration/Resources/ItemClasses.txt
@@ -9,6 +9,7 @@ Bows
 Claws
 Currency
 Daggers
+Delve Stackable Currency
 Divination Card
 Fishing Rods
 Flasks
@@ -16,6 +17,7 @@ Gems
 Gloves
 Helmets
 Hybrid Flasks
+Incursion Item
 Jewel
 Labyrinth Item
 Labyrinth Map Item
diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml
index c9dfba3..1a0d699 100644
--- a/Filtration/UserControls/BlockItemControl.xaml
+++ b/Filtration/UserControls/BlockItemControl.xaml
@@ -7,7 +7,7 @@
              xmlns:commonConverters="clr-namespace:Filtration.Common.Converters;assembly=Filtration.Common"
              xmlns:blockItemBaseTypes="clr-namespace:Filtration.ObjectModel.BlockItemBaseTypes;assembly=Filtration.ObjectModel"
              xmlns:blockItemTypes="clr-namespace:Filtration.ObjectModel.BlockItemTypes;assembly=Filtration.ObjectModel"
-             xmlns:extensions="clr-namespace:Filtration.Extensions"
+             xmlns:extensions="clr-namespace:Filtration.Common.Extensions;assembly=Filtration.Common"
              xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:views="clr-namespace:Filtration.Views"
@@ -75,12 +75,39 @@
                     <DataTemplate DataType="{x:Type blockItemTypes:BaseTypeBlockItem}">
                         <userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" AutoCompleteItemsSource="{Binding ElementName=TopLevelGrid, Path=DataContext.AutoCompleteItemBaseTypes}" />
                     </DataTemplate>
-                    
+
+                    <!-- Explicit Mods Template -->
+                    <DataTemplate DataType="{x:Type blockItemTypes:HasExplicitModBlockItem}">
+                        <userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" />
+                    </DataTemplate>
+
                     <!-- Socket Groups Template -->
                     <DataTemplate DataType="{x:Type blockItemTypes:SocketGroupBlockItem}">
                         <userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" />
                     </DataTemplate>
-                    
+
+                    <!-- Play Effect Block Template -->
+                    <DataTemplate DataType="{x:Type blockItemTypes:PlayEffectBlockItem}">
+                        <StackPanel>
+                            <WrapPanel VerticalAlignment="Center" Margin="5,5,5,5">
+                                <RadioButton IsChecked="{Binding Temporary, Converter={StaticResource BoolInverterConverter}}" Margin="0,0,10,0">Permanent</RadioButton>
+                                <RadioButton IsChecked="{Binding Temporary}" >Temporary</RadioButton>
+                            </WrapPanel>
+                            <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:EffectColor}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding Color}"
+                                                              SelectedValuePath="Value" />
+                            <userControls:ThemeComponentSelectionControl ThemeComponent="{Binding ThemeComponent}" Margin="0,2,0,0">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
+                        </StackPanel>
+                    </DataTemplate>
+
                     <!-- Color Template -->
                     <DataTemplate DataType="{x:Type blockItemBaseTypes:ColorBlockItem}">
                         <StackPanel>
@@ -100,9 +127,21 @@
 
                     <!-- Font Size Template -->
                     <DataTemplate DataType="{x:Type blockItemTypes:FontSizeBlockItem}">
-                        <WrapPanel HorizontalAlignment="Left">
-                            <xctk:ShortUpDown Value="{Binding Value}" Minimum="{Binding Minimum}" Maximum="{Binding Maximum}" Width="50" />
-                        </WrapPanel>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="50" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <xctk:ShortUpDown Grid.Column="0" Value="{Binding Value}" Minimum="{Binding Minimum}" Maximum="{Binding Maximum}" Margin="0,0,10,0" />
+                            <userControls:ThemeComponentSelectionControl Grid.Column="1" ThemeComponent="{Binding ThemeComponent}">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
+                        </Grid>
                     </DataTemplate>
 
                     <!-- Sound Template -->
@@ -113,6 +152,14 @@
                             </Button>
                             <ComboBox ItemsSource="{Binding ElementName=BlockItemContentControl, Path=DataContext.SoundsAvailable}" SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}" />
                             <xctk:ShortUpDown Value="{Binding Path=SecondValue}" Minimum="1" Maximum="300" HorizontalAlignment="Right" ToolTip="Volume"/>
+                            <userControls:ThemeComponentSelectionControl ThemeComponent="{Binding ThemeComponent}" Margin="0,2,0,0">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
                         </WrapPanel>
                     </DataTemplate>
                     
@@ -124,8 +171,73 @@
                             </Button>
                             <ComboBox ItemsSource="{Binding ElementName=BlockItemContentControl, Path=DataContext.SoundsAvailable}" SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}" />
                             <xctk:ShortUpDown Value="{Binding Path=SecondValue}" Minimum="1" Maximum="300" HorizontalAlignment="Right" ToolTip="Volume"/>
+                            <userControls:ThemeComponentSelectionControl ThemeComponent="{Binding ThemeComponent}" Margin="0,2,0,0">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
                         </WrapPanel>
                     </DataTemplate>
+
+                    <!-- Map Icon Template -->
+                    <DataTemplate DataType="{x:Type blockItemTypes:MapIconBlockItem}">
+                        <StackPanel Orientation="Vertical" Margin="5,5,5,5">
+                            <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:IconSize}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding Size}"
+                                                              SelectedValuePath="Value" />
+                            <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:IconColor}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding Color}"
+                                                              SelectedValuePath="Value" />
+                            <ComboBox ItemsSource="{Binding Source={extensions:Enumeration {x:Type enums:IconShape}}}" Style="{StaticResource MetroComboBox}"
+                                                              DisplayMemberPath="Description"
+                                                              SelectedValue="{Binding Shape}"
+                                                              SelectedValuePath="Value" />
+                            <userControls:ThemeComponentSelectionControl ThemeComponent="{Binding ThemeComponent}" Margin="0,2,0,0">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
+                        </StackPanel>
+                    </DataTemplate>
+
+                    <!-- Custom Sound Template -->
+                    <DataTemplate DataType="{x:Type blockItemTypes:CustomSoundBlockItem}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="20"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <Button Grid.Column="0" Grid.Row="0" Command="{Binding Path=DataContext.PlayCustomSoundCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" Width="20" Height="20" Background="Transparent" BorderBrush="Transparent">
+                                <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Button>
+                            <ComboBox Grid.Column="1" Grid.Row="0" ItemsSource="{Binding Path=DataContext.CustomSoundsAvailable, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" 
+                                      SelectedValue="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource MetroComboBox}"/>
+                            <Button Grid.Column="1" Grid.Row="0" Command="{Binding Path=DataContext.CustomSoundFileDialogCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}"
+                                    Width="20" Height="20" Background="Transparent" BorderBrush="Transparent" Margin="0,0,30,0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                                <Image Grid.Column="1" Source="/Filtration;component/Resources/Icons/open_icon.png"/>
+                            </Button>
+                            <userControls:ThemeComponentSelectionControl Grid.Row="1" Grid.Column="1" ThemeComponent="{Binding ThemeComponent}" Margin="0,2,0,0">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
+                        </Grid>
+                    </DataTemplate>
                 </ContentControl.Resources>
             </ContentControl>
         </Grid>
diff --git a/Filtration/UserControls/BlockItemControl.xaml.cs b/Filtration/UserControls/BlockItemControl.xaml.cs
index 5af5c2f..db0909c 100644
--- a/Filtration/UserControls/BlockItemControl.xaml.cs
+++ b/Filtration/UserControls/BlockItemControl.xaml.cs
@@ -6,6 +6,8 @@ using System.Windows;
 using Filtration.Annotations;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.ThemeEditor;
 using Filtration.Views;
 using GalaSoft.MvvmLight.CommandWpf;
 using Xceed.Wpf.Toolkit;
@@ -20,10 +22,10 @@ namespace Filtration.UserControls
             // ReSharper disable once PossibleNullReferenceException
             (Content as FrameworkElement).DataContext = this;
 
-            SetBlockColorCommand = new RelayCommand(OnSetBlockColorCommmand);
+            SetBlockValueCommand = new RelayCommand(OnSetBlockValueCommmand);
         }
 
-        public RelayCommand SetBlockColorCommand { get; private set; }
+        public RelayCommand SetBlockValueCommand { get; private set; }
 
         public static readonly DependencyProperty BlockItemProperty = DependencyProperty.Register(
             "BlockItem",
@@ -88,12 +90,45 @@ namespace Filtration.UserControls
             "ShFusing", "ShRegal", "ShVaal"
         };
 
-        private void OnSetBlockColorCommmand()
-        {
-            var blockItem = BlockItem as ColorBlockItem;
-            if (blockItem?.ThemeComponent == null) return;
+        private void OnSetBlockValueCommmand()
+        {
+            var blockItemWithTheme = BlockItem as IBlockItemWithTheme;
+            if (blockItemWithTheme?.ThemeComponent == null) return;
 
-            blockItem.Color = blockItem.ThemeComponent.Color;
+            var componentType = ((IBlockItemWithTheme)BlockItem).ThemeComponent.ComponentType;
+            switch(componentType)
+            {
+                case ThemeComponentType.BackgroundColor:
+                case ThemeComponentType.BorderColor:
+                case ThemeComponentType.TextColor:
+                    var colorBlockItem = BlockItem as ColorBlockItem;
+                    colorBlockItem.Color = ((ColorThemeComponent)colorBlockItem.ThemeComponent).Color;
+                    break;
+                case ThemeComponentType.FontSize:
+                    var integerBlockItem = BlockItem as IntegerBlockItem;
+                    integerBlockItem.Value = ((IntegerThemeComponent)integerBlockItem.ThemeComponent).Value;
+                    break;
+                case ThemeComponentType.AlertSound:
+                    var strIntBlockItem = BlockItem as StrIntBlockItem;
+                    strIntBlockItem.Value = ((StrIntThemeComponent)strIntBlockItem.ThemeComponent).Value;
+                    strIntBlockItem.SecondValue = ((StrIntThemeComponent)strIntBlockItem.ThemeComponent).SecondValue;
+                    break;
+                case ThemeComponentType.CustomSound:
+                    var stringBlockItem = BlockItem as StringBlockItem;
+                    stringBlockItem.Value = ((StringThemeComponent)stringBlockItem.ThemeComponent).Value;
+                    break;
+                case ThemeComponentType.Icon:
+                    var iconBlockItem = BlockItem as IconBlockItem;
+                    iconBlockItem.Size = ((IconThemeComponent)iconBlockItem.ThemeComponent).IconSize;
+                    iconBlockItem.Color = ((IconThemeComponent)iconBlockItem.ThemeComponent).IconColor;
+                    iconBlockItem.Shape = ((IconThemeComponent)iconBlockItem.ThemeComponent).IconShape;
+                    break;
+                case ThemeComponentType.Effect:
+                    var effectColorBlockItem = BlockItem as EffectColorBlockItem;
+                    effectColorBlockItem.Color = ((EffectColorThemeComponent)effectColorBlockItem.ThemeComponent).EffectColor;
+                    effectColorBlockItem.Temporary = ((EffectColorThemeComponent)effectColorBlockItem.ThemeComponent).Temporary;
+                    break;
+            }
         }
         
         public event PropertyChangedEventHandler PropertyChanged;
diff --git a/Filtration/UserControls/ImageComboBoxControl.xaml b/Filtration/UserControls/ImageComboBoxControl.xaml
new file mode 100644
index 0000000..88b1726
--- /dev/null
+++ b/Filtration/UserControls/ImageComboBoxControl.xaml
@@ -0,0 +1,26 @@
+<UserControl
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Filtration.UserControls"
+             xmlns:Converters="clr-namespace:Filtration.Converters" x:Class="Filtration.UserControls.ImageComboBoxControl"
+             mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <Converters:SizeColorToRectConverter x:Key="DropIconConverter"/>
+    </UserControl.Resources>
+
+    <Grid>
+        <ComboBox ItemsSource="{Binding DataContext.IconsAvailable, ElementName=BlockItemContentControl}" SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <Image MaxWidth="20" MaxHeight="20" Source="{Binding Converter={StaticResource DropIconConverter}, Mode=OneWay}" />
+                        <Label Content="{Binding}" VerticalAlignment="Stretch"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+    </Grid>
+</UserControl>
diff --git a/Filtration/UserControls/ImageComboBoxControl.xaml.cs b/Filtration/UserControls/ImageComboBoxControl.xaml.cs
new file mode 100644
index 0000000..0921355
--- /dev/null
+++ b/Filtration/UserControls/ImageComboBoxControl.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Filtration.UserControls
+{
+    /// <summary>
+    /// Interaction logic for ImageComboBoxControl.xaml
+    /// </summary>
+    public partial class ImageComboBoxControl : UserControl
+    {
+        public ImageComboBoxControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Filtration/UserControls/ItemPreviewControl.xaml b/Filtration/UserControls/ItemPreviewControl.xaml
index f9232fe..0ba9de4 100644
--- a/Filtration/UserControls/ItemPreviewControl.xaml
+++ b/Filtration/UserControls/ItemPreviewControl.xaml
@@ -8,7 +8,7 @@
              d:DataContext="{d:DesignInstance Type=userControls:ItemPreviewControl}"
              d:DesignHeight="35" d:DesignWidth="170">
     <Border BorderBrush="Black" BorderThickness="1">
-        <Grid Width="166" Height="39">
+        <Grid Width="200" Height="39">
             <Image Source="pack://application:,,,/resources/groundtile.png" Stretch="Fill" />
             <Grid>
                 <Grid.RowDefinitions>
diff --git a/Filtration/UserControls/NumericFilterPredicateControl.xaml b/Filtration/UserControls/NumericFilterPredicateControl.xaml
index 32ce079..8d8d03f 100644
--- a/Filtration/UserControls/NumericFilterPredicateControl.xaml
+++ b/Filtration/UserControls/NumericFilterPredicateControl.xaml
@@ -5,7 +5,7 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:extensions="clr-namespace:Filtration.Extensions"
+             xmlns:extensions="clr-namespace:Filtration.Common.Extensions;assembly=Filtration.Common"
              xmlns:userControls="clr-namespace:Filtration.UserControls"
              xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
              mc:Ignorable="d" 
diff --git a/Filtration/UserControls/ThemeComponentSelectionControl.xaml b/Filtration/UserControls/ThemeComponentSelectionControl.xaml
index 19d17ab..ae2f094 100644
--- a/Filtration/UserControls/ThemeComponentSelectionControl.xaml
+++ b/Filtration/UserControls/ThemeComponentSelectionControl.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:userControls="clr-namespace:Filtration.UserControls"
+             xmlns:themeEditor="clr-namespace:Filtration.ObjectModel.ThemeEditor;assembly=Filtration.ObjectModel"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=userControls:ThemeComponentSelectionControl}"
@@ -21,7 +22,7 @@
                 <Setter Property="MinHeight" Value="0" />
             </Style>
         </Grid.Resources>
-       <Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="*"/>
            <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
@@ -32,44 +33,59 @@
                   Visibility="{Binding ShowThemeComponentComboBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="SelectionChanged">
-                    <i:InvokeCommandAction Command="{Binding SetBlockColorCommand,  RelativeSource={RelativeSource AncestorType=userControls:BlockItemControl}}" />
+                    <i:InvokeCommandAction Command="{Binding SetBlockValueCommand,  RelativeSource={RelativeSource AncestorType=userControls:BlockItemControl}}" />
                 </i:EventTrigger>
             </i:Interaction.Triggers>
-        <ComboBox.ItemTemplate>
-            <DataTemplate >
-                <ContentControl Content="{Binding}">
-                    <ContentControl.Style>
-                        <Style TargetType="{x:Type ContentControl}">
-                            <Setter Property="ContentTemplate">
-                                <Setter.Value>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition SharedSizeGroup="ComponentNameColumn" Width="Auto" />
-                                                <ColumnDefinition SharedSizeGroup="ComponentColorColumn" Width="20" />
-                                            </Grid.ColumnDefinitions>
-                                            <TextBlock Grid.Column="0" Text="{Binding ComponentName}" Margin="0,0,2,0" />
-                                            <Border Grid.Column="1" Background="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        </Grid>
-                                    </DataTemplate>
-                                </Setter.Value>
-                            </Setter>
-                            <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=ComboBoxItem}}" Value="{x:Null}">  
-                                        <Setter Property="ContentTemplate">
-                                            <Setter.Value>
-                                                <DataTemplate>
-                                                    <TextBlock Text="{Binding ComponentName}" />
-                                                </DataTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                        </Style>
-                        </ContentControl.Style>
-                    </ContentControl>
-            </DataTemplate>
-        </ComboBox.ItemTemplate>
+            <ComboBox.ItemTemplate>
+                <DataTemplate >
+                    <ContentControl Content="{Binding}">
+                        <ContentControl.Style>
+                            <Style TargetType="{x:Type ContentControl}">
+                                <Setter Property="ContentTemplate">
+                                    <Setter.Value>
+                                        <DataTemplate>
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition SharedSizeGroup="ComponentNameColumn" Width="Auto" />
+                                                    <ColumnDefinition SharedSizeGroup="ComponentValueColumn" Width="20" />
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Grid.Column="0" Text="{Binding ComponentName}" Margin="0,0,2,0" />
+                                                <ContentControl Content="{Binding Mode=OneWay}" Grid.Column="1">
+                                                    <ContentControl.Resources>
+                                                        <DataTemplate DataType="{x:Type themeEditor:ColorThemeComponent}">
+                                                            <Border Background="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                                                        </DataTemplate>
+                                                        
+                                                        <DataTemplate DataType="{x:Type themeEditor:IntegerThemeComponent}">
+                                                            <TextBlock Text="{Binding Value}" FontWeight="Bold" />
+                                                        </DataTemplate>
+                                                        
+                                                        <DataTemplate DataType="{x:Type themeEditor:StrIntThemeComponent}">
+                                                            <!--TODO: How to show theese?-->
+                                                        </DataTemplate>
+
+                                                        <DataTemplate DataType="{x:Type themeEditor:StringThemeComponent}">
+                                                            <!--TODO: How to show theese?-->
+                                                        </DataTemplate>
+
+                                                        <DataTemplate DataType="{x:Type themeEditor:IconThemeComponent}">
+                                                            <!--TODO: How to show theese?-->
+                                                        </DataTemplate>
+
+                                                        <DataTemplate DataType="{x:Type themeEditor:EffectColorThemeComponent}">
+                                                            <!--TODO: How to show theese?-->
+                                                        </DataTemplate>
+                                                    </ContentControl.Resources>
+                                                </ContentControl>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                            </ContentControl.Style>
+                        </ContentControl>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
         </ComboBox>
         <userControls:CrossButton Grid.Column="1" Height="12" Command="{Binding RemoveThemeComponentCommand}" VerticalAlignment="Top" Visibility="{Binding ShowThemeComponentComboBox, Converter={StaticResource BooleanToVisibilityConverter}}"  />
         <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Visibility="{Binding ShowThemeComponentComboBox, Converter={StaticResource InverseBooleanVisibilityConverter}}" VerticalAlignment="Center">
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
index 5cf0c0c..ac2411a 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@@ -2,14 +2,17 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.IO;
 using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Enums;
 using Filtration.Services;
 using Filtration.Views;
 using GalaSoft.MvvmLight.CommandWpf;
+using Microsoft.Win32;
 using Xceed.Wpf.Toolkit;
 
 namespace Filtration.ViewModels
@@ -28,6 +31,7 @@ namespace Filtration.ViewModels
         private readonly IStaticDataService _staticDataService;
         private readonly IReplaceColorsViewModel _replaceColorsViewModel;
         private readonly MediaPlayer _mediaPlayer = new MediaPlayer();
+        public static ObservableCollection<string> _customSoundsAvailable;
 
         private bool _displaySettingsPopupOpen;
         private bool _isExpanded;
@@ -47,6 +51,16 @@ namespace Filtration.ViewModels
             SwitchBlockItemsViewCommand = new RelayCommand(OnSwitchBlockItemsViewCommand);
             PlaySoundCommand = new RelayCommand(OnPlaySoundCommand, () => HasSound);
             PlayPositionalSoundCommand = new RelayCommand(OnPlayPositionalSoundCommand, () => HasPositionalSound);
+            PlayCustomSoundCommand = new RelayCommand(OnPlayCustomSoundCommand, () => HasCustomSound);
+            CustomSoundFileDialogCommand = new RelayCommand(OnCustomSoundFileDialog);
+
+            if(_customSoundsAvailable == null || _customSoundsAvailable.Count < 1)
+            {
+                _customSoundsAvailable = new ObservableCollection<string> {
+                    "1maybevaluable.mp3", "2currency.mp3", "3uniques.mp3", "4maps.mp3", "5highmaps.mp3",
+                    "6veryvaluable.mp3", "7chancing.mp3", "12leveling.mp3", "placeholder.mp3"
+                };
+            }
         }
 
         public override void Initialise(IItemFilterBlockBase itemFilterBlockBase, IItemFilterScriptViewModel parentScriptViewModel)
@@ -66,9 +80,16 @@ namespace Filtration.ViewModels
             foreach (var blockItem in itemFilterBlock.BlockItems)
             {
                 blockItem.PropertyChanged += OnBlockItemChanged;
+
+                var customSoundBlockItem = blockItem as CustomSoundBlockItem;
+                if (customSoundBlockItem != null)
+                {
+                    if (!string.IsNullOrWhiteSpace(customSoundBlockItem.Value) && _customSoundsAvailable.IndexOf(customSoundBlockItem.Value) < 0)
+                    {
+                        _customSoundsAvailable.Add(customSoundBlockItem.Value);
+                    }
+                }
             }
-
-
             base.Initialise(itemFilterBlock, parentScriptViewModel);
         }
 
@@ -81,6 +102,8 @@ namespace Filtration.ViewModels
         public RelayCommand PlaySoundCommand { get; }
         public RelayCommand PlayPositionalSoundCommand { get; }
         public RelayCommand SwitchBlockItemsViewCommand { get; }
+        public RelayCommand CustomSoundFileDialogCommand { get; }
+        public RelayCommand PlayCustomSoundCommand { get; }
 
         public IItemFilterBlock Block { get; private set; }
 
@@ -159,7 +182,12 @@ namespace Filtration.ViewModels
             typeof (CorruptedBlockItem),
             typeof (ElderItemBlockItem),
             typeof (ShaperItemBlockItem),
-            typeof (ShapedMapBlockItem)
+            typeof (MapTierBlockItem),
+            typeof (ShapedMapBlockItem),
+            typeof (ElderMapBlockItem),
+            typeof (GemLevelBlockItem),
+            typeof (StackSizeBlockItem),
+            typeof (HasExplicitModBlockItem)
         };
 
         public List<Type> AudioVisualBlockItemTypesAvailable => new List<Type>
@@ -169,7 +197,11 @@ namespace Filtration.ViewModels
             typeof (BorderColorBlockItem),
             typeof (FontSizeBlockItem),
             typeof (SoundBlockItem),
-            typeof (PositionalSoundBlockItem)
+            typeof (PositionalSoundBlockItem),
+            typeof (DisableDropSoundBlockItem),
+            typeof (MapIconBlockItem),
+            typeof (PlayEffectBlockItem),
+            typeof (CustomSoundBlockItem)
         };
 
         public bool BlockEnabled
@@ -205,13 +237,20 @@ namespace Filtration.ViewModels
 
         public ObservableCollection<ColorItem> AvailableColors => PathOfExileColors.DefaultColors;
 
+        public ObservableCollection<string> CustomSoundsAvailable => _customSoundsAvailable;
+
         public Color DisplayTextColor => Block.DisplayTextColor;
         public Color DisplayBackgroundColor => Block.DisplayBackgroundColor;
         public Color DisplayBorderColor => Block.DisplayBorderColor;
         public double DisplayFontSize => Block.DisplayFontSize/1.8;
-        
+        public int DisplayIconSize => Block.DisplayIconSize;
+        public int DisplayIconColor => Block.DisplayIconColor;
+        public int DisplayIconShape => Block.DisplayIconShape;
+        public Color DisplayEffectColor => Block.DisplayEffectColor;
+
         public bool HasSound => Block.HasBlockItemOfType<SoundBlockItem>();
         public bool HasPositionalSound => Block.HasBlockItemOfType<PositionalSoundBlockItem>();
+        public bool HasCustomSound => Block.HasBlockItemOfType<CustomSoundBlockItem>();
 
         public bool HasAudioVisualBlockItems => AudioVisualBlockItems.Any();
 
@@ -419,7 +458,16 @@ namespace Filtration.ViewModels
             {
                 IsDirty = true;
             }
-
+            var customSoundBlockItem = sender as CustomSoundBlockItem;
+            if (customSoundBlockItem != null)
+            {
+                if (!string.IsNullOrWhiteSpace(customSoundBlockItem.Value) && _customSoundsAvailable.IndexOf(customSoundBlockItem.Value) < 0)
+                {
+                    _customSoundsAvailable.Add(customSoundBlockItem.Value);
+                }
+                RaisePropertyChanged(nameof(CustomSoundsAvailable));
+            }
+            Block.IsEdited = true;
             //if (sender is IAudioVisualBlockItem)
             //{
             RefreshBlockPreview();
@@ -432,7 +480,13 @@ namespace Filtration.ViewModels
             RaisePropertyChanged(nameof(DisplayBackgroundColor));
             RaisePropertyChanged(nameof(DisplayBorderColor));
             RaisePropertyChanged(nameof(DisplayFontSize));
+            RaisePropertyChanged(nameof(DisplayIconSize));
+            RaisePropertyChanged(nameof(DisplayIconColor));
+            RaisePropertyChanged(nameof(DisplayIconShape));
+            RaisePropertyChanged(nameof(DisplayEffectColor));
             RaisePropertyChanged(nameof(HasSound));
+            RaisePropertyChanged(nameof(HasPositionalSound));
+            RaisePropertyChanged(nameof(HasCustomSound));
         }
 
         private void OnBlockItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -442,5 +496,53 @@ namespace Filtration.ViewModels
             RaisePropertyChanged(nameof(AudioVisualBlockItems));
             RaisePropertyChanged(nameof(HasAudioVisualBlockItems));
         }
+
+        private void OnCustomSoundFileDialog()
+        {
+            OpenFileDialog fileDialog = new OpenFileDialog();
+            fileDialog.DefaultExt = ".mp3";
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            fileDialog.InitialDirectory = poePath;
+
+            Nullable<bool> result = fileDialog.ShowDialog();
+            if (result == true)
+            {
+                var fileName = fileDialog.FileName;
+                if(fileName.StartsWith(poePath))
+                {
+                    fileName = fileName.Replace(poePath, "");
+                }
+
+                var customSoundBlockItem = BlockItems.First(b => b.GetType() == typeof(CustomSoundBlockItem)) as CustomSoundBlockItem;
+
+                if (CustomSoundsAvailable.IndexOf(fileName) < 0)
+                {
+                    CustomSoundsAvailable.Add(fileName);
+                    RaisePropertyChanged(nameof(CustomSoundsAvailable));
+                }
+                customSoundBlockItem.Value = fileName;
+            }
+        }
+
+        private void OnPlayCustomSoundCommand()
+        {
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            var identifier = BlockItems.OfType<CustomSoundBlockItem>().First().Value;
+
+            if(!Path.IsPathRooted(identifier))
+            {
+                identifier = poePath + identifier;
+            }
+
+            try
+            {
+                _mediaPlayer.Open(new Uri(identifier, UriKind.Absolute));
+                _mediaPlayer.Play();
+            }
+            catch
+            {
+                MessageBox.Show("Couldn't play the file. Please be sure it is a valid audio file.");
+            }
+        }
     }
 }
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs b/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs
index 86dcfcb..395bbe1 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs
@@ -9,13 +9,15 @@ namespace Filtration.ViewModels
     {
         void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel);
         IItemFilterBlockBase BaseBlock { get; }
-        bool IsDirty { get; set; }
+        bool IsDirty { get; set; }
+        bool IsVisible { get; set; }
         event EventHandler BlockBecameDirty;
     }
 
     internal abstract class ItemFilterBlockViewModelBase : ViewModelBase, IItemFilterBlockViewModelBase
     {
         private bool _isDirty;
+        private bool _isVisible;
 
         public ItemFilterBlockViewModelBase()
         {
@@ -28,6 +30,8 @@ namespace Filtration.ViewModels
             MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand);
             MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand);
             MoveBlockToBottomCommand = new RelayCommand(OnMoveBlockToBottomCommand);
+
+            _isVisible = true;
         }
 
 
@@ -64,6 +68,16 @@ namespace Filtration.ViewModels
                     BlockBecameDirty?.Invoke(this, EventArgs.Empty);
                 }
             }
+        }
+
+        public bool IsVisible
+        {
+            get => _isVisible;
+            set
+            {
+                _isVisible = value;
+                RaisePropertyChanged();
+            }
         }
 
         private void OnCopyBlockCommand()
diff --git a/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs b/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs
index 08f5f23..618065a 100644
--- a/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs
@@ -1,15 +1,29 @@
-using Filtration.ObjectModel;
-
+using Filtration.ObjectModel;
+using GalaSoft.MvvmLight.CommandWpf;
+using System;
+
 namespace Filtration.ViewModels
 {
     internal interface IItemFilterCommentBlockViewModel : IItemFilterBlockViewModelBase
     {
         IItemFilterCommentBlock ItemFilterCommentBlock { get; }
-        string Comment { get; }
+        string Comment { get; }
+        bool IsExpanded { get; set; }
+        bool HasChild { get; set; }
     }
 
     internal class ItemFilterCommentBlockViewModel : ItemFilterBlockViewModelBase, IItemFilterCommentBlockViewModel
-    {
+    {
+        private bool _isExpanded;
+        private bool _hasChild;
+
+        public ItemFilterCommentBlockViewModel()
+        {
+            _isExpanded = true;
+
+            ToggleSectionCommand = new RelayCommand(OnToggleSectionCommand);
+        }
+
         public override void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
         {
             _parentScriptViewModel = itemFilterScriptViewModel;
@@ -17,7 +31,9 @@ namespace Filtration.ViewModels
             BaseBlock = ItemFilterCommentBlock;
 
             base.Initialise(itemfilterBlock, itemFilterScriptViewModel);
-        }
+        }
+
+        public RelayCommand ToggleSectionCommand { get; }
 
         public IItemFilterCommentBlock ItemFilterCommentBlock { get; private set; }
 
@@ -34,8 +50,60 @@ namespace Filtration.ViewModels
                     ItemFilterCommentBlock.Comment = value;
                     IsDirty = true;
                     RaisePropertyChanged();
+                    RaisePropertyChanged("Header");
                 }
             }
         }
+
+        public string Header
+        {
+            get
+            {
+                string[] commentLines = ItemFilterCommentBlock.Comment.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+                var titleOffset = 1;
+                if (commentLines.Length > 1 && (commentLines[0].TrimStart(' ').StartsWith(@"============") || commentLines[0].TrimStart(' ').StartsWith(@"------------")))
+                {
+                    titleOffset = 3;
+                    commentLines[0] = commentLines[1];
+                }
+
+                commentLines[0] = commentLines[0].TrimStart(' ');
+                if (commentLines[0].Length > 80)
+                {
+                    commentLines[0] = commentLines[0].Substring(0, 80) + " (...)";
+                }
+                else if (commentLines.Length > titleOffset)
+                {
+                    commentLines[0] = commentLines[0] + " (...)";
+                }
+
+                return commentLines[0];
+            }
+        }
+
+        public bool IsExpanded
+        {
+            get => _isExpanded;
+            set
+            {
+                _isExpanded = value;
+                RaisePropertyChanged();
+            }
+        }
+
+        public bool HasChild
+        {
+            get => _hasChild;
+            set
+            {
+                _hasChild = value;
+                RaisePropertyChanged();
+            }
+        }
+
+        private void OnToggleSectionCommand()
+        {
+            _parentScriptViewModel.ToggleSection(this);
+        }
     }
 }
\ No newline at end of file
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index e76f10f..01564a4 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -6,6 +6,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
@@ -44,11 +45,16 @@ namespace Filtration.ViewModels
         void SetDirtyFlag();
         bool HasSelectedEnabledBlock();
         bool HasSelectedDisabledBlock();
+        bool HasSelectedCommentBlock();
 
         RelayCommand AddBlockCommand { get; }
         RelayCommand AddSectionCommand { get; }
         RelayCommand DisableBlockCommand { get; }
         RelayCommand EnableBlockCommand { get; }
+        RelayCommand DisableSectionCommand { get; }
+        RelayCommand EnableSectionCommand { get; }
+        RelayCommand ExpandSectionCommand { get; }
+        RelayCommand CollapseSectionCommand { get; }
         RelayCommand DeleteBlockCommand { get; }
         RelayCommand MoveBlockUpCommand { get; }
         RelayCommand MoveBlockDownCommand { get; }
@@ -60,6 +66,8 @@ namespace Filtration.ViewModels
         RelayCommand PasteBlockStyleCommand { get; }
         RelayCommand ExpandAllBlocksCommand { get; }
         RelayCommand CollapseAllBlocksCommand { get; }
+        RelayCommand ExpandAllSectionsCommand { get; }
+        RelayCommand CollapseAllSectionsCommand { get; }
         RelayCommand<bool> ToggleShowAdvancedCommand { get; }
         RelayCommand ClearFilterCommand { get; }
 
@@ -74,6 +82,7 @@ namespace Filtration.ViewModels
         void MoveBlockUp(IItemFilterBlockViewModelBase targetBlockViewModelBase);
         void MoveBlockDown(IItemFilterBlockViewModelBase targetBlockViewModelBase);
         void MoveBlockToBottom(IItemFilterBlockViewModelBase targetBlockViewModelBase);
+        void ToggleSection(IItemFilterCommentBlockViewModel targetCommentBlockViewModelBase, bool updateViewModels = true);
     }
 
     internal class ItemFilterScriptViewModel : PaneViewModel, IItemFilterScriptViewModel
@@ -92,6 +101,7 @@ namespace Filtration.ViewModels
         private IItemFilterBlockViewModelBase _selectedBlockViewModel;
         private IItemFilterCommentBlockViewModel _sectionBrowserSelectedBlockViewModel;
         private readonly ObservableCollection<IItemFilterBlockViewModelBase> _itemFilterBlockViewModels;
+        private ObservableCollection<IItemFilterBlockViewModelBase> _viewItemFilterBlockViewModels;
         private ICollectionView _itemFilterBlockViewModelsCollectionView;
         private Predicate<IItemFilterBlockViewModel> _blockFilterPredicate;
         private ICommandManager _scriptCommandManager;
@@ -131,18 +141,26 @@ namespace Filtration.ViewModels
             AddSectionCommand = new RelayCommand(OnAddCommentBlockCommand, () => SelectedBlockViewModel != null);
             DisableBlockCommand = new RelayCommand(OnDisableBlockCommand, HasSelectedEnabledBlock);
             EnableBlockCommand = new RelayCommand(OnEnableBlockCommand, HasSelectedDisabledBlock);
+            DisableSectionCommand = new RelayCommand(OnDisableSectionCommand, HasSelectedCommentBlock);
+            EnableSectionCommand = new RelayCommand(OnEnableSectionCommand, HasSelectedCommentBlock);
+            ExpandSectionCommand = new RelayCommand(OnExpandSectionCommand, HasSelectedCommentBlock);
+            CollapseSectionCommand = new RelayCommand(OnCollapseSectionCommand, HasSelectedCommentBlock);
             CopyBlockCommand = new RelayCommand(OnCopyBlockCommand, () => SelectedBlockViewModel != null);
             CopyBlockStyleCommand = new RelayCommand(OnCopyBlockStyleCommand, () => SelectedBlockViewModel != null);
             PasteBlockCommand = new RelayCommand(OnPasteBlockCommand, () => SelectedBlockViewModel != null);
             PasteBlockStyleCommand = new RelayCommand(OnPasteBlockStyleCommand, () => SelectedBlockViewModel != null);
             ExpandAllBlocksCommand = new RelayCommand(OnExpandAllBlocksCommand);
             CollapseAllBlocksCommand = new RelayCommand(OnCollapseAllBlocksCommand);
+            ExpandAllSectionsCommand = new RelayCommand(ExpandAllSections);
+            CollapseAllSectionsCommand = new RelayCommand(CollapseAllSections);
 
             var icon = new BitmapImage();
             icon.BeginInit();
             icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/script_icon.png");
             icon.EndInit();
             IconSource = icon;
+
+            _viewItemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModelBase>();
         }
 
         public void Initialise(IItemFilterScript itemFilterScript, bool newScript)
@@ -164,6 +182,9 @@ namespace Filtration.ViewModels
             
             Title = Filename;
             ContentId = "ScriptContentId";
+
+            CollapseAllSections();
+            UpdateBlockModelsForView();
         }
 
         private void ItemFilterBlocksOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
@@ -186,6 +207,8 @@ namespace Filtration.ViewModels
                     break;
                 }
             }
+
+            UpdateBlockModelsForView();
         }
 
         private void AddItemFilterBlockViewModels(IEnumerable<IItemFilterBlockBase> itemFilterBlocks, int addAtIndex)
@@ -245,12 +268,18 @@ namespace Filtration.ViewModels
         public RelayCommand AddSectionCommand { get; }
         public RelayCommand EnableBlockCommand { get; }
         public RelayCommand DisableBlockCommand { get; }
+        public RelayCommand DisableSectionCommand { get; }
+        public RelayCommand EnableSectionCommand { get; }
+        public RelayCommand ExpandSectionCommand { get; }
+        public RelayCommand CollapseSectionCommand { get; }
         public RelayCommand CopyBlockCommand { get; }
         public RelayCommand CopyBlockStyleCommand { get; }
         public RelayCommand PasteBlockCommand { get; }
         public RelayCommand PasteBlockStyleCommand { get; }
         public RelayCommand ExpandAllBlocksCommand { get; }
         public RelayCommand CollapseAllBlocksCommand { get; }
+        public RelayCommand ExpandAllSectionsCommand { get; }
+        public RelayCommand CollapseAllSectionsCommand { get; }
 
         public bool IsActiveDocument
         {
@@ -264,6 +293,19 @@ namespace Filtration.ViewModels
             }
         }
 
+        public ObservableCollection<IItemFilterBlockViewModelBase> ViewItemFilterBlockViewModels
+        {
+            get
+            {
+                return _viewItemFilterBlockViewModels;
+            }
+            set
+            {
+                _viewItemFilterBlockViewModels = value;
+                RaisePropertyChanged();
+            }
+        }
+
         public ObservableCollection<IItemFilterBlockViewModelBase> ItemFilterBlockViewModels
         {
             get
@@ -359,6 +401,13 @@ namespace Filtration.ViewModels
             return SelectedBlockViewModel != null;
         }
 
+        public bool HasSelectedCommentBlock()
+        {
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+
+            return selectedBlockViewModel != null;
+        }
+
         public IItemFilterBlockViewModelBase SelectedBlockViewModel
         {
             get => _selectedBlockViewModel;
@@ -514,7 +563,7 @@ namespace Filtration.ViewModels
                 Script.ThemeComponents.Where(
                     t =>
                         Script.ItemFilterBlocks.OfType<ItemFilterBlock>().Count(
-                            b => b.BlockItems.OfType<ColorBlockItem>().Count(i => i.ThemeComponent == t) > 0) == 0).ToList();
+                            b => b.BlockItems.OfType<IBlockItemWithTheme>().Count(i => i.ThemeComponent == t) > 0) == 0).ToList();
 
             if (unusedThemeComponents.Count <= 0) return true;
 
@@ -634,7 +683,15 @@ namespace Filtration.ViewModels
 
         private void OnCopyBlockCommand()
         {
-            CopyBlock(SelectedBlockViewModel);
+            var commentBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (commentBlockViewModel == null || commentBlockViewModel.IsExpanded)
+            {
+                CopyBlock(SelectedBlockViewModel);
+            }
+            else
+            {
+                CopySection(commentBlockViewModel);
+            }
         }
 
         public void CopyBlock(IItemFilterBlockViewModelBase targetBlockViewModel)
@@ -649,6 +706,26 @@ namespace Filtration.ViewModels
             }
         }
 
+        public void CopySection(IItemFilterCommentBlockViewModel targetCommentBlockViewModel)
+        {
+            var sectionStart = ItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModel) + 1;
+            var copyText = _blockTranslator.TranslateItemFilterBlockBaseToString(targetCommentBlockViewModel.BaseBlock);
+            while (sectionStart < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionStart] as IItemFilterCommentBlockViewModel == null)
+            {
+                copyText += Environment.NewLine + "##CopySection##" + Environment.NewLine + _blockTranslator.TranslateItemFilterBlockBaseToString(ItemFilterBlockViewModels[sectionStart].BaseBlock);
+                sectionStart++;
+            }
+
+            try
+            {
+                _clipboardService.SetClipboardText(copyText);
+            }
+            catch
+            {
+                _messageBoxService.Show("Clipboard Error", "Failed to access the clipboard, copy command not completed.", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
         private void OnCopyBlockStyleCommand()
         {
             var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
@@ -709,15 +786,65 @@ namespace Filtration.ViewModels
 
         public void PasteBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
+            var commentBlock = targetBlockViewModelBase as IItemFilterCommentBlockViewModel;
+            if(commentBlock != null && !commentBlock.IsExpanded)
+            {
+                var blockIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModelBase) + 1;
+                while (blockIndex < ItemFilterBlockViewModels.Count && (ItemFilterBlockViewModels[blockIndex] as IItemFilterCommentBlockViewModel) == null)
+                {
+                    blockIndex++;
+                }
+                targetBlockViewModelBase = ItemFilterBlockViewModels[blockIndex - 1];
+            }
             try
             {
                 var clipboardText = _clipboardService.GetClipboardText();
                 if (string.IsNullOrEmpty(clipboardText)) return;
-                
-                var translatedBlock = _blockTranslator.TranslateStringToItemFilterBlock(clipboardText, Script, true); // TODO: Doesn't handle pasting comment blocks?
-                if (translatedBlock == null) return;
 
-                _scriptCommandManager.ExecuteCommand(new PasteBlockCommand(Script, translatedBlock, targetBlockViewModelBase.BaseBlock));
+                string[] blockTexts = clipboardText.Split(new string[] { Environment.NewLine + "##CopySection##" + Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+
+                List<IItemFilterBlockBase> blocksToPaste = new List<IItemFilterBlockBase>();
+                foreach (var curBlock in blockTexts)
+                {
+                    IItemFilterBlockBase translatedBlock;
+                    var preparedString = PrepareBlockForParsing(curBlock);
+                    var isCommentBlock = true;
+                    string[] textLines = preparedString.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+                    foreach(var line in textLines)
+                    {
+                        if(!line.StartsWith(@"#"))
+                        {
+                            isCommentBlock = false;
+                            break;
+                        }
+                    }
+
+                    if (isCommentBlock)
+                    {
+                        translatedBlock = _blockTranslator.TranslateStringToItemFilterCommentBlock(preparedString, Script, curBlock);
+                    }
+                    else
+                    {
+                        translatedBlock = _blockTranslator.TranslateStringToItemFilterBlock(preparedString, Script, curBlock, true);
+                    }
+
+                    if (translatedBlock == null) continue;
+                    
+                    blocksToPaste.Add(translatedBlock);
+                }
+
+                if (blocksToPaste.Count < 1)
+                    return;
+
+                var blockIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModelBase) + 1;
+                _scriptCommandManager.ExecuteCommand(new PasteSectionCommand(Script, blocksToPaste, targetBlockViewModelBase.BaseBlock));
+                SelectedBlockViewModel = ItemFilterBlockViewModels[blockIndex];
+                RaisePropertyChanged("SelectedBlockViewModel");
+                var firstBlockAsComment = blocksToPaste[0] as IItemFilterCommentBlock;
+                if (firstBlockAsComment != null)
+                {
+                    OnCollapseSectionCommand();
+                }
             }
             catch (Exception e)
             {
@@ -728,39 +855,250 @@ namespace Filtration.ViewModels
             }
         }
 
+        private string PrepareBlockForParsing(string inputString)
+        {
+            inputString = inputString.Replace("\t", "");
+            var lines = Regex.Split(inputString, "\r\n|\r|\n").ToList();
+            for (var i = 0; i < lines.Count; i++)
+            {
+                if (lines[i].Length == 0)
+                {
+                    lines.RemoveAt(i--);
+                }
+                else
+                    break;
+            }
+            for (var i = lines.Count - 1; i >= 0; i--)
+            {
+                if (lines[i].Length == 0)
+                {
+                    lines.RemoveAt(i++);
+                }
+                else
+                    break;
+            }
+            var allCommented = true;
+            for (var i = 0; i < lines.Count; i++)
+            {
+                lines[i] = Regex.Replace(lines[i], @"\s+", " ");
+                if(lines[i][0] == '#')
+                {
+                    if (lines[i].Length > 1 && lines[i][1] != ' ')
+                    {
+                        lines[i] = "# " + lines[i].Substring(1);
+                    }
+                }
+                else
+                {
+                    allCommented = false;
+                }
+            }
+
+            var disabledBlock = -1;
+            if (allCommented)
+            {
+                for (var i = 0; i < lines.Count; i++)
+                {
+                    if (lines[i].StartsWith("#"))
+                    {
+                        string curLine = Regex.Replace(lines[i].Substring(1), @"\s+", "");
+                        if ((curLine.StartsWith("Show") || curLine.StartsWith("Hide")) && (curLine.Length == 4 || curLine[4] == '#'))
+                        {
+                            lines[i] = lines[i].Substring(0, 6) + "Disabled" + lines[i].Substring(6);
+                            disabledBlock = i;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if(disabledBlock >= 0)
+            {
+                for (var i = disabledBlock; i < lines.Count; i++)
+                {
+                    lines[i] = lines[i].Substring(2);
+                }
+            }
+
+            return string.Join(Environment.NewLine, lines);
+        }
+
         private void OnMoveBlockToTopCommand()
         {
-            MoveBlockToTop(SelectedBlockViewModel);
+            var commentBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (commentBlockViewModel == null || commentBlockViewModel.IsExpanded)
+            {
+                MoveBlockToTop(SelectedBlockViewModel);
+            }
+            else
+            {
+                MoveSectionToTop(commentBlockViewModel);
+            }
         }
 
         private void OnMoveBlockUpCommand()
         {
-            MoveBlockUp(SelectedBlockViewModel);
+            var commentBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if(commentBlockViewModel == null || commentBlockViewModel.IsExpanded)
+            {
+                MoveBlockUp(SelectedBlockViewModel);
+            }
+            else
+            {
+                MoveSectionUp(commentBlockViewModel);
+            }
         }
 
         public void MoveBlockUp(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
-            _scriptCommandManager.ExecuteCommand(new MoveBlockUpCommand(Script, targetBlockViewModelBase?.BaseBlock));
+            var blockIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModelBase);
+            if (ItemFilterBlockViewModels[blockIndex - 1].IsVisible)
+            {
+                _scriptCommandManager.ExecuteCommand(new MoveBlockUpCommand(Script, targetBlockViewModelBase?.BaseBlock));
+                SelectedBlockViewModel = ItemFilterBlockViewModels[blockIndex - 1];
+                RaisePropertyChanged("SelectedBlockViewModel");
+            }
+            else
+            {
+                var aboveSectionStart = blockIndex - 1;
+                while(ItemFilterBlockViewModels[aboveSectionStart] as IItemFilterCommentBlockViewModel == null)
+                {
+                    aboveSectionStart--;
+                }
+                _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, blockIndex, 1, aboveSectionStart));
+                SelectedBlockViewModel = ItemFilterBlockViewModels[aboveSectionStart];
+                RaisePropertyChanged("SelectedBlockViewModel");
+            }
+        }
+
+        public void MoveSectionUp(IItemFilterCommentBlockViewModel targetCommentBlockViewModel)
+        {
+            var sectionStart = ItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModel);
+            var sectionEnd = sectionStart + 1;
+            while(sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+            {
+                sectionEnd++;
+            }
+
+            var newLocation = sectionStart - 1;
+            if (ItemFilterBlockViewModels[newLocation].IsVisible)
+            {
+                _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, sectionStart, sectionEnd - sectionStart, newLocation));
+            }
+            else
+            {
+                while (ItemFilterBlockViewModels[newLocation] as IItemFilterCommentBlockViewModel == null)
+                {
+                    newLocation--;
+                }
+                _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, sectionStart, sectionEnd - sectionStart, newLocation));
+            }
+
+            ToggleSection(ItemFilterBlockViewModels[newLocation] as IItemFilterCommentBlockViewModel);
+            SelectedBlockViewModel = ItemFilterBlockViewModels[newLocation];
+            RaisePropertyChanged("SelectedBlockViewModel");
         }
 
         private void OnMoveBlockDownCommand()
         {
-            MoveBlockDown(SelectedBlockViewModel);
+            var commentBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (commentBlockViewModel == null || commentBlockViewModel.IsExpanded)
+            {
+                MoveBlockDown(SelectedBlockViewModel);
+            }
+            else
+            {
+                MoveSectionDown(commentBlockViewModel);
+            }
         }
 
         public void MoveBlockDown(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
-            _scriptCommandManager.ExecuteCommand(new MoveBlockDownCommand(Script, targetBlockViewModelBase?.BaseBlock));
+            var blockIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModelBase);
+            var beloveBlockAsComment = ItemFilterBlockViewModels[blockIndex + 1] as IItemFilterCommentBlockViewModel;
+            if (beloveBlockAsComment == null || beloveBlockAsComment.IsExpanded)
+            {
+                _scriptCommandManager.ExecuteCommand(new MoveBlockDownCommand(Script, targetBlockViewModelBase?.BaseBlock));
+                SelectedBlockViewModel = ItemFilterBlockViewModels[blockIndex + 1];
+                RaisePropertyChanged("SelectedBlockViewModel");
+            }
+            else
+            {
+                var beloveSectionEnd = blockIndex + 2;
+                while (beloveSectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[beloveSectionEnd] as IItemFilterCommentBlockViewModel == null)
+                {
+                    beloveSectionEnd++;
+                }
+                _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, blockIndex, 1, beloveSectionEnd - 1));
+                SelectedBlockViewModel = ItemFilterBlockViewModels[beloveSectionEnd - 1];
+                RaisePropertyChanged("SelectedBlockViewModel");
+            }
+        }
+
+        public void MoveSectionDown(IItemFilterCommentBlockViewModel targetCommentBlockViewModel)
+        {
+            var sectionStart = ItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModel);
+            var sectionEnd = sectionStart + 1;
+            while (sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+            {
+                sectionEnd++;
+            }
+
+            if (sectionEnd >= ItemFilterBlockViewModels.Count)
+                return;
+
+            var sectionSize = sectionEnd - sectionStart;
+
+            var newLocation = sectionStart + 1;
+            var beloveBlockAsComment = ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel;
+            if (beloveBlockAsComment == null || beloveBlockAsComment.IsExpanded)
+            {
+                _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, sectionStart, sectionSize, newLocation));
+            }
+            else
+            {
+                while ((newLocation + sectionSize) < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[newLocation + sectionSize] as IItemFilterCommentBlockViewModel == null)
+                {
+                    newLocation++;
+                }
+                _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, sectionStart, sectionEnd - sectionStart, newLocation));
+            }
+
+            ToggleSection(ItemFilterBlockViewModels[newLocation] as IItemFilterCommentBlockViewModel);
+            SelectedBlockViewModel = ItemFilterBlockViewModels[newLocation];
+            RaisePropertyChanged("SelectedBlockViewModel");
         }
 
         private void OnMoveBlockToBottomCommand()
         {
-            MoveBlockToBottom(SelectedBlockViewModel);
+            var commentBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (commentBlockViewModel == null || commentBlockViewModel.IsExpanded)
+            {
+                MoveBlockToBottom(SelectedBlockViewModel);
+            }
+            else
+            {
+                MoveSectionToBottom(commentBlockViewModel);
+            }
         }
 
         private void OnAddBlockCommand()
         {
-            AddBlock(SelectedBlockViewModel);
+            var selectedBlockAsCommentBlock = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if(selectedBlockAsCommentBlock == null || selectedBlockAsCommentBlock.IsExpanded)
+            {
+                AddBlock(SelectedBlockViewModel);
+            }
+            else
+            {
+                var sectionStart = ItemFilterBlockViewModels.IndexOf(selectedBlockAsCommentBlock);
+                var sectionEnd = sectionStart + 1;
+                while (sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+                {
+                    sectionEnd++;
+                }
+                AddBlock(ItemFilterBlockViewModels[sectionEnd - 1]);
+            }
         }
 
         public void AddBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
@@ -776,7 +1114,22 @@ namespace Filtration.ViewModels
 
         public void DeleteBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
-            _scriptCommandManager.ExecuteCommand(new RemoveBlockCommand(Script, targetBlockViewModelBase.BaseBlock));
+            var commentBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (commentBlockViewModel == null || commentBlockViewModel.IsExpanded)
+            {
+                _scriptCommandManager.ExecuteCommand(new RemoveBlockCommand(Script, targetBlockViewModelBase.BaseBlock));
+            }
+            else
+            {
+                var sectionStart = ItemFilterBlockViewModels.IndexOf(targetBlockViewModelBase);
+                var sectionEnd = sectionStart + 1;
+                while (sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+                {
+                    sectionEnd++;
+                }
+
+                _scriptCommandManager.ExecuteCommand(new RemoveSectionCommand(Script, sectionStart, sectionEnd - sectionStart));
+            }
         }
 
         public void MoveBlockToBottom(IItemFilterBlockViewModelBase targetBlockViewModelBase)
@@ -784,11 +1137,43 @@ namespace Filtration.ViewModels
             _scriptCommandManager.ExecuteCommand(new MoveBlockToBottomCommand(Script, targetBlockViewModelBase.BaseBlock));
         }
 
+        public void MoveSectionToBottom(IItemFilterCommentBlockViewModel targetCommentBlockViewModel)
+        {
+            var sectionStart = ItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModel);
+            var sectionEnd = sectionStart + 1;
+            while (sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+            {
+                sectionEnd++;
+            }
+
+            var newLocation = ItemFilterBlockViewModels.Count - (sectionEnd - sectionStart);
+            _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, sectionStart, sectionEnd - sectionStart, newLocation));
+
+            ToggleSection(ItemFilterBlockViewModels[newLocation] as IItemFilterCommentBlockViewModel);
+            SelectedBlockViewModel = ItemFilterBlockViewModels[newLocation];
+        }
+
         public void MoveBlockToTop(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
             _scriptCommandManager.ExecuteCommand(new MoveBlockToTopCommand(Script, targetBlockViewModelBase.BaseBlock));
         }
 
+        public void MoveSectionToTop(IItemFilterCommentBlockViewModel targetCommentBlockViewModel)
+        {
+            var sectionStart = ItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModel);
+            var sectionEnd = sectionStart + 1;
+            while (sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+            {
+                sectionEnd++;
+            }
+
+            var newLocation = 0;
+            _scriptCommandManager.ExecuteCommand(new MoveSectionToIndexCommand(Script, sectionStart, sectionEnd - sectionStart, newLocation));
+
+            ToggleSection(ItemFilterBlockViewModels[newLocation] as IItemFilterCommentBlockViewModel);
+            SelectedBlockViewModel = ItemFilterBlockViewModels[newLocation];
+        }
+
         private void OnBlockBecameDirty(object sender, EventArgs e)
         {
             SetDirtyFlag();
@@ -796,7 +1181,21 @@ namespace Filtration.ViewModels
 
         private void OnAddCommentBlockCommand()
         {
-            AddCommentBlock(SelectedBlockViewModel);
+            var selectedBlockAsCommentBlock = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (selectedBlockAsCommentBlock == null || selectedBlockAsCommentBlock.IsExpanded)
+            {
+                AddCommentBlock(SelectedBlockViewModel);
+            }
+            else
+            {
+                var sectionStart = ItemFilterBlockViewModels.IndexOf(selectedBlockAsCommentBlock);
+                var sectionEnd = sectionStart + 1;
+                while (sectionEnd < ItemFilterBlockViewModels.Count && ItemFilterBlockViewModels[sectionEnd] as IItemFilterCommentBlockViewModel == null)
+                {
+                    sectionEnd++;
+                }
+                AddCommentBlock(ItemFilterBlockViewModels[sectionEnd - 1]);
+            }
         }
 
         private void OnExpandAllBlocksCommand()
@@ -837,5 +1236,181 @@ namespace Filtration.ViewModels
                 selectedBlockViewModel.BlockEnabled = true;
             }
         }
+
+        private void OnDisableSectionCommand()
+        {
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (selectedBlockViewModel != null)
+            {
+                var sectionIndex = ItemFilterBlockViewModels.IndexOf(selectedBlockViewModel);
+                for (int i = sectionIndex + 1; i < ItemFilterBlockViewModels.Count; i++)
+                {
+                    var block = ItemFilterBlockViewModels[i] as IItemFilterBlockViewModel;
+                    if (block != null)
+                    {
+                        block.BlockEnabled = false;
+                    }
+                    else
+                        break;
+                }
+            }
+        }
+
+        private void OnEnableSectionCommand()
+        {
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (selectedBlockViewModel != null)
+            {
+                var sectionIndex = ItemFilterBlockViewModels.IndexOf(selectedBlockViewModel);
+                for (int i = sectionIndex + 1; i < ItemFilterBlockViewModels.Count; i++)
+                {
+                    var block = ItemFilterBlockViewModels[i] as IItemFilterBlockViewModel;
+                    if (block != null)
+                    {
+                        block.BlockEnabled = true;
+                    }
+                    else
+                        break;
+                }
+            }
+        }
+
+        private void OnExpandSectionCommand()
+        {
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (selectedBlockViewModel != null && !selectedBlockViewModel.IsExpanded)
+            {
+                ToggleSection(selectedBlockViewModel);
+            }
+        }
+
+        private void OnCollapseSectionCommand()
+        {
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterCommentBlockViewModel;
+            if (selectedBlockViewModel != null && selectedBlockViewModel.IsExpanded)
+            {
+                ToggleSection(selectedBlockViewModel);
+            }
+        }
+
+        public void ToggleSection(IItemFilterCommentBlockViewModel targetCommentBlockViewModelBase, bool updateViewModels = true)
+        {
+            var newState = !targetCommentBlockViewModelBase.IsExpanded;
+            targetCommentBlockViewModelBase.IsExpanded = newState;
+            var sectionIndex = ItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModelBase);
+            var viewIndex = ViewItemFilterBlockViewModels.IndexOf(targetCommentBlockViewModelBase);
+            for (int i = sectionIndex + 1; i < ItemFilterBlockViewModels.Count; i++)
+            {
+                var block = ItemFilterBlockViewModels[i] as IItemFilterBlockViewModel;
+                if (block != null)
+                {
+                    if (newState)
+                        viewIndex++;
+
+                    if (newState == block.IsVisible)
+                    {
+                        continue;
+                    }
+
+                    if(updateViewModels)
+                    {
+                        if(newState)
+                        {
+                            if(viewIndex < ViewItemFilterBlockViewModels.Count)
+                            {
+                                ViewItemFilterBlockViewModels.Insert(viewIndex, block);
+                            }
+                            else
+                            {
+                                ViewItemFilterBlockViewModels.Add(block);
+                            }
+                        }
+                        else
+                        {
+                            ViewItemFilterBlockViewModels.RemoveAt(viewIndex + 1);
+                        }
+                    }
+                    block.IsVisible = newState;
+                }
+                else
+                    break;
+            }
+        }
+
+        private void UpdateBlockModelsForView()
+        {
+            ObservableCollection<IItemFilterBlockViewModelBase> blocksForView = new ObservableCollection<IItemFilterBlockViewModelBase>();
+            for (var i = 0; i < ItemFilterBlockViewModels.Count; i++)
+            {
+                var block = ItemFilterBlockViewModels[i];
+                if (block.IsVisible)
+                {
+                    blocksForView.Add(block);
+
+                    var blockAsComment = block as IItemFilterCommentBlockViewModel;
+                    if(blockAsComment != null && i < (ItemFilterBlockViewModels.Count - 1))
+                    {
+                        var followingBlock = ItemFilterBlockViewModels[i + 1] as IItemFilterBlockViewModel;
+                        if(followingBlock != null)
+                        {
+                            blockAsComment.HasChild = true;
+                        }
+                        else
+                        {
+                            blockAsComment.HasChild = false;
+                        }
+                    }
+                }
+            }
+
+            ViewItemFilterBlockViewModels = blocksForView;
+        }
+
+        private void CollapseAllSections()
+        {
+            ObservableCollection<IItemFilterBlockViewModelBase> blocksForView = new ObservableCollection<IItemFilterBlockViewModelBase>();
+            for (int i = 0; i < ItemFilterBlockViewModels.Count; i++)
+            {
+                var block = ItemFilterBlockViewModels[i] as IItemFilterCommentBlockViewModel;
+                if (block != null)
+                {
+                    blocksForView.Add(block);
+
+                    if(block.IsExpanded)
+                    {
+                        ToggleSection(block, false);
+                    }
+                }
+            }
+
+            if (SelectedBlockViewModel == null && blocksForView.Count > 0)
+            {
+                SelectedBlockViewModel = blocksForView[0];
+            }
+
+            ViewItemFilterBlockViewModels = blocksForView;
+        }
+
+        private void ExpandAllSections()
+        {
+            ObservableCollection<IItemFilterBlockViewModelBase> blocksForView = new ObservableCollection<IItemFilterBlockViewModelBase>();
+            for (int i = 0; i < ItemFilterBlockViewModels.Count; i++)
+            {
+                blocksForView.Add(ItemFilterBlockViewModels[i]);
+
+                var block = ItemFilterBlockViewModels[i] as IItemFilterCommentBlockViewModel;
+                if (block != null && !block.IsExpanded)
+                {
+                    ToggleSection(block, false);
+                }
+            }
+
+            if(SelectedBlockViewModel == null && blocksForView.Count > 0)
+            {
+                SelectedBlockViewModel = blocksForView[0];
+            }
+
+            ViewItemFilterBlockViewModels = blocksForView;
+        }
     }
 }
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index 7fe247c..74e6534 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -100,6 +100,10 @@ namespace Filtration.ViewModels
             DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
             DisableBlockCommand = new RelayCommand(OnDisableBlockCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedEnabledBlock);
             EnableBlockCommand = new RelayCommand(OnEnableBlockCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedDisabledBlock);
+            DisableSectionCommand = new RelayCommand(OnDisableSectionCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedCommentBlock);
+            EnableSectionCommand = new RelayCommand(OnEnableSectionCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedCommentBlock);
+            ExpandSectionCommand = new RelayCommand(OnExpandSectionCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedCommentBlock);
+            CollapseSectionCommand = new RelayCommand(OnCollapseSectionCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedCommentBlock);
             OpenAboutWindowCommand = new RelayCommand(OnOpenAboutWindowCommand);
             ReplaceColorsCommand = new RelayCommand(OnReplaceColorsCommand, () => ActiveDocumentIsScript);
 
@@ -110,11 +114,19 @@ namespace Filtration.ViewModels
             AddTextColorThemeComponentCommand = new RelayCommand(OnAddTextColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             AddBackgroundColorThemeComponentCommand = new RelayCommand(OnAddBackgroundColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             AddBorderColorThemeComponentCommand = new RelayCommand(OnAddBorderColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddFontSizeThemeComponentCommand = new RelayCommand(OnAddFontSizeThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddAlertSoundThemeComponentCommand = new RelayCommand(OnAddAlertSoundThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddCustomSoundThemeComponentCommand = new RelayCommand(OnAddCustomSoundThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddIconThemeComponentCommand = new RelayCommand(OnAddIconThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddEffectColorThemeComponentCommand = new RelayCommand(OnAddEffectColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             DeleteThemeComponentCommand = new RelayCommand(OnDeleteThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable && _avalonDockWorkspaceViewModel.ActiveThemeViewModel.SelectedThemeComponent != null);
 
             ExpandAllBlocksCommand = new RelayCommand(OnExpandAllBlocksCommand, () => ActiveDocumentIsScript);
             CollapseAllBlocksCommand = new RelayCommand(OnCollapseAllBlocksCommand, () => ActiveDocumentIsScript);
 
+            ExpandAllSectionsCommand = new RelayCommand(OnExpandAllSectionsCommand, () => ActiveDocumentIsScript);
+            CollapseAllSectionsCommand = new RelayCommand(OnCollapseAllSectionsCommand, () => ActiveDocumentIsScript);
+
             ToggleShowAdvancedCommand = new RelayCommand<bool>(OnToggleShowAdvancedCommand, s => ActiveDocumentIsScript);
             ClearFiltersCommand = new RelayCommand(OnClearFiltersCommand, () => ActiveDocumentIsScript);
 
@@ -206,6 +218,11 @@ namespace Filtration.ViewModels
         public RelayCommand AddTextColorThemeComponentCommand { get; }
         public RelayCommand AddBackgroundColorThemeComponentCommand { get; }
         public RelayCommand AddBorderColorThemeComponentCommand { get; }
+        public RelayCommand AddFontSizeThemeComponentCommand { get; }
+        public RelayCommand AddAlertSoundThemeComponentCommand { get; }
+        public RelayCommand AddCustomSoundThemeComponentCommand { get; }
+        public RelayCommand AddIconThemeComponentCommand { get; }
+        public RelayCommand AddEffectColorThemeComponentCommand { get; }
         public RelayCommand DeleteThemeComponentCommand { get; }
 
         public RelayCommand AddBlockCommand { get; }
@@ -213,6 +230,10 @@ namespace Filtration.ViewModels
         public RelayCommand DeleteBlockCommand { get; }
         public RelayCommand DisableBlockCommand { get; }
         public RelayCommand EnableBlockCommand { get; }
+        public RelayCommand DisableSectionCommand { get; }
+        public RelayCommand EnableSectionCommand { get; }
+        public RelayCommand ExpandSectionCommand { get; }
+        public RelayCommand CollapseSectionCommand { get; }
 
         public RelayCommand MoveBlockUpCommand { get; }
         public RelayCommand MoveBlockDownCommand { get; }
@@ -222,6 +243,9 @@ namespace Filtration.ViewModels
         public RelayCommand ExpandAllBlocksCommand { get; }
         public RelayCommand CollapseAllBlocksCommand { get; }
 
+        public RelayCommand ExpandAllSectionsCommand { get; }
+        public RelayCommand CollapseAllSectionsCommand { get; }
+
         public RelayCommand<bool> ToggleShowAdvancedCommand { get; }
         public RelayCommand ClearFiltersCommand { get; }
 
@@ -260,6 +284,9 @@ namespace Filtration.ViewModels
 
         public bool ActiveScriptHasSelectedDisabledBlock => AvalonDockWorkspaceViewModel.ActiveScriptViewModel.HasSelectedDisabledBlock();
 
+        public bool ActiveScriptHasSelectedCommentBlock => AvalonDockWorkspaceViewModel.ActiveScriptViewModel.HasSelectedCommentBlock();
+
+
         public bool ActiveThemeIsEditable => AvalonDockWorkspaceViewModel.ActiveThemeViewModel.IsMasterTheme;
 
         private bool ActiveDocumentIsEditable()
@@ -595,6 +622,26 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveScriptViewModel.EnableBlockCommand.Execute(null);
         }
 
+        private void OnDisableSectionCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.DisableSectionCommand.Execute(null);
+        }
+
+        private void OnEnableSectionCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.EnableSectionCommand.Execute(null);
+        }
+
+        private void OnExpandSectionCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.ExpandSectionCommand.Execute(null);
+        }
+
+        private void OnCollapseSectionCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.CollapseSectionCommand.Execute(null);
+        }
+
         private void OnExpandAllBlocksCommand()
         {
             _avalonDockWorkspaceViewModel.ActiveScriptViewModel.ExpandAllBlocksCommand.Execute(null);
@@ -605,6 +652,16 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveScriptViewModel.CollapseAllBlocksCommand.Execute(null);
         }
 
+        private void OnExpandAllSectionsCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.ExpandAllSectionsCommand.Execute(null);
+        }
+
+        private void OnCollapseAllSectionsCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.CollapseAllSectionsCommand.Execute(null);
+        }
+
         private void OnToggleShowAdvancedCommand(bool showAdvanced)
         {
             _avalonDockWorkspaceViewModel.ActiveScriptViewModel.ToggleShowAdvancedCommand.Execute(showAdvanced);
@@ -630,6 +687,31 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.BorderColor);
         }
 
+        private void OnAddFontSizeThemeComponentCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.FontSize);
+        }
+
+        private void OnAddAlertSoundThemeComponentCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.AlertSound);
+        }
+
+        private void OnAddCustomSoundThemeComponentCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.CustomSound);
+        }
+
+        private void OnAddIconThemeComponentCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.Icon);
+        }
+
+        private void OnAddEffectColorThemeComponentCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.Effect);
+        }
+
         private void OnDeleteThemeComponentCommand()
         {
             _avalonDockWorkspaceViewModel.ActiveThemeViewModel.DeleteThemeComponentCommand.Execute(
diff --git a/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs b/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
index a13f3c4..f205a39 100644
--- a/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
@@ -28,6 +28,9 @@ namespace Filtration.ViewModels.ToolPanes
             icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/block_group_browser_icon.png");
             icon.EndInit();
             IconSource = icon;
+
+            IsVisible = false;
+
             Messenger.Default.Register<NotificationMessage<bool>>(this, message =>
             {
                 switch (message.Notification)
diff --git a/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs b/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
index e2c9880..9dc542a 100644
--- a/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Windows.Data;
 using System.Windows.Media.Imaging;
 using GalaSoft.MvvmLight.Messaging;
 
@@ -15,6 +17,8 @@ namespace Filtration.ViewModels.ToolPanes
     {
         private IEnumerable<IItemFilterCommentBlockViewModel> _itemFilterCommentBlockViewModels;
         private IItemFilterCommentBlockViewModel _selectedItemFilterCommentBlockViewModel;
+        private CollectionView _commentBlocksView;
+        private string _searchText;
 
         public CommentBlockBrowserViewModel() : base("Section Browser")
         {
@@ -24,7 +28,9 @@ namespace Filtration.ViewModels.ToolPanes
             icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/add_section_icon.png");
             icon.EndInit();
             IconSource = icon;
-            
+            _searchText = "";
+            _commentBlocksView = (CollectionView)CollectionViewSource.GetDefaultView(new List<IItemFilterCommentBlockViewModel>());
+
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
                 switch (message.Notification)
@@ -46,7 +52,23 @@ namespace Filtration.ViewModels.ToolPanes
             private set
             {
                 _itemFilterCommentBlockViewModels = value;
-                RaisePropertyChanged();
+
+                _commentBlocksView = _itemFilterCommentBlockViewModels != null ?
+                    (CollectionView)CollectionViewSource.GetDefaultView(_itemFilterCommentBlockViewModels)
+                    : (CollectionView)CollectionViewSource.GetDefaultView(new List<IItemFilterCommentBlockViewModel>());
+
+                _commentBlocksView.Filter = SearchFilter;
+                _commentBlocksView.Refresh();
+                RaisePropertyChanged("CommentBlocksView");
+            }
+        }
+
+        public CollectionView CommentBlocksView
+        {
+            get => _commentBlocksView;
+            private set
+            {
+                _commentBlocksView = value;
             }
         }
 
@@ -64,6 +86,18 @@ namespace Filtration.ViewModels.ToolPanes
             }
         }
 
+        public string SearchText
+        {
+            get => _searchText;
+            set
+            {
+                _searchText = value;
+                _commentBlocksView.Refresh();
+                RaisePropertyChanged();
+                RaisePropertyChanged("CommentBlocksView");
+            }
+        }
+
         protected override void OnActiveDocumentChanged(object sender, EventArgs e)
         {
             if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel != null && AvalonDockWorkspaceViewModel.ActiveDocument.IsScript)
@@ -81,5 +115,24 @@ namespace Filtration.ViewModels.ToolPanes
             ItemFilterCommentBlockViewModels = null;
             SelectedItemFilterCommentBlockViewModel = null;
         }
+
+        private bool SearchFilter(object obj)
+        {
+            if (string.IsNullOrEmpty(_searchText))
+                return true;
+
+            var block = obj as IItemFilterCommentBlockViewModel;
+            var searchWords = Regex.Split(_searchText, @"\s+");
+            foreach(var word in searchWords)
+            {
+                if (string.IsNullOrEmpty(word))
+                    continue;
+
+                if (block.Comment.IndexOf(word, StringComparison.OrdinalIgnoreCase) >= 0)
+                    return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/Filtration/Views/AboutWindow.xaml b/Filtration/Views/AboutWindow.xaml
index 9b8c9ae..9862989 100644
--- a/Filtration/Views/AboutWindow.xaml
+++ b/Filtration/Views/AboutWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="Filtration.Views.AboutWindow"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:extensions="clr-namespace:Filtration.Extensions"
+                      xmlns:extensions="clr-namespace:Filtration.Common.Extensions;assembly=Filtration.Common"
                       Title="About Filtration"
                       Height="360"
                       Width="580"
diff --git a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
index 2ce3949..fdd92e3 100644
--- a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
+++ b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
@@ -94,7 +94,7 @@
 
             <xcad:LayoutRoot>
                 <xcad:LayoutPanel Orientation="Horizontal">
-                    <xcad:LayoutAnchorablePane Name="SectionBrowserPane" DockWidth="150" />
+                    <xcad:LayoutAnchorablePane Name="SectionBrowserPane" DockWidth="200" />
                     <xcad:LayoutPanel Orientation="Vertical">
                         <xcad:LayoutDocumentPane />
                     </xcad:LayoutPanel>
diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml
index 98b941c..af675b4 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml
+++ b/Filtration/Views/ItemFilterBlockView.xaml
@@ -18,6 +18,8 @@
                 <ResourceDictionary>
                     <views:BindingProxy x:Key="Proxy" Data="{Binding}" />
                     <converters:BlockGroupAdvancedFillColorConverter x:Key="BlockGroupAdvancedFillColorConverter" />
+                    <converters:IconShapeToSourceConverter x:Key="IconShapeToSourceConverter"/>
+                    <converters:SizeColorToRectConverter x:Key="SizeColorToRectConverter"/>
                     <Style TargetType="{x:Type ContentPresenter}" x:Key="BlockItemFadeInStyle">
                         <Setter Property="LayoutTransform">
                             <Setter.Value>
@@ -94,6 +96,7 @@
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <!-- BlockItems Summary Panel -->
                             <StackPanel Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">
@@ -126,9 +129,22 @@
                                     </ItemsControl.Resources>
                                 </ItemsControl>
                             </StackPanel>
-                           
+
                             <!-- Item Preview Box -->
                             <WrapPanel Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">
+                                <Rectangle Height="40" Width="40" Margin="0,0,10,0">
+                                    <Rectangle.Fill>
+                                        <ImageBrush ImageSource="{Binding DisplayIconShape, Converter={StaticResource IconShapeToSourceConverter}, Mode=OneWay}"
+                                            ViewboxUnits="Absolute" Stretch="Fill">
+                                            <ImageBrush.Viewbox>
+                                                <MultiBinding Converter="{StaticResource SizeColorToRectConverter}">
+                                                    <Binding Path="DisplayIconSize"/>
+                                                    <Binding Path="DisplayIconColor"/>
+                                                </MultiBinding>
+                                            </ImageBrush.Viewbox>
+                                        </ImageBrush>
+                                    </Rectangle.Fill>
+                                </Rectangle>
                                 <Button Command="{Binding PlaySoundCommand}"
                                         Width="25"
                                         Height="25"
@@ -153,7 +169,26 @@
                                         ToolTip="Click to preview drop sound">
                                     <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
                                 </Button>
-                                <ToggleButton Margin="0,2,2,2"
+                                <Button Command="{Binding PlayCustomSoundCommand}"
+                                        Width="25"
+                                        Height="25"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Center"
+                                        Margin="0,0,3,0"
+                                        Visibility="{Binding HasCustomSound, Converter={StaticResource BooleanVisibilityConverter}}"
+                                        Background="Transparent"
+                                        BorderBrush="Transparent"
+                                        ToolTip="Click to preview drop sound">
+                                    <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                </Button>
+                                <Line Y1="5" Y2="38" StrokeThickness="2" Panel.ZIndex="999"
+                                      Stroke="{Binding DisplayEffectColor, Converter={StaticResource ColorToSolidColorBrushConverter}, Mode=OneWay}"
+                                      Margin="10,2,0,0" >
+                                    <Line.Effect>
+                                        <DropShadowEffect BlurRadius="5" ShadowDepth="0" Color="{Binding DisplayEffectColor, Mode=OneWay}" Direction="0"/>
+                                    </Line.Effect>
+                                </Line>
+                                <ToggleButton Margin="-10,2,2,2"
                                               Style="{StaticResource ChromelessToggleButton}"
                                               x:Name="ItemPreviewButton"
                                               IsChecked="{Binding AudioVisualBlockItemsGridVisible}"
diff --git a/Filtration/Views/ItemFilterCommentBlockView.xaml b/Filtration/Views/ItemFilterCommentBlockView.xaml
index 8846a50..e8a521e 100644
--- a/Filtration/Views/ItemFilterCommentBlockView.xaml
+++ b/Filtration/Views/ItemFilterCommentBlockView.xaml
@@ -44,7 +44,7 @@
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
-        
+
     </UserControl.Resources>
     <Grid>
         <Grid.ContextMenu>
@@ -76,7 +76,51 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <TextBox Grid.Column ="0" Text="{Binding Comment, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" VerticalAlignment="Center" TextWrapping="Wrap" MinWidth="150"/>
+
+                <Expander Grid.Column="1"
+                          Style="{StaticResource ExpanderRightAlignStyle}"
+                          x:Name="BlockExpander">
+
+                    <Expander.Header>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <Label Grid.Column="0" VerticalAlignment="Center" MinWidth="150" Content="{Binding Header, Mode=OneWay}" />
+                            <WrapPanel Grid.Column="1" HorizontalAlignment="Right" Visibility="{Binding HasChild, Converter={StaticResource BooleanVisibilityConverter}}">
+                                <Button Command="{Binding ToggleSectionCommand}"
+                                    Width="25"
+                                    Height="25"
+                                    VerticalAlignment="Center"
+                                    Margin="0,0,3,0"
+                                    Background="Transparent"
+                                    BorderBrush="Transparent"
+                                    ToolTip="Expand Section" Visibility="{Binding IsExpanded, Converter={StaticResource InverseBooleanVisibilityConverter}}">
+                                    <Image Source="/Filtration;component/Resources/Icons/expand_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                </Button>
+                                <Button Command="{Binding ToggleSectionCommand}"
+                                    Width="25"
+                                    Height="25"
+                                    VerticalAlignment="Center"
+                                    Margin="0,0,3,0"
+                                    Background="Transparent"
+                                    BorderBrush="Transparent"
+                                    ToolTip="Collapse Section" Visibility="{Binding IsExpanded, Converter={StaticResource BooleanVisibilityConverter}}">
+                                    <Image Source="/Filtration;component/Resources/Icons/collapse_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                </Button>
+                            </WrapPanel>
+                        </Grid>
+                    </Expander.Header>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Grid.Column ="0" Text="{Binding Comment, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" VerticalAlignment="Center" TextWrapping="Wrap" MinWidth="150"/>
+                    </Grid>
+                </Expander>
             </Grid>
         </Border>
     </Grid>
diff --git a/Filtration/Views/ItemFilterScriptView.xaml b/Filtration/Views/ItemFilterScriptView.xaml
index f258054..3f4ab3c 100644
--- a/Filtration/Views/ItemFilterScriptView.xaml
+++ b/Filtration/Views/ItemFilterScriptView.xaml
@@ -54,7 +54,7 @@
         </Border>
         <Border Grid.Row="1" BorderThickness="1" BorderBrush="DarkGray" Margin="5,5,5,5">
             <DockPanel LastChildFill="True">
-                <userControls:AutoScrollingListBox ItemsSource="{Binding ItemFilterBlockViewModels}"
+                <userControls:AutoScrollingListBox ItemsSource="{Binding ViewItemFilterBlockViewModels}"
                                                    Padding="5"
                                                    HorizontalContentAlignment="Stretch"
                                                    BorderThickness="0"
diff --git a/Filtration/Views/MainWindow.xaml b/Filtration/Views/MainWindow.xaml
index 1d9aa46..4a021a7 100644
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@@ -102,6 +102,13 @@
                     <fluent:Button Header="Enable Block" Command="{Binding EnableBlockCommand}"  SizeDefinition="Middle" Icon="{StaticResource StandbyEnabledIcon}" />
                     <fluent:Button Header="Disable Block" Command="{Binding DisableBlockCommand}"  SizeDefinition="Middle" Icon="{StaticResource StandbyDisabledIcon}" />
                 </fluent:RibbonGroupBox>
+                <fluent:RibbonGroupBox Header="Sections">
+                    <fluent:Button Header="Enable Section" Command="{Binding EnableSectionCommand}"  SizeDefinition="Middle" Icon="{StaticResource StandbyEnabledIcon}" />
+                    <fluent:Button Header="Disable Section" Command="{Binding DisableSectionCommand}"  SizeDefinition="Middle" Icon="{StaticResource StandbyDisabledIcon}" />
+                    <fluent:Button Header=""  SizeDefinition="Middle" IsEnabled="False" />
+                    <fluent:Button Header="Expand All Sections" Command="{Binding ExpandAllSectionsCommand}" SizeDefinition="Middle" Icon="{StaticResource ExpandIcon}" />
+                    <fluent:Button Header="Collapse All Sections" Command="{Binding CollapseAllSectionsCommand}" SizeDefinition="Middle" Icon="{StaticResource CollapseIcon}" />
+                </fluent:RibbonGroupBox>
                 <fluent:RibbonGroupBox Header="Expand / Collapse">
                     <fluent:Button Header="Expand All" Command="{Binding ExpandAllBlocksCommand}" SizeDefinition="Middle" Icon="{StaticResource ExpandIcon}" />
                     <fluent:Button Header="Collapse All" Command="{Binding CollapseAllBlocksCommand}" SizeDefinition="Middle" Icon="{StaticResource CollapseIcon}" />
@@ -122,6 +129,11 @@
                     <fluent:Button SizeDefinition="Middle" Header="Add Text Color" Icon="{StaticResource AddIcon}" Command="{Binding AddTextColorThemeComponentCommand}" />
                     <fluent:Button SizeDefinition="Middle" Header="Add Background Color" Icon="{StaticResource AddIcon}" Command="{Binding AddBackgroundColorThemeComponentCommand}" />
                     <fluent:Button SizeDefinition="Middle" Header="Add Border Color" Icon="{StaticResource AddIcon}" Command="{Binding AddBorderColorThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Font Size" Icon="{StaticResource AddIcon}" Command="{Binding AddFontSizeThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Alert Sound" Icon="{StaticResource AddIcon}" Command="{Binding AddAlertSoundThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Custom Sound" Icon="{StaticResource AddIcon}" Command="{Binding AddCustomSoundThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Icon" Icon="{StaticResource AddIcon}" Command="{Binding AddIconThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Effect Color" Icon="{StaticResource AddIcon}" Command="{Binding AddEffectColorThemeComponentCommand}" />
                 </fluent:RibbonGroupBox>
                 <fluent:RibbonGroupBox Header="Delete">
                     <fluent:Button Header="Delete Theme Component" Icon="{StaticResource ThemeComponentDeleteIcon}" LargeIcon="{StaticResource ThemeComponentDeleteIcon}" Command="{Binding DeleteThemeComponentCommand}" />
diff --git a/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
index 7c8e104..6ddecca 100644
--- a/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
+++ b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
@@ -13,7 +13,12 @@
         <converters:HashSignRemovalConverter x:Key="HashSignRemovalConverter" />
     </UserControl.Resources>
     <Grid>
-        <ListBox ItemsSource="{Binding ItemFilterCommentBlockViewModels}"
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TextBox Grid.Row="0" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" Height="30" Padding="0,-10,0,0" />
+        <ListBox Grid.Row="1" ItemsSource="{Binding CommentBlocksView}"
                  SelectedItem="{Binding SelectedItemFilterCommentBlockViewModel}"
                  ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
             <ListBox.Resources>
@@ -21,7 +26,7 @@
             </ListBox.Resources>
             <ListBox.ItemTemplate>
                 <DataTemplate DataType="viewModels:ItemFilterCommentBlockViewModel">
-                    <TextBlock Text="{Binding Comment, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Comment}" />
+                    <TextBlock Text="{Binding Header, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Comment}" />
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>