diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
index 48ed9a1..9fd71a8 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs
@@ -1,4 +1,5 @@
 using System.Windows.Media;
+using Filtration.ThemeEditor.Models;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
@@ -20,7 +21,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             get
             {
                 return PrefixText + " " + +Color.R + " " + Color.G + " "
-                       + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty);
+                       + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
+                       (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
             }
         }
 
@@ -29,6 +31,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             get { return string.Empty; }
         }
 
+        public ThemeComponent ThemeComponent { get; set; }
+
         public override Color SummaryBackgroundColor { get { return Colors.Transparent; } }
         public override Color SummaryTextColor { get { return Colors.Transparent; } }
 
diff --git a/Filtration.ObjectModel/Filtration.ObjectModel.csproj b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
index 2548419..34ccdc5 100644
--- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj
+++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
@@ -80,6 +80,8 @@
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReplaceColorsParameterSet.cs" />
+    <Compile Include="ThemeEditor\Theme.cs" />
+    <Compile Include="ThemeEditor\ThemeComponent.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Filtration.ObjectModel/ItemFilterScript.cs b/Filtration.ObjectModel/ItemFilterScript.cs
index 4dd8fc9..b50b76b 100644
--- a/Filtration.ObjectModel/ItemFilterScript.cs
+++ b/Filtration.ObjectModel/ItemFilterScript.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ThemeEditor.Models;
 
 namespace Filtration.ObjectModel
 {
@@ -15,10 +16,13 @@ namespace Filtration.ObjectModel
             {
                 new ItemFilterBlockGroup("Root", null)
             };
+            ThemeComponents = new List<ThemeComponent>();
         }
 
         public ObservableCollection<ItemFilterBlock> ItemFilterBlocks { get; private set; }
-        public ObservableCollection<ItemFilterBlockGroup> ItemFilterBlockGroups { get; private set; } 
+        public ObservableCollection<ItemFilterBlockGroup> ItemFilterBlockGroups { get; private set; }
+
+        public List<ThemeComponent> ThemeComponents { get; set; } 
 
         public string FilePath { get; set; }
         public string Description { get; set; }
@@ -38,7 +42,6 @@ namespace Filtration.ObjectModel
 
         public void ReplaceColors(ReplaceColorsParameterSet replaceColorsParameterSet)
         {
-
             foreach (
                 var block in
                     ItemFilterBlocks.Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b)))
@@ -59,7 +62,6 @@ namespace Filtration.ObjectModel
                     borderColorBlockItem.Color = replaceColorsParameterSet.NewBorderColor;
                 }
             }
-
         }
 
         private bool BlockIsColorReplacementCandidate(ReplaceColorsParameterSet replaceColorsParameterSet, ItemFilterBlock block)
diff --git a/Filtration.ObjectModel/ThemeEditor/Theme.cs b/Filtration.ObjectModel/ThemeEditor/Theme.cs
new file mode 100644
index 0000000..fc99256
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/Theme.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Media;
+
+namespace Filtration.ThemeEditor.Models
+{
+    public class Theme
+    {
+        private readonly List<ThemeComponent> _components; 
+
+        public Theme()
+        {
+            _components = new List<ThemeComponent>();
+        }
+
+        public string Name { get; set; }
+
+        public IEnumerable<ThemeComponent> Components
+        {
+            get { return _components; }
+        }
+
+        public bool ComponentExists(Type targetType, string componentName)
+        {
+            return _components.Exists(c => c.ComponentName == componentName && c.TargetType == targetType);
+        }
+
+        public void AddComponent(Type targetType, string componentName, Color componentColor)
+        {
+            _components.Add(new ThemeComponent(targetType, componentName, componentColor));
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
new file mode 100644
index 0000000..282722d
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Windows.Media;
+
+namespace Filtration.ThemeEditor.Models
+{
+    public class ThemeComponent
+    {
+        public ThemeComponent(Type targetType, string componentName, Color componentColor)
+        {
+            if (targetType == null || componentName == null || componentColor == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in ThemeComponent constructor");
+            }
+
+            TargetType = targetType;
+            Color = componentColor;
+            ComponentName = componentName;
+        }
+
+        public string ComponentName { get; set; }
+        public Type TargetType { get; private set; }
+        public Color Color { get; set; }
+    }
+}
diff --git a/Filtration.Tests/Filtration.Tests.csproj b/Filtration.Tests/Filtration.Tests.csproj
index 60ebff2..98e6d3a 100644
--- a/Filtration.Tests/Filtration.Tests.csproj
+++ b/Filtration.Tests/Filtration.Tests.csproj
@@ -53,6 +53,7 @@
     <Compile Include="Translators\TestBlockGroupHierarchyBuilder.cs" />
     <Compile Include="Translators\TestItemFilterBlockTranslator.cs" />
     <Compile Include="Translators\TestItemFilterScriptTranslator.cs" />
+    <Compile Include="Translators\TestThemeComponentListBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs b/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs
index f7833b7..01e5d09 100644
--- a/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs
+++ b/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs
@@ -6,6 +6,7 @@ using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ThemeEditor.Models;
 using Filtration.Translators;
 using Moq;
 using NUnit.Framework;
@@ -490,7 +491,28 @@ namespace Filtration.Tests.Translators
             Assert.AreEqual(255, blockItem.Color.R);
             Assert.AreEqual(20, blockItem.Color.G);
             Assert.AreEqual(100, blockItem.Color.B);
+        }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_SetTextColorWithThemeComponent_CallsThemeListBuilderAddComponent()
+        {
+            // Arrange
+            var inputString = "Show" + Environment.NewLine +
+                              "    SetTextColor 255 20 100 # Rare Item Text";
+            var testComponent = new ThemeComponent(typeof(TextColorBlockItem), "testComponent", new Color());
+
+            _testUtility.MockThemeComponentListBuilder.Setup(
+                t =>
+                    t.AddComponent(typeof (TextColorBlockItem), "Rare Item Text",
+                        new Color {A = 255, R = 255, G = 20, B = 100})).Returns(testComponent).Verifiable();
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString);
+
+            // Assert
+            var blockItem = result.BlockItems.OfType<TextColorBlockItem>().First();
+            Assert.AreSame(testComponent, blockItem.ThemeComponent);
+            _testUtility.MockThemeComponentListBuilder.Verify();
         }
 
         [Test]
@@ -1085,6 +1107,27 @@ namespace Filtration.Tests.Translators
             Assert.AreEqual(expectedResult, result);
         }
 
+        [Test]
+        public void TranslateItemFilterBlockToString_TextColorWithThemeComponent_ReturnsCorrectString()
+        {
+            // Arrange
+            var expectedResult = "Show" + Environment.NewLine +
+                                 "    SetTextColor 54 102 255 # Test Theme Component";
+
+            var blockItem = new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255})
+            {
+                ThemeComponent = new ThemeComponent(typeof (TextColorBlockItem), "Test Theme Component", new Color())
+            };
+
+            _testUtility.TestBlock.BlockItems.Add(blockItem);
+
+            // Act
+            var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
+
+            // Assert
+            Assert.AreEqual(expectedResult, result);
+        }
+
         [Test]
         public void TranslateItemFilterBlockToString_TextColorNotMaxAlpha_ReturnsCorrectString()
         {
@@ -1291,13 +1334,16 @@ namespace Filtration.Tests.Translators
 
                 // Mock setups
                 MockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
+                MockThemeComponentListBuilder = new Mock<IThemeComponentListBuilder>();
 
                 // Class under test instantiation
-                Translator = new ItemFilterBlockTranslator(MockBlockGroupHierarchyBuilder.Object);
+                Translator = new ItemFilterBlockTranslator(MockBlockGroupHierarchyBuilder.Object,
+                    MockThemeComponentListBuilder.Object);
             }
 
             public ItemFilterBlock TestBlock { get; set; }
             public Mock<IBlockGroupHierarchyBuilder> MockBlockGroupHierarchyBuilder { get; private set; }
+            public Mock<IThemeComponentListBuilder> MockThemeComponentListBuilder { get; private set; }
             public ItemFilterBlockTranslator Translator { get; private set; }
         }
     }
diff --git a/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs b/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs
index 50c1814..58e4778 100644
--- a/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs
+++ b/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Windows;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.ObjectModel.Enums;
 using Filtration.Properties;
+using Filtration.ThemeEditor.Models;
 using Filtration.Translators;
 using Moq;
 using NUnit.Framework;
@@ -60,6 +63,37 @@ namespace Filtration.Tests.Translators
             Assert.AreEqual(expectedDescription, script.Description);
         }
 
+        [Test]
+        public void TranslateStringToItemFilterScript_CallsThemeComponentListBuilderInitialise()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/testscript.txt");
+
+            _testUtility.MockThemeComponentListBuilder.Setup(t => t.Initialise()).Verifiable();
+            // Act
+            _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            _testUtility.MockThemeComponentListBuilder.Verify();
+        }
+
+
+        [Test]
+        public void TranslateStringToItemFilterScript_SetsScriptThemeComponentsToComponentListBuilderResult()
+        {
+            // Arrange
+            var testInput = File.ReadAllText(@"Resources/testscript.txt");
+            List<ThemeComponent> testThemeComponents = new List<ThemeComponent>();
+
+            _testUtility.MockThemeComponentListBuilder.Setup(t => t.GetComponents()).Returns(testThemeComponents).Verifiable();
+            // Act
+            var result = _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            _testUtility.MockThemeComponentListBuilder.Verify();
+            Assert.AreSame(testThemeComponents, result.ThemeComponents);
+        }
+
         [Ignore("Integration Test")]
         [Test]
         public void TranslateStringToItemFilterScript_ThioleItemFilterTest()
@@ -67,10 +101,10 @@ namespace Filtration.Tests.Translators
             // Arrange
             var testInput = File.ReadAllText(@"Resources/ThioleItemFilter.txt");
 
-
-            var mockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
-            var blockTranslator = new ItemFilterBlockTranslator(mockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator, mockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
 
             // Act
             translator.TranslateStringToItemFilterScript(testInput);
@@ -127,9 +161,10 @@ namespace Filtration.Tests.Translators
                                  "    Width = 3" + Environment.NewLine +
                                  "    SetFontSize 7" + Environment.NewLine;
 
-            var mockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
-            var blockTranslator = new ItemFilterBlockTranslator(mockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator, mockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
 
             // Act
             var result = translator.TranslateItemFilterScriptToString(script);
@@ -172,9 +207,10 @@ namespace Filtration.Tests.Translators
                                  "    Width = 3" + Environment.NewLine +
                                  "    SetFontSize 7" + Environment.NewLine + Environment.NewLine;
 
-            var mockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
-            var blockTranslator = new ItemFilterBlockTranslator(mockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator, mockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
 
             // Act
             var result = translator.TranslateItemFilterScriptToString(script);
@@ -215,8 +251,10 @@ namespace Filtration.Tests.Translators
                                   "    SetBorderColor 255 0 255" + Environment.NewLine +
                                   "    SetFontSize 25";
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator, _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object,
+                _testUtility.MockThemeComponentListBuilder.Object);
+            var translator = new ItemFilterScriptTranslator(blockTranslator,
+                _testUtility.MockBlockGroupHierarchyBuilder.Object, _testUtility.MockThemeComponentListBuilder.Object);
 
             // Act
             var result = translator.TranslateStringToItemFilterScript(testInputScript);
@@ -237,14 +275,16 @@ namespace Filtration.Tests.Translators
                 // Mock setups
                 MockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
                 MockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
+                MockThemeComponentListBuilder = new Mock<IThemeComponentListBuilder>();
 
                 // Class under test instantiation
-                ScriptTranslator = new ItemFilterScriptTranslator(MockItemFilterBlockTranslator.Object, MockBlockGroupHierarchyBuilder.Object);
+                ScriptTranslator = new ItemFilterScriptTranslator(MockItemFilterBlockTranslator.Object, MockBlockGroupHierarchyBuilder.Object, MockThemeComponentListBuilder.Object);
             }
 
             public ItemFilterScriptTranslator ScriptTranslator { get; private set; }
             public Mock<IItemFilterBlockTranslator> MockItemFilterBlockTranslator { get; private set; }
             public Mock<IBlockGroupHierarchyBuilder> MockBlockGroupHierarchyBuilder { get; private set; }
+            public Mock<IThemeComponentListBuilder> MockThemeComponentListBuilder { get; private set; }
         }
     }
 }
diff --git a/Filtration.Tests/Translators/TestThemeComponentListBuilder.cs b/Filtration.Tests/Translators/TestThemeComponentListBuilder.cs
new file mode 100644
index 0000000..38299e7
--- /dev/null
+++ b/Filtration.Tests/Translators/TestThemeComponentListBuilder.cs
@@ -0,0 +1,30 @@
+using System.Windows.Media;
+using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.Translators;
+using NUnit.Framework;
+
+namespace Filtration.Tests.Translators
+{
+    [TestFixture]
+    public class TestThemeComponentListBuilder
+    {
+        [Test]
+        public void AddComponent_ReturnsFirstAddedComponent_WhenComponentAddedTwice()
+        {
+            // Arrange
+
+            var testInputTargetType = typeof (TextColorBlockItem);
+            var testInputComponentName = "testComponent";
+            var testInputColor = new Color();
+
+            var builder = new ThemeComponentListBuilder();
+
+            // Act
+            var firstResult = builder.AddComponent(testInputTargetType, testInputComponentName, testInputColor);
+            var secondResult = builder.AddComponent(testInputTargetType, testInputComponentName, testInputColor);
+
+            // Assert
+            Assert.AreSame(firstResult, secondResult);
+        }
+    }
+}
diff --git a/Filtration.ThemeEditor.Tests/Properties/AssemblyInfo.cs b/Filtration.ThemeEditor.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..6603374
--- /dev/null
+++ b/Filtration.ThemeEditor.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.ThemeEditor.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.ThemeEditor.Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("02c5856c-03f5-4942-bdba-ccc013088c2c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
new file mode 100644
index 0000000..4f94100
--- /dev/null
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Filtration.ThemeEditor</RootNamespace>
+    <AssemblyName>Filtration.ThemeEditor</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+      <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+      <Name>Filtration.ObjectModel</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Filtration.ThemeEditor/Properties/AssemblyInfo.cs b/Filtration.ThemeEditor/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..677e08e
--- /dev/null
+++ b/Filtration.ThemeEditor/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filtration.ThemeEditor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Filtration.ThemeEditor")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7e4e2310-7f12-497e-a3ff-7ec7282ff8e9")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Filtration.sln b/Filtration.sln
index 1622944..7f0dec1 100644
--- a/Filtration.sln
+++ b/Filtration.sln
@@ -11,6 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ObjectModel", "F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ObjectModel.Tests", "Filtration.ObjectModel.Tests\Filtration.ObjectModel.Tests.csproj", "{537BE676-2FF6-4995-B05B-9CFACE852EC9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ThemeEditor", "Filtration.ThemeEditor\Filtration.ThemeEditor.csproj", "{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ThemeEditor.Tests", "Filtration.ThemeEditor.Tests\Filtration.ThemeEditor.Tests.csproj", "{450AC313-BF25-4BFD-A066-9F39F026FDCF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +37,14 @@ Global
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 60483fc..869a946 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -140,6 +140,7 @@
     <Compile Include="Translators\BlockGroupHierarchyBuilder.cs" />
     <Compile Include="Translators\ItemFilterBlockTranslator.cs" />
     <Compile Include="Translators\ItemFilterScriptTranslator.cs" />
+    <Compile Include="Translators\ThemeComponentListBuilder.cs" />
     <Compile Include="UserControls\AutoScrollingListBox.cs" />
     <Compile Include="UserControls\CrossButton.cs" />
     <Compile Include="UserControls\EditableListBoxControl.xaml.cs">
@@ -425,9 +426,7 @@
       <Name>Filtration.ObjectModel</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(XamlSpyInstallPath)MSBuild\FirstFloor.XamlSpy.WPF.targets" Condition="'$(XamlSpyInstallPath)' != '' and '$(Configuration)' == 'DEBUG'" />
   <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
diff --git a/Filtration/Translators/ItemFilterBlockTranslator.cs b/Filtration/Translators/ItemFilterBlockTranslator.cs
index b806286..7051405 100644
--- a/Filtration/Translators/ItemFilterBlockTranslator.cs
+++ b/Filtration/Translators/ItemFilterBlockTranslator.cs
@@ -22,12 +22,14 @@ namespace Filtration.Translators
     internal class ItemFilterBlockTranslator : IItemFilterBlockTranslator
     {
         private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder;
+        private readonly IThemeComponentListBuilder _themeComponentListBuilder;
         private const string Indent = "    ";
         private readonly string _newLine = Environment.NewLine + Indent;
 
-        public ItemFilterBlockTranslator(IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder)
+        public ItemFilterBlockTranslator(IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder, IThemeComponentListBuilder themeComponentListBuilder)
         {
             _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
+            _themeComponentListBuilder = themeComponentListBuilder;
         }
 
         // This method converts a string into a ItemFilterBlock. This is used for pasting ItemFilterBlocks 
@@ -257,13 +259,20 @@ namespace Filtration.Translators
             }
         }
 
-        private static void AddColorItemToBlockItems<T>(ItemFilterBlock block, string inputString) where T : ColorBlockItem
+        private void AddColorItemToBlockItems<T>(ItemFilterBlock block, string inputString) where T : ColorBlockItem
         {
             var blockItem = Activator.CreateInstance<T>();
             var result = Regex.Matches(inputString, @"([\w\s]*)[#]?(.*)");
 
             // When Theme support is added result[0].Groups[2].Value will contain the ColorGroup in the comment if it exists.
             blockItem.Color = GetColorFromString(result[0].Groups[1].Value);
+            
+            var componentName = result[0].Groups[2].Value.Trim();
+            if (!string.IsNullOrEmpty(componentName))
+            {
+               blockItem.ThemeComponent = _themeComponentListBuilder.AddComponent(typeof(T), componentName, blockItem.Color);
+            }
+
             block.BlockItems.Add(blockItem);
         }
 
diff --git a/Filtration/Translators/ItemFilterScriptTranslator.cs b/Filtration/Translators/ItemFilterScriptTranslator.cs
index db70070..80bfe9b 100644
--- a/Filtration/Translators/ItemFilterScriptTranslator.cs
+++ b/Filtration/Translators/ItemFilterScriptTranslator.cs
@@ -20,11 +20,15 @@ namespace Filtration.Translators
     {
         private readonly IItemFilterBlockTranslator _blockTranslator;
         private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder;
+        private readonly IThemeComponentListBuilder _themeComponentListBuilder;
 
-        public ItemFilterScriptTranslator(IItemFilterBlockTranslator blockTranslator, IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder)
+        public ItemFilterScriptTranslator(IItemFilterBlockTranslator blockTranslator,
+                                          IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder,
+                                          IThemeComponentListBuilder themeComponentListBuilder)
         {
             _blockTranslator = blockTranslator;
             _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
+            _themeComponentListBuilder = themeComponentListBuilder;
         }
 
         public ItemFilterScript TranslateStringToItemFilterScript(string inputString)
@@ -51,6 +55,8 @@ namespace Filtration.Translators
                 script.Description = script.Description.TrimEnd('\n').TrimEnd('\r');
             }
 
+            _themeComponentListBuilder.Initialise();
+
             // Extract each block from between boundaries and translate it into a ItemFilterBlock object
             // and add that object to the ItemFilterBlocks list 
             for (var boundary = conditionBoundaries.First; boundary != null; boundary = boundary.Next)
@@ -63,6 +69,8 @@ namespace Filtration.Translators
                 script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterBlock(blockString));
             }
 
+            script.ThemeComponents = _themeComponentListBuilder.GetComponents();
+
             return script;
         }
 
diff --git a/Filtration/Translators/ThemeComponentListBuilder.cs b/Filtration/Translators/ThemeComponentListBuilder.cs
new file mode 100644
index 0000000..13c884e
--- /dev/null
+++ b/Filtration/Translators/ThemeComponentListBuilder.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Media;
+using Filtration.ThemeEditor.Models;
+
+namespace Filtration.Translators
+{
+    internal interface IThemeComponentListBuilder
+    {
+        void Initialise();
+        ThemeComponent AddComponent(Type targetType, string componentName, Color componentColor);
+        List<ThemeComponent> GetComponents();
+    }
+
+    internal class ThemeComponentListBuilder : IThemeComponentListBuilder
+    {
+        private List<ThemeComponent> _themeComponents;
+
+        public ThemeComponentListBuilder()
+        {
+            _themeComponents = new List<ThemeComponent>();
+        }
+
+        public void Initialise()
+        {
+            _themeComponents = new List<ThemeComponent>();
+        }
+        
+        public ThemeComponent AddComponent(Type targetType, string componentName, Color componentColor)
+        {
+            if (ComponentExists(targetType, componentName))
+            {
+                return _themeComponents.FirstOrDefault(t => t.ComponentName == componentName && t.TargetType == targetType);
+            }
+
+            var component = new ThemeComponent(targetType, componentName, componentColor);
+            _themeComponents.Add(component);
+
+            return component;
+        }
+
+        public List<ThemeComponent> GetComponents()
+        {
+            return _themeComponents;
+        }
+
+        private bool ComponentExists(Type targetType, string componentName)
+        {
+            return _themeComponents.Exists(c => c.ComponentName == componentName && c.TargetType == targetType);
+        }
+    }
+}
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 655bfd7..bc4fcc9 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -101,14 +101,8 @@ namespace Filtration.ViewModels
             {
                 _itemFilterBlockViewModelsCollectionView =
                     CollectionViewSource.GetDefaultView(_itemFilterBlockViewModels);
-                if (BlockFilterPredicate != null)
-                {
-                    _itemFilterBlockViewModelsCollectionView.Filter = BlockFilter;
-                }
-                else
-                {
-                    _itemFilterBlockViewModelsCollectionView.Filter = null;
-                }
+                _itemFilterBlockViewModelsCollectionView.Filter = BlockFilter;
+                
                 return _itemFilterBlockViewModels;
             }
         }
@@ -116,7 +110,29 @@ namespace Filtration.ViewModels
         private bool BlockFilter(object item)
         {
             var blockViewModel = item as IItemFilterBlockViewModel;
-            return BlockFilterPredicate(blockViewModel);
+
+            if (BlockFilterPredicate != null)
+            {
+                return BlockFilterPredicate(blockViewModel) && ShowBlockBasedOnAdvanced(blockViewModel);
+            }
+
+            return ShowBlockBasedOnAdvanced(blockViewModel);
+        }
+
+        private bool ShowBlockBasedOnAdvanced(IItemFilterBlockViewModel blockViewModel)
+        {
+            if (ShowAdvanced)
+            {
+                return true;
+            }
+
+            if (blockViewModel.Block.BlockGroup == null)
+            {
+                return true;
+            }
+
+            return !blockViewModel.Block.BlockGroup.Advanced;
+
         }
 
         public Predicate<IItemFilterBlockViewModel> BlockFilterPredicate
@@ -157,6 +173,7 @@ namespace Filtration.ViewModels
             {
                 _showAdvanced = value;
                 RaisePropertyChanged();
+                RaisePropertyChanged("ItemFilterBlockViewModels");
             }
         }
 
diff --git a/Filtration/ViewModels/SettingsWindowViewModel.cs b/Filtration/ViewModels/SettingsWindowViewModel.cs
index 0e4eb26..82f85fd 100644
--- a/Filtration/ViewModels/SettingsWindowViewModel.cs
+++ b/Filtration/ViewModels/SettingsWindowViewModel.cs
@@ -54,7 +54,7 @@ namespace Filtration.ViewModels
                     OnRequestClose(this, new EventArgs());
                 }
             }
-            catch (DirectoryNotFoundException e)
+            catch (DirectoryNotFoundException)
             {
                 MessageBox.Show("The entered Default Filter Directory is invalid or does not exist.", "Error",
                     MessageBoxButton.OK, MessageBoxImage.Exclamation);
diff --git a/Filtration/WindsorInstallers/TranslatorsInstaller.cs b/Filtration/WindsorInstallers/TranslatorsInstaller.cs
index 549b9b5..2736bec 100644
--- a/Filtration/WindsorInstallers/TranslatorsInstaller.cs
+++ b/Filtration/WindsorInstallers/TranslatorsInstaller.cs
@@ -23,6 +23,11 @@ namespace Filtration.WindsorInstallers
                 Component.For<IBlockGroupHierarchyBuilder>()
                     .ImplementedBy<BlockGroupHierarchyBuilder>()
                     .LifeStyle.Singleton);
+
+            container.Register(
+                Component.For<IThemeComponentListBuilder>()
+                    .ImplementedBy<ThemeComponentListBuilder>()
+                    .LifeStyle.Singleton);
         }
     }
 }