diff --git a/BrightSharp.Ui.Tests/App.xaml b/BrightSharp.Ui.Tests/App.xaml
index 9b82342..ae7600d 100644
--- a/BrightSharp.Ui.Tests/App.xaml
+++ b/BrightSharp.Ui.Tests/App.xaml
@@ -5,7 +5,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/brightsharp;component/generic.xaml" />
+                <ResourceDictionary Source="/brightsharp;component/themes/theme.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/BrightSharp.Ui.Tests/MainWindow.xaml.cs b/BrightSharp.Ui.Tests/MainWindow.xaml.cs
index 8055a41..9b61e86 100644
--- a/BrightSharp.Ui.Tests/MainWindow.xaml.cs
+++ b/BrightSharp.Ui.Tests/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using BrightSharp.Diagrams;
+using BrightSharp.Themes;
 using System;
 using System.Text.RegularExpressions;
 using System.Windows;
diff --git a/BrightSharp/BrightSharp.csproj b/BrightSharp/BrightSharp.csproj
index 9d17933..57fc3f9 100644
--- a/BrightSharp/BrightSharp.csproj
+++ b/BrightSharp/BrightSharp.csproj
@@ -55,6 +55,7 @@
     <Compile Include="Behaviors\SelectAllTextOnFocusBehavior.cs" />
     <Compile Include="Commands\AsyncCommand.cs" />
     <Compile Include="Commands\RelayCommand.cs" />
+    <Compile Include="Controls\PropertyGrid.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
     <Compile Include="Diagrams\Adorners\ResizeRotateAdorner.cs" />
     <Compile Include="Diagrams\Adorners\ResizeRotateChrome.cs" />
@@ -67,45 +68,57 @@
     <Compile Include="Diagrams\Thumbs\ResizeThumb.cs" />
     <Compile Include="Diagrams\Thumbs\RotateThumb.cs" />
     <Compile Include="Extensions\WpfExtensions.cs" />
-    <Compile Include="ThemeManager.cs" />
-    <Compile Include="ZoomControl.cs">
+    <Compile Include="Themes\ThemeManager.cs" />
+    <Compile Include="Diagrams\ZoomControl.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Generic.xaml">
+    <Page Include="Themes\Controls\PropertyGrid.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Controls\ZoomControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Compile Include="Converters\ThicknessConverter.cs" />
     <Compile Include="Extensions\MarkupExtensionProperties.cs" />
-    <Compile Include="Generic.cs" />
-    <Page Include="Diagrams\Resources\DesignerItem.xaml">
+    <Compile Include="Themes\Theme.cs" />
+    <Page Include="Themes\Diagrams\DesignerItem.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Diagrams\Resources\ResizeRotateChrome.xaml">
+    <Page Include="Themes\Diagrams\ResizeRotateChrome.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Diagrams\Resources\SizeChrome.xaml">
+    <Page Include="Themes\Diagrams\SizeChrome.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Style.Blue.xaml">
+    <Page Include="Themes\Style.Blue.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Style.DarkBlue.xaml">
+    <Page Include="Themes\Style.DarkBlue.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Style.Silver.xaml">
+    <Page Include="Themes\Style.Silver.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Style.DevLab.xaml">
+    <Page Include="Themes\Style.DevLab.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\Theme.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -132,14 +145,15 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="icons\app.png" />
+    <Resource Include="Themes\icons\app.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="icons\copy.png" />
-    <Resource Include="icons\cut.png" />
-    <Resource Include="icons\paste.png" />
-    <Resource Include="icons\undo.png" />
+    <Resource Include="Themes\icons\copy.png" />
+    <Resource Include="Themes\icons\cut.png" />
+    <Resource Include="Themes\icons\paste.png" />
+    <Resource Include="Themes\icons\undo.png" />
   </ItemGroup>
+  <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/BrightSharp/Controls/PropertyGrid.cs b/BrightSharp/Controls/PropertyGrid.cs
new file mode 100644
index 0000000..9181b4a
--- /dev/null
+++ b/BrightSharp/Controls/PropertyGrid.cs
@@ -0,0 +1,53 @@
+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 BrightSharp.Controls
+{
+    /// <summary>
+    /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file.
+    ///
+    /// Step 1a) Using this custom control in a XAML file that exists in the current project.
+    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
+    /// to be used:
+    ///
+    ///     xmlns:MyNamespace="clr-namespace:BrightSharp.Controls"
+    ///
+    ///
+    /// Step 1b) Using this custom control in a XAML file that exists in a different project.
+    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
+    /// to be used:
+    ///
+    ///     xmlns:MyNamespace="clr-namespace:BrightSharp.Controls;assembly=BrightSharp.Controls"
+    ///
+    /// You will also need to add a project reference from the project where the XAML file lives
+    /// to this project and Rebuild to avoid compilation errors:
+    ///
+    ///     Right click on the target project in the Solution Explorer and
+    ///     "Add Reference"->"Projects"->[Browse to and select this project]
+    ///
+    ///
+    /// Step 2)
+    /// Go ahead and use your control in the XAML file.
+    ///
+    ///     <MyNamespace:PropertyGrid/>
+    ///
+    /// </summary>
+    public class PropertyGrid : Control
+    {
+        static PropertyGrid() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(PropertyGrid), new FrameworkPropertyMetadata(typeof(PropertyGrid)));
+        }
+    }
+}
diff --git a/BrightSharp/ZoomControl.cs b/BrightSharp/Diagrams/ZoomControl.cs
similarity index 100%
rename from BrightSharp/ZoomControl.cs
rename to BrightSharp/Diagrams/ZoomControl.cs
diff --git a/BrightSharp/Themes/Controls/PropertyGrid.xaml b/BrightSharp/Themes/Controls/PropertyGrid.xaml
new file mode 100644
index 0000000..4e70101
--- /dev/null
+++ b/BrightSharp/Themes/Controls/PropertyGrid.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:BrightSharp.Controls">
+
+
+    <Style TargetType="{x:Type local:PropertyGrid}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:PropertyGrid}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BrightSharp/Themes/Controls/ZoomControl.xaml b/BrightSharp/Themes/Controls/ZoomControl.xaml
new file mode 100644
index 0000000..991346d
--- /dev/null
+++ b/BrightSharp/Themes/Controls/ZoomControl.xaml
@@ -0,0 +1,38 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:diag="clr-namespace:BrightSharp.Diagrams">
+
+    <Style TargetType="{x:Type diag:ZoomControl}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="ClipToBounds" Value="True" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <Canvas Background="Transparent" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type diag:ZoomControl}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}">
+                        <Grid>
+                            <ItemsPresenter>
+                                <ItemsPresenter.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform ScaleX="{Binding RenderZoom, RelativeSource={RelativeSource TemplatedParent}}" 
+                                                        ScaleY="{Binding ScaleX, RelativeSource={RelativeSource Self}}" />
+                                        <TranslateTransform X="{Binding TranslateX, RelativeSource={RelativeSource TemplatedParent}}" 
+                                                            Y="{Binding TranslateY, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </TransformGroup>
+                                </ItemsPresenter.RenderTransform>
+                            </ItemsPresenter>
+                            <Border x:Name="PART_SelectionBorder" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BrightSharp/Diagrams/Resources/DesignerItem.xaml b/BrightSharp/Themes/Diagrams/DesignerItem.xaml
similarity index 100%
rename from BrightSharp/Diagrams/Resources/DesignerItem.xaml
rename to BrightSharp/Themes/Diagrams/DesignerItem.xaml
diff --git a/BrightSharp/Diagrams/Resources/ResizeRotateChrome.xaml b/BrightSharp/Themes/Diagrams/ResizeRotateChrome.xaml
similarity index 100%
rename from BrightSharp/Diagrams/Resources/ResizeRotateChrome.xaml
rename to BrightSharp/Themes/Diagrams/ResizeRotateChrome.xaml
diff --git a/BrightSharp/Diagrams/Resources/SizeChrome.xaml b/BrightSharp/Themes/Diagrams/SizeChrome.xaml
similarity index 100%
rename from BrightSharp/Diagrams/Resources/SizeChrome.xaml
rename to BrightSharp/Themes/Diagrams/SizeChrome.xaml
diff --git a/BrightSharp/Themes/Generic.xaml b/BrightSharp/Themes/Generic.xaml
new file mode 100644
index 0000000..63b9319
--- /dev/null
+++ b/BrightSharp/Themes/Generic.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BrightSharp/Style.Blue.xaml b/BrightSharp/Themes/Style.Blue.xaml
similarity index 97%
rename from BrightSharp/Style.Blue.xaml
rename to BrightSharp/Themes/Style.Blue.xaml
index cf2e4e1..47ce2ba 100644
--- a/BrightSharp/Style.Blue.xaml
+++ b/BrightSharp/Themes/Style.Blue.xaml
@@ -1,8 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                     xmlns:s="clr-namespace:System;assembly=mscorlib"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     
-    <sys:Boolean x:Key="IsInverseTheme">False</sys:Boolean>
+    <s:Boolean x:Key="IsInverseTheme">False</s:Boolean>
 
     <CornerRadius x:Key="DefaultRadiusSmall">1</CornerRadius>
     <CornerRadius x:Key="DefaultRadiusNormal">3</CornerRadius>
diff --git a/BrightSharp/Style.DarkBlue.xaml b/BrightSharp/Themes/Style.DarkBlue.xaml
similarity index 100%
rename from BrightSharp/Style.DarkBlue.xaml
rename to BrightSharp/Themes/Style.DarkBlue.xaml
diff --git a/BrightSharp/Style.DevLab.xaml b/BrightSharp/Themes/Style.DevLab.xaml
similarity index 100%
rename from BrightSharp/Style.DevLab.xaml
rename to BrightSharp/Themes/Style.DevLab.xaml
diff --git a/BrightSharp/Style.Silver.xaml b/BrightSharp/Themes/Style.Silver.xaml
similarity index 100%
rename from BrightSharp/Style.Silver.xaml
rename to BrightSharp/Themes/Style.Silver.xaml
diff --git a/BrightSharp/Generic.cs b/BrightSharp/Themes/Theme.cs
similarity index 91%
rename from BrightSharp/Generic.cs
rename to BrightSharp/Themes/Theme.cs
index 7b41fc6..07e1e10 100644
--- a/BrightSharp/Generic.cs
+++ b/BrightSharp/Themes/Theme.cs
@@ -1,14 +1,20 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace BrightSharp
+namespace BrightSharp.Themes
 {
-    internal partial class Generic
+    internal partial class Theme
     {
+        public Theme() {
+
+
+        }
+
         public void CalendarPreviewMouseUp(object sender, MouseEventArgs e)
         {
             if (Mouse.Captured is CalendarItem) { Mouse.Capture(null); }
diff --git a/BrightSharp/Generic.xaml b/BrightSharp/Themes/Theme.xaml
similarity index 99%
rename from BrightSharp/Generic.xaml
rename to BrightSharp/Themes/Theme.xaml
index a829288..f0fbab1 100644
--- a/BrightSharp/Generic.xaml
+++ b/BrightSharp/Themes/Theme.xaml
@@ -1,14 +1,14 @@
-<ResourceDictionary x:Class="BrightSharp.Generic"
-                    x:ClassModifier="internal"
+<ResourceDictionary x:Class="BrightSharp.Themes.Theme" x:ClassModifier="internal"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:conv="clr-namespace:BrightSharp.Converters"
-                    xmlns:bs="clr-namespace:BrightSharp.Extensions"
-                    xmlns:diag="clr-namespace:BrightSharp.Diagrams">
+                    xmlns:bs="clr-namespace:BrightSharp.Extensions">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Diagrams/Resources/DesignerItem.xaml" />
+        <ResourceDictionary Source="Diagrams/DesignerItem.xaml" />
+        <ResourceDictionary Source="Controls/ZoomControl.xaml" />
+        <ResourceDictionary Source="Controls/PropertyGrid.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
+    
     <!--Converters-->
 
     <conv:ThicknessConverter x:Key="ThickConv" />
@@ -1637,7 +1637,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style TargetType="{x:Type DataGridRowHeader}">
         <Style.Resources>
             <Style x:Key="RowHeaderGripperStyle" TargetType="{x:Type Thumb}">
@@ -1668,7 +1668,7 @@
                                     <ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
                                     <Control SnapsToDevicePixels="false" Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" Visibility="{Binding (Validation.HasError), Converter={StaticResource btvc}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"/>
                                 </StackPanel>
-                                
+
                             </Grid>
                         </Border>
                         <Border Background="{DynamicResource DarkBrush}" Visibility="{TemplateBinding IsRowSelected, Converter={StaticResource btvc}}">
@@ -2949,7 +2949,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style TargetType="ListView">
         <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource SolidBorderBrush}"/>
@@ -5705,7 +5705,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style x:Key="{x:Type ToolTip}" TargetType="{x:Type ToolTip}">
         <Setter Property="OverridesDefaultStyle" Value="true"/>
         <Setter Property="HasDropShadow" Value="True"/>
@@ -5898,39 +5898,6 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type diag:ZoomControl}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="ClipToBounds" Value="True" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <Canvas Background="Transparent" />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type diag:ZoomControl}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}">
-                        <Grid>
-                            <ItemsPresenter>
-                                <ItemsPresenter.RenderTransform>
-                                    <TransformGroup>
-                                        <ScaleTransform ScaleX="{Binding RenderZoom, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                        ScaleY="{Binding ScaleX, RelativeSource={RelativeSource Self}}" />
-                                        <TranslateTransform X="{Binding TranslateX, RelativeSource={RelativeSource TemplatedParent}}" 
-                                                            Y="{Binding TranslateY, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    </TransformGroup>
-                                </ItemsPresenter.RenderTransform>
-                            </ItemsPresenter>
-                            <Border x:Name="PART_SelectionBorder" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 
     <!-- Window (Beta) Style -->
 
diff --git a/BrightSharp/ThemeManager.cs b/BrightSharp/Themes/ThemeManager.cs
similarity index 91%
rename from BrightSharp/ThemeManager.cs
rename to BrightSharp/Themes/ThemeManager.cs
index a562786..9f077fb 100644
--- a/BrightSharp/ThemeManager.cs
+++ b/BrightSharp/Themes/ThemeManager.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows;
 
-namespace BrightSharp
+namespace BrightSharp.Themes
 {
     public enum ColorThemes
     {
@@ -38,7 +38,7 @@ namespace BrightSharp
                     return;
                 Resources.Add(new ResourceDictionary()
                 {
-                    Source = new Uri($"/brightsharp;component/style.{value}.xaml", UriKind.RelativeOrAbsolute)
+                    Source = new Uri($"/brightsharp;component/themes/style.{value}.xaml", UriKind.RelativeOrAbsolute)
                 });
             }
         }
diff --git a/BrightSharp/icons/app.png b/BrightSharp/Themes/icons/app.png
similarity index 100%
rename from BrightSharp/icons/app.png
rename to BrightSharp/Themes/icons/app.png
diff --git a/BrightSharp/icons/copy.png b/BrightSharp/Themes/icons/copy.png
similarity index 100%
rename from BrightSharp/icons/copy.png
rename to BrightSharp/Themes/icons/copy.png
diff --git a/BrightSharp/icons/cut.png b/BrightSharp/Themes/icons/cut.png
similarity index 100%
rename from BrightSharp/icons/cut.png
rename to BrightSharp/Themes/icons/cut.png
diff --git a/BrightSharp/icons/paste.png b/BrightSharp/Themes/icons/paste.png
similarity index 100%
rename from BrightSharp/icons/paste.png
rename to BrightSharp/Themes/icons/paste.png
diff --git a/BrightSharp/icons/undo.png b/BrightSharp/Themes/icons/undo.png
similarity index 100%
rename from BrightSharp/icons/undo.png
rename to BrightSharp/Themes/icons/undo.png