diff --git a/Filtration/Converters/BooleanInverterConverter.cs b/Filtration.Common/Converters/BooleanInverterConverter.cs
similarity index 94%
rename from Filtration/Converters/BooleanInverterConverter.cs
rename to Filtration.Common/Converters/BooleanInverterConverter.cs
index 2794068..31ea68e 100644
--- a/Filtration/Converters/BooleanInverterConverter.cs
+++ b/Filtration.Common/Converters/BooleanInverterConverter.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace Filtration.Converters
+namespace Filtration.Common.Converters
 {
     internal class BoolInverterConverter : IValueConverter
     {
diff --git a/Filtration/Converters/ColorToSolidColorBrushConverter.cs b/Filtration.Common/Converters/ColorToSolidColorBrushConverter.cs
similarity index 94%
rename from Filtration/Converters/ColorToSolidColorBrushConverter.cs
rename to Filtration.Common/Converters/ColorToSolidColorBrushConverter.cs
index 2a1a324..36701e1 100644
--- a/Filtration/Converters/ColorToSolidColorBrushConverter.cs
+++ b/Filtration.Common/Converters/ColorToSolidColorBrushConverter.cs
@@ -2,7 +2,7 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace Filtration.Converters
+namespace Filtration.Common.Converters
 {
     public class ColorToSolidColorBrushConverter : IValueConverter
     {
diff --git a/Filtration/Converters/InverseBooleanVisibilityConverter.cs b/Filtration.Common/Converters/InverseBooleanVisibilityConverter.cs
similarity index 96%
rename from Filtration/Converters/InverseBooleanVisibilityConverter.cs
rename to Filtration.Common/Converters/InverseBooleanVisibilityConverter.cs
index 0c4e991..ccaa812 100644
--- a/Filtration/Converters/InverseBooleanVisibilityConverter.cs
+++ b/Filtration.Common/Converters/InverseBooleanVisibilityConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace Filtration.Converters
+namespace Filtration.Common.Converters
 {
     internal class InverseBooleanVisibilityConverter : IValueConverter
     {
diff --git a/Filtration/Converters/StringToVisibilityConverter.cs b/Filtration.Common/Converters/StringToVisibilityConverter.cs
similarity index 94%
rename from Filtration/Converters/StringToVisibilityConverter.cs
rename to Filtration.Common/Converters/StringToVisibilityConverter.cs
index 48683fb..75172c7 100644
--- a/Filtration/Converters/StringToVisibilityConverter.cs
+++ b/Filtration.Common/Converters/StringToVisibilityConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace Filtration.Converters
+namespace Filtration.Common.Converters
 {
     internal class StringToVisibilityConverter : IValueConverter
     {
diff --git a/Filtration.Common/Filtration.Common.csproj b/Filtration.Common/Filtration.Common.csproj
index fad75f1..9aa6841 100644
--- a/Filtration.Common/Filtration.Common.csproj
+++ b/Filtration.Common/Filtration.Common.csproj
@@ -64,7 +64,12 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Converters\BooleanInverterConverter.cs" />
     <Compile Include="Converters\BooleanVisibilityConverter.cs" />
+    <Compile Include="Converters\ColorToSolidColorBrushConverter.cs" />
+    <Compile Include="Converters\InverseBooleanVisibilityConverter.cs" />
+    <Compile Include="Converters\StringToVisibilityConverter.cs" />
+    <Compile Include="Messages\ThemeClosedMessage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\FileSystemService.cs" />
     <Compile Include="Services\MessageBoxService.cs" />
@@ -81,6 +86,12 @@
       <Name>Filtration.ObjectModel</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="Styles\SharedResourcesDictionary.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </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.Common/Messages/ThemeClosedMessage.cs b/Filtration.Common/Messages/ThemeClosedMessage.cs
new file mode 100644
index 0000000..c2cc66c
--- /dev/null
+++ b/Filtration.Common/Messages/ThemeClosedMessage.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Filtration.Common.Messages
+{
+    class ThemeClosedMessage
+    {
+    }
+}
diff --git a/Filtration/Views/SharedResourcesDictionary.xaml b/Filtration.Common/Styles/SharedResourcesDictionary.xaml
similarity index 71%
rename from Filtration/Views/SharedResourcesDictionary.xaml
rename to Filtration.Common/Styles/SharedResourcesDictionary.xaml
index 3a9c778..f748b13 100644
--- a/Filtration/Views/SharedResourcesDictionary.xaml
+++ b/Filtration.Common/Styles/SharedResourcesDictionary.xaml
@@ -1,9 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Filtration.Converters"
-                    xmlns:commonConverters="clr-namespace:Filtration.Common.Converters;assembly=Filtration.Common"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:converters="clr-namespace:Filtration.Common.Converters"
                     mc:Ignorable="d" >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
@@ -32,18 +31,19 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            <converters:IntToItemRarityConverter x:Key="IntToItemRarityConverter" />
+            <Style TargetType="{x:Type Border}" x:Key="BlockItemBorder">
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderBrush" Value="Black" />
+                <Setter Property="CornerRadius" Value="3" />
+                <Setter Property="Margin" Value="0,0,5,5" />
+            </Style>
             <converters:StringToVisibilityConverter x:Key="StringToVisibilityConverter" />
             <converters:BoolInverterConverter x:Key="BoolInverterConverter" />
             <converters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-            <converters:BooleanToBlockActionConverter x:Key="BooleanToBlockActionConverter" />
-            <converters:BooleanToBlockActionInverseConverter x:Key="BooleanToBlockActionInverseConverter" />
-            <converters:BlockItemTypeToStringConverter x:Key="BlockItemTypeToStringConverter" />
-            <commonConverters:BooleanVisibilityConverter x:Key="BooleanVisibilityConverter" />
+            <converters:BooleanVisibilityConverter x:Key="BooleanVisibilityConverter" />
             <converters:InverseBooleanVisibilityConverter x:Key="InverseBooleanVisibilityConverter" />
-            <converters:BlockItemToRemoveEnabledVisibilityConverter x:Key="BlockItemToRemoveEnabledVisibilityConverter" />
-            <converters:AvailableThemeComponentsConverter x:Key="AvailableThemeComponentsConverter" />
+            
+            
         </ResourceDictionary>
-        <ResourceDictionary Source="ExpanderStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs b/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
index 264a599..37c9829 100644
--- a/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
+++ b/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
@@ -19,17 +19,17 @@ namespace Filtration.ThemeEditor.Converters
 
             switch (type.GetAttributeDescription())
             {
-                case "TextColor":
+                case "Text":
                 {
-                    return "Text";
+                    return "Text Color Theme Components";
                 }
-                case "BorderColor":
+                case "Border":
                 {
-                    return "Border";
+                    return "Border Color Theme Components";
                 }
-                case "BackgroundColor":
+                case "Background":
                 {
-                    return "Background";
+                    return "Background Color Theme Components";
                 }
             }
 
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
index 53598ec..f783894 100644
--- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -95,6 +95,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\ThemeComponentTypeToStringConverter.cs" />
+    <Compile Include="Messages\ThemeClosedMessage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Providers\ThemeProvider.cs" />
     <Compile Include="Services\ThemePersistenceService.cs" />
diff --git a/Filtration.ThemeEditor/Messages/ThemeClosedMessage.cs b/Filtration.ThemeEditor/Messages/ThemeClosedMessage.cs
new file mode 100644
index 0000000..3df5f42
--- /dev/null
+++ b/Filtration.ThemeEditor/Messages/ThemeClosedMessage.cs
@@ -0,0 +1,9 @@
+using Filtration.ThemeEditor.ViewModels;
+
+namespace Filtration.ThemeEditor.Messages
+{
+    public class ThemeClosedMessage
+    {
+        public IThemeEditorViewModel ClosedViewModel { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/Providers/ThemeProvider.cs b/Filtration.ThemeEditor/Providers/ThemeProvider.cs
index 712baba..0a0afde 100644
--- a/Filtration.ThemeEditor/Providers/ThemeProvider.cs
+++ b/Filtration.ThemeEditor/Providers/ThemeProvider.cs
@@ -39,7 +39,7 @@ namespace Filtration.ThemeEditor.Providers
                 });
                 
             var themeViewModel = _themeViewModelFactory.Create();
-            themeViewModel.Initialise(themeComponentCollection, true);
+            themeViewModel.InitialiseForNewTheme(themeComponentCollection);
             themeViewModel.FilePath = "Untitled.filtertheme";
 
             return themeViewModel;
@@ -48,7 +48,7 @@ namespace Filtration.ThemeEditor.Providers
         public IThemeEditorViewModel MasterThemeForScript(ItemFilterScript script)
         {
             var themeViewModel = _themeViewModelFactory.Create();
-            themeViewModel.Initialise(script.ThemeComponents, true);
+            themeViewModel.InitialiseForMasterTheme(script);
             themeViewModel.FilePath = "<Master Theme> " + Path.GetFileName(script.FilePath);
 
             return themeViewModel;
diff --git a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
index 21f9f2c..2c986b0 100644
--- a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
+++ b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
@@ -7,10 +7,13 @@ using System.Windows.Media.Imaging;
 using Filtration.Common.Services;
 using Filtration.Common.ViewModels;
 using Filtration.Interface;
+using Filtration.ObjectModel;
 using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.ThemeEditor;
+using Filtration.ThemeEditor.Messages;
 using Filtration.ThemeEditor.Providers;
 using GalaSoft.MvvmLight.CommandWpf;
+using GalaSoft.MvvmLight.Messaging;
 using NLog;
 
 namespace Filtration.ThemeEditor.ViewModels
@@ -19,9 +22,12 @@ namespace Filtration.ThemeEditor.ViewModels
     {
         RelayCommand<ThemeComponentType> AddThemeComponentCommand { get; }
         RelayCommand<ThemeComponent> DeleteThemeComponentCommand { get; }
+        RelayCommand CloseCommand { get; }
 
-        void Initialise(ThemeComponentCollection themeComponentCollection, bool newTheme);
-        bool EditEnabled { get; }
+        void InitialiseForNewTheme(ThemeComponentCollection themeComponentCollection);
+        void InitialiseForMasterTheme(ItemFilterScript script);
+        bool IsMasterTheme { get; }
+        ItemFilterScript IsMasterThemeForScript { get; }
         string Title { get; }
         string FilePath { get; set; }
         string Filename { get; }
@@ -46,29 +52,42 @@ namespace Filtration.ThemeEditor.ViewModels
             _themeProvider = themeProvider;
             _messageBoxService = messageBoxService;
 
-            AddThemeComponentCommand = new RelayCommand<ThemeComponentType>(OnAddThemeComponentCommand, t => EditEnabled);
+            AddThemeComponentCommand = new RelayCommand<ThemeComponentType>(OnAddThemeComponentCommand, t => IsMasterTheme);
             DeleteThemeComponentCommand = new RelayCommand<ThemeComponent>(OnDeleteThemeComponentCommand,
-                t => EditEnabled && SelectedThemeComponent != null);
+                t => IsMasterTheme && SelectedThemeComponent != null);
+            CloseCommand = new RelayCommand(OnCloseCommand);
 
             var icon = new BitmapImage();
             icon.BeginInit();
             icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/Theme.ico");
             icon.EndInit();
             IconSource = icon;
+            
         }
 
         public RelayCommand<ThemeComponentType> AddThemeComponentCommand { get; private set; }
         public RelayCommand<ThemeComponent> DeleteThemeComponentCommand { get; private set; }
+        public RelayCommand CloseCommand { get; private set; }
 
-        public bool EditEnabled
+        public bool IsMasterTheme
         {
             get { return Components.IsMasterCollection; }
         }
 
-        public void Initialise(ThemeComponentCollection themeComponentCollection, bool newTheme)
+        public ItemFilterScript IsMasterThemeForScript { get; private set; }
+
+        public void InitialiseForNewTheme(ThemeComponentCollection themeComponentCollection)
         {
             Components = themeComponentCollection;
-            _filenameIsFake = newTheme;
+            _filenameIsFake = true;
+        }
+
+        public void InitialiseForMasterTheme(ItemFilterScript script)
+        {
+            Components = script.ThemeComponents;
+            IsMasterThemeForScript = script;
+            _filenameIsFake = true;
+
         }
 
         public bool IsScript { get { return false; } }
@@ -106,6 +125,8 @@ namespace Filtration.ThemeEditor.ViewModels
 
         public void Save()
         {
+            if (IsMasterTheme) return;
+
             if (_filenameIsFake)
             {
                 SaveAs();
@@ -130,6 +151,8 @@ namespace Filtration.ThemeEditor.ViewModels
 
         public void SaveAs()
         {
+            if (IsMasterTheme) return;
+
             var saveDialog = new SaveFileDialog
             {
                 DefaultExt = ".filter",
@@ -161,11 +184,16 @@ namespace Filtration.ThemeEditor.ViewModels
             }
         }
 
-        public void Close()
+        public void OnCloseCommand()
         {
-            throw new NotImplementedException();
+            Close();
         }
 
+        public void Close()
+        {
+            Messenger.Default.Send(new ThemeClosedMessage { ClosedViewModel = this });
+        }
+        
         private void OnAddThemeComponentCommand(ThemeComponentType themeComponentType)
         {
             Components.Add(new ThemeComponent(themeComponentType, "Untitled Component",
diff --git a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
index 18c9b9c..76a7a5c 100644
--- a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
@@ -4,15 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             xmlns:converters="clr-namespace:Filtration.ThemeEditor.Converters"
              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"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=themeEditor:ThemeComponent}"
-             d:DesignHeight="40" d:DesignWidth="200">
+             d:DesignHeight="100" d:DesignWidth="200">
     <UserControl.Resources>
-        <converters:ThemeComponentTypeToStringConverter x:Key="ThemeComponentTypeToStringConverter" />
         <commonConverters:BooleanVisibilityConverter x:Key="BooleanVisibilityConverter" />
     </UserControl.Resources>
     <Grid Width="200">
@@ -53,17 +51,17 @@
             <ContentControl.Style>
                 <Style TargetType="ContentControl">
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}}" Value="true">
+                        <DataTrigger Binding="{Binding Path=DataContext.IsMasterTheme, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}}" Value="true">
                             <Setter Property="ContentTemplate" Value="{StaticResource EditableComponentNameTemplate}" />
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}}" Value="false">
+                        <DataTrigger Binding="{Binding Path=DataContext.IsMasterTheme, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}}" Value="false">
                             <Setter Property="ContentTemplate" Value="{StaticResource ViewOnlyComponentNameTemplate}" />
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </ContentControl.Style>
         </ContentControl>
-        
+
         <xctk:ColorPicker Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"  SelectedColor="{Binding Color}" />
     </Grid>
 </UserControl>
diff --git a/Filtration.ThemeEditor/Views/ThemeEditorView.xaml b/Filtration.ThemeEditor/Views/ThemeEditorView.xaml
index f61494b..911a1e0 100644
--- a/Filtration.ThemeEditor/Views/ThemeEditorView.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeEditorView.xaml
@@ -6,24 +6,33 @@
              xmlns:viewModels="clr-namespace:Filtration.ThemeEditor.ViewModels"
              xmlns:views="clr-namespace:Filtration.ThemeEditor.Views"
              xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
+             xmlns:converters="clr-namespace:Filtration.ThemeEditor.Converters"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=viewModels:ThemeEditorViewModel}"
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
-        <CollectionViewSource Source="{Binding Components}" x:Key="ComponentsViewSource">
-            <CollectionViewSource.GroupDescriptions>
-                <PropertyGroupDescription PropertyName="ComponentType" />
-            </CollectionViewSource.GroupDescriptions>
-            <CollectionViewSource.SortDescriptions>
-                <componentModel:SortDescription PropertyName="ComponentType" />
-            </CollectionViewSource.SortDescriptions>
-        </CollectionViewSource>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <CollectionViewSource Source="{Binding Components}" x:Key="ComponentsViewSource">
+                        <CollectionViewSource.GroupDescriptions>
+                            <PropertyGroupDescription PropertyName="ComponentType" />
+                        </CollectionViewSource.GroupDescriptions>
+                        <CollectionViewSource.SortDescriptions>
+                            <componentModel:SortDescription PropertyName="ComponentType" />
+                        </CollectionViewSource.SortDescriptions>
+                    </CollectionViewSource>
+                    <converters:ThemeComponentTypeToStringConverter x:Key="ThemeComponentTypeToStringConverter" />
+                </ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Filtration.Common;component/Styles/SharedResourcesDictionary.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <Grid Margin="10">
         <ScrollViewer HorizontalScrollBarVisibility="Disabled">
             <ListView ItemsSource="{Binding Source={StaticResource ComponentsViewSource}}"
                       SelectedItem="{Binding SelectedThemeComponent}"
-                      Margin="10"
+                      Margin="5"
                       ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListView.Resources>
                     <Style TargetType="ListViewItem">
@@ -53,7 +62,7 @@
                     <GroupStyle>
                         <GroupStyle.HeaderTemplate>
                             <DataTemplate>
-                                <TextBlock FontWeight="Bold" FontSize="15" Text="{Binding Path=Name}"/>
+                                <TextBlock FontWeight="Bold" FontSize="15" Text="{Binding Path=Name, Converter={StaticResource ThemeComponentTypeToStringConverter}}"/>
                             </DataTemplate>
                         </GroupStyle.HeaderTemplate>
                     </GroupStyle>
diff --git a/Filtration/App.xaml b/Filtration/App.xaml
index d18e923..d5c8844 100644
--- a/Filtration/App.xaml
+++ b/Filtration/App.xaml
@@ -1,10 +1,13 @@
 <Application x:Class="Filtration.App" 
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:converters="clr-namespace:Filtration.Converters"
              Startup="Application_Startup">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Filtration.Common;component/Styles/SharedResourcesDictionary.xaml" />
+                
                 <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/windows8/silver.xaml" />
                 <ResourceDictionary Source="Views/Styles/Colours.xaml" />
@@ -24,6 +27,7 @@
 
                 <ResourceDictionary Source="Views/CrossButton.xaml" />
                 <ResourceDictionary Source="Views/IconsDictionary.xaml" />
+                <ResourceDictionary Source="Views/ExpanderStyle.xaml" />
 
                 <ResourceDictionary>
                     <Style TargetType="ComboBox" BasedOn="{StaticResource MetroComboBox}" />
@@ -31,6 +35,14 @@
                     <Style TargetType="ScrollBar" BasedOn="{StaticResource MetroScrollBar}" />
                     <Style TargetType="TextBox" BasedOn="{StaticResource MetroTextBox}" />
                 </ResourceDictionary>
+                <ResourceDictionary>
+                    <converters:BlockItemToRemoveEnabledVisibilityConverter x:Key="BlockItemToRemoveEnabledVisibilityConverter" />
+                    <converters:IntToItemRarityConverter x:Key="IntToItemRarityConverter" />
+                    <converters:BooleanToBlockActionConverter x:Key="BooleanToBlockActionConverter" />
+                    <converters:BlockItemTypeToStringConverter x:Key="BlockItemTypeToStringConverter" />
+                    <converters:BooleanToBlockActionInverseConverter x:Key="BooleanToBlockActionInverseConverter" />
+                    <converters:AvailableThemeComponentsConverter x:Key="AvailableThemeComponentsConverter" />
+                </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index d2ce8ed..d7eadc4 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -134,15 +134,11 @@
     <Compile Include="Converters\BlockGroupAdvancedColorConverter.cs" />
     <Compile Include="Converters\BlockGroupVisibilityConverter.cs" />
     <Compile Include="Converters\BlockItemTypeToStringConverter.cs" />
-    <Compile Include="Converters\BooleanInverterConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
     <Compile Include="Converters\BlockItemToRemoveEnabledVisibilityConverter.cs" />
-    <Compile Include="Converters\ColorToSolidColorBrushConverter.cs" />
     <Compile Include="Converters\HashSignRemovalConverter.cs" />
     <Compile Include="Converters\ItemRarityConverter.cs" />
-    <Compile Include="Converters\InverseBooleanVisibilityConverter.cs" />
-    <Compile Include="Converters\StringToVisibilityConverter.cs" />
     <Compile Include="Converters\TreeViewMarginConverter.cs" />
     <Compile Include="Extensions\EnumerationExtension.cs" />
     <Compile Include="Extensions\HyperlinkExtensions.cs" />
@@ -309,10 +305,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\SharedResourcesDictionary.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\ItemFilterScriptView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml
index e93794a..3fff9d1 100644
--- a/Filtration/UserControls/BlockItemControl.xaml
+++ b/Filtration/UserControls/BlockItemControl.xaml
@@ -13,21 +13,6 @@
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=userControls:BlockItemControl}"
              d:DesignHeight="200" d:DesignWidth="150">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary>
-                    <Style TargetType="{x:Type Border}" x:Key="BlockItemBorder">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="BorderBrush" Value="Black" />
-                        <Setter Property="CornerRadius" Value="3" />
-                        <Setter Property="Margin" Value="0,0,5,5" />
-                    </Style>
-                </ResourceDictionary>
-                <ResourceDictionary Source="../Views/SharedResourcesDictionary.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
     <Border Style="{StaticResource BlockItemBorder}" Width="142">
         <Grid>
             <Grid.RowDefinitions>
diff --git a/Filtration/UserControls/ItemPreviewControl.xaml b/Filtration/UserControls/ItemPreviewControl.xaml
index 8080fad..f9232fe 100644
--- a/Filtration/UserControls/ItemPreviewControl.xaml
+++ b/Filtration/UserControls/ItemPreviewControl.xaml
@@ -7,9 +7,6 @@
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=userControls:ItemPreviewControl}"
              d:DesignHeight="35" d:DesignWidth="170">
-    <UserControl.Resources>
-        <ResourceDictionary Source="../Views/SharedResourcesDictionary.xaml" />
-    </UserControl.Resources>
     <Border BorderBrush="Black" BorderThickness="1">
         <Grid Width="166" Height="39">
             <Image Source="pack://application:,,,/resources/groundtile.png" Stretch="Fill" />
diff --git a/Filtration/UserControls/ThemeComponentSelectionControl.xaml b/Filtration/UserControls/ThemeComponentSelectionControl.xaml
index 377926c..19d17ab 100644
--- a/Filtration/UserControls/ThemeComponentSelectionControl.xaml
+++ b/Filtration/UserControls/ThemeComponentSelectionControl.xaml
@@ -11,8 +11,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\Views\SharedResourcesDictionary.xaml" />
-                <ResourceDictionary></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Filtration.Common;component/Styles/SharedResourcesDictionary.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
diff --git a/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs b/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs
index 59f200c..0d14185 100644
--- a/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs
+++ b/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using Filtration.Common.ViewModels;
 using Filtration.Interface;
 using Filtration.ThemeEditor.ViewModels;
@@ -22,6 +23,7 @@ namespace Filtration.ViewModels
         void AddDocument(IDocument document);
         void CloseDocument(IDocument document);
         void SwitchActiveDocument(IDocument document);
+        IThemeEditorViewModel OpenMasterThemeForScript(IItemFilterScriptViewModel scriptViewModel);
     }
 
     internal class AvalonDockWorkspaceViewModel : FiltrationViewModelBase, IAvalonDockWorkspaceViewModel
@@ -180,5 +182,19 @@ namespace Filtration.ViewModels
             
             ActiveDocument = document;
         }
+
+        public IThemeEditorViewModel OpenMasterThemeForScript(IItemFilterScriptViewModel scriptViewModel)
+        {
+            var existingMasterThemeViewModelCount =
+                OpenDocuments.OfType<IThemeEditorViewModel>()
+                    .Count(c => c.IsMasterThemeForScript == scriptViewModel.Script);
+            if (existingMasterThemeViewModelCount > 0)
+            {
+                return OpenDocuments.OfType<IThemeEditorViewModel>()
+                    .First(c => c.IsMasterThemeForScript == scriptViewModel.Script);
+            }
+
+            return null;
+        }
     }
 }
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 7d8d58d..e1a894d 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -14,7 +14,6 @@ using Filtration.Common.ViewModels;
 using Filtration.Interface;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.ObjectModel.ThemeEditor;
 using Filtration.Services;
 using Filtration.Translators;
 using GalaSoft.MvvmLight.CommandWpf;
@@ -493,6 +492,13 @@ namespace Filtration.ViewModels
         
         private void CloseScript()
         {
+            var openMasterThemForScript =
+                _avalonDockWorkspaceViewModel.OpenMasterThemeForScript(this);
+            if (openMasterThemForScript != null)
+            {
+                _avalonDockWorkspaceViewModel.CloseDocument(openMasterThemForScript);
+            }
+
             _avalonDockWorkspaceViewModel.ActiveDocumentChanged -= OnActiveDocumentChanged;
             _avalonDockWorkspaceViewModel.CloseDocument(this);
         }
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index fd67b19..aaa4413 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -15,6 +15,7 @@ using Filtration.ObjectModel.ThemeEditor;
 using Filtration.Properties;
 using Filtration.Repositories;
 using Filtration.Services;
+using Filtration.ThemeEditor.Messages;
 using Filtration.ThemeEditor.Providers;
 using Filtration.ThemeEditor.Services;
 using Filtration.ThemeEditor.ViewModels;
@@ -128,6 +129,12 @@ namespace Filtration.ViewModels
             icon.EndInit();
             Icon = icon;
 
+            Messenger.Default.Register<ThemeClosedMessage>(this, message =>
+            {
+                if (message.ClosedViewModel == null) return;
+                AvalonDockWorkspaceViewModel.CloseDocument(message.ClosedViewModel);
+            });
+
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
                 switch (message.Notification)
@@ -294,24 +301,14 @@ namespace Filtration.ViewModels
             }
         }
 
-        //public bool ActiveDocumentIsScript
-        //{
-        //    get { return AvalonDockWorkspaceViewModel.ActiveDocument is ItemFilterScriptViewModel; }
-        //}
-
         public bool ActiveScriptHasSelectedBlock
         {
             get { return AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModel != null; }
         }
-
-        //public bool ActiveDocumentIsTheme
-        //{
-        //    get { return AvalonDockWorkspaceViewModel.ActiveDocument is ThemeEditorViewModel; }
-        //}
-
+        
         public bool ActiveThemeIsEditable
         {
-            get { return AvalonDockWorkspaceViewModel.ActiveThemeViewModel.EditEnabled; }
+            get { return AvalonDockWorkspaceViewModel.ActiveThemeViewModel.IsMasterTheme; }
         }
 
         private bool ActiveDocumentIsEditable()
@@ -335,9 +332,19 @@ namespace Filtration.ViewModels
 
         private void OnEditMasterThemeCommand()
         {
-            var themeViewModel =
-                _themeProvider.MasterThemeForScript(AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script);
-            OpenTheme(themeViewModel);
+            var openMasterThemForScript =
+                AvalonDockWorkspaceViewModel.OpenMasterThemeForScript(AvalonDockWorkspaceViewModel.ActiveScriptViewModel);
+
+            if (openMasterThemForScript != null)
+            {
+                AvalonDockWorkspaceViewModel.SwitchActiveDocument(openMasterThemForScript);
+            }
+            else
+            {
+                var themeViewModel =
+                    _themeProvider.MasterThemeForScript(AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script);
+                OpenTheme(themeViewModel);
+            }
         }
         
         private void OpenTheme(IThemeEditorViewModel themeEditorViewModel)
diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml
index bafb426..f40dc24 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml
+++ b/Filtration/Views/ItemFilterBlockView.xaml
@@ -15,7 +15,6 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="SharedResourcesDictionary.xaml" />
                 <ResourceDictionary>
                     <views:BindingProxy x:Key="proxy" Data="{Binding}" />
                     <converters:BlockGroupAdvancedFillColorConverter x:Key="BlockGroupAdvancedFillColorConverter" />
diff --git a/Filtration/Views/ReplaceColorsWindow.xaml b/Filtration/Views/ReplaceColorsWindow.xaml
index 918f707..7a06e44 100644
--- a/Filtration/Views/ReplaceColorsWindow.xaml
+++ b/Filtration/Views/ReplaceColorsWindow.xaml
@@ -11,14 +11,6 @@
         Title="Replace Script Colors" Height="280" Width="540"
         BorderThickness="1" BorderBrush="Black"
         Loaded="ReplaceColorsWindow_OnLoaded" ResizeMode="CanMinimize">
-    <!--ShowMaxRestoreButton="False"-->
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="SharedResourcesDictionary.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"></RowDefinition>