diff --git a/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj b/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj
index 32ee8a6..139b013 100644
--- a/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj
+++ b/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj
@@ -60,12 +60,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ControlContainer.xaml.cs">
+      <DependentUpon>ControlContainer.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TestPage2.xaml.cs">
       <DependentUpon>TestPage2.xaml</DependentUpon>
     </Compile>
     <Compile Include="TestPage.xaml.cs">
       <DependentUpon>TestPage.xaml</DependentUpon>
     </Compile>
+    <Page Include="ControlContainer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CustomWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/BrightSharp.Ui.Tests/ControlContainer.xaml b/BrightSharp.Ui.Tests/ControlContainer.xaml
new file mode 100644
index 0000000..296e303
--- /dev/null
+++ b/BrightSharp.Ui.Tests/ControlContainer.xaml
@@ -0,0 +1,12 @@
+<Window x:Class="BrightSharp.Ui.Tests.ControlContainer"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BrightSharp.Ui.Tests"
+        mc:Ignorable="d"
+        Title="ControlContainer" Height="300" Width="300">
+    <Grid>
+        
+    </Grid>
+</Window>
diff --git a/BrightSharp.Ui.Tests/ControlContainer.xaml.cs b/BrightSharp.Ui.Tests/ControlContainer.xaml.cs
new file mode 100644
index 0000000..a690158
--- /dev/null
+++ b/BrightSharp.Ui.Tests/ControlContainer.xaml.cs
@@ -0,0 +1,26 @@
+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.Shapes;
+
+namespace BrightSharp.Ui.Tests
+{
+    /// <summary>
+    /// Interaction logic for ControlContainer.xaml
+    /// </summary>
+    public partial class ControlContainer : Window
+    {
+        public ControlContainer() {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BrightSharp.Ui.Tests/MainWindow.xaml.cs b/BrightSharp.Ui.Tests/MainWindow.xaml.cs
index f3b372f..8055a41 100644
--- a/BrightSharp.Ui.Tests/MainWindow.xaml.cs
+++ b/BrightSharp.Ui.Tests/MainWindow.xaml.cs
@@ -1,5 +1,4 @@
-using BrightSharp.Converters;
-using Diagrams;
+using BrightSharp.Diagrams;
 using System;
 using System.Text.RegularExpressions;
 using System.Windows;
diff --git a/BrightSharp/Behaviors/FiterGridTextBoxBehavior.cs b/BrightSharp/Behaviors/FiterGridTextBoxBehavior.cs
index 108e337..688db6c 100644
--- a/BrightSharp/Behaviors/FiterGridTextBoxBehavior.cs
+++ b/BrightSharp/Behaviors/FiterGridTextBoxBehavior.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/BrightSharp/Diagrams/Adorners/ResizeRotateAdorner.cs b/BrightSharp/Diagrams/Adorners/ResizeRotateAdorner.cs
index eb83507..343b2d6 100644
--- a/BrightSharp/Diagrams/Adorners/ResizeRotateAdorner.cs
+++ b/BrightSharp/Diagrams/Adorners/ResizeRotateAdorner.cs
@@ -2,10 +2,9 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class ResizeRotateAdorner : Adorner
@@ -17,7 +16,7 @@ namespace Diagrams
         {
             get
             {
-                return this.visuals.Count;
+                return visuals.Count;
             }
         }
 
@@ -25,24 +24,24 @@ namespace Diagrams
             : base(designerItem)
         {
             SnapsToDevicePixels = true;
-            this.chrome = new ResizeRotateChrome();
-            this.chrome.DataContext = designerItem;
-            this.visuals = new VisualCollection(this);
-            this.visuals.Add(this.chrome);
-            this.Focusable = true;
+            chrome = new ResizeRotateChrome();
+            chrome.DataContext = designerItem;
+            visuals = new VisualCollection(this);
+            visuals.Add(chrome);
+            Focusable = true;
         }
 
 
 
         protected override Size ArrangeOverride(Size arrangeBounds)
         {
-            this.chrome.Arrange(new Rect(arrangeBounds));
+            chrome.Arrange(new Rect(arrangeBounds));
             return arrangeBounds;
         }
 
         protected override Visual GetVisualChild(int index)
         {
-            return this.visuals[index];
+            return visuals[index];
         }
         
     }
diff --git a/BrightSharp/Diagrams/Adorners/ResizeRotateChrome.cs b/BrightSharp/Diagrams/Adorners/ResizeRotateChrome.cs
index 99d814a..7f60b09 100644
--- a/BrightSharp/Diagrams/Adorners/ResizeRotateChrome.cs
+++ b/BrightSharp/Diagrams/Adorners/ResizeRotateChrome.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class ResizeRotateChrome : Control
diff --git a/BrightSharp/Diagrams/Adorners/SizeAdorner.cs b/BrightSharp/Diagrams/Adorners/SizeAdorner.cs
index d91ce2f..0aa5b93 100644
--- a/BrightSharp/Diagrams/Adorners/SizeAdorner.cs
+++ b/BrightSharp/Diagrams/Adorners/SizeAdorner.cs
@@ -4,7 +4,7 @@ using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class SizeAdorner : Adorner
@@ -17,29 +17,29 @@ namespace Diagrams
         {
             get
             {
-                return this.visuals.Count;
+                return visuals.Count;
             }
         }
 
         public SizeAdorner(ContentControl designerItem)
             : base(designerItem)
         {
-            this.SnapsToDevicePixels = true;
+            SnapsToDevicePixels = true;
             this.designerItem = designerItem;
-            this.chrome = new SizeChrome();
-            this.chrome.DataContext = designerItem;
-            this.visuals = new VisualCollection(this);
-            this.visuals.Add(this.chrome);
+            chrome = new SizeChrome();
+            chrome.DataContext = designerItem;
+            visuals = new VisualCollection(this);
+            visuals.Add(chrome);
         }
 
         protected override Visual GetVisualChild(int index)
         {
-            return this.visuals[index];
+            return visuals[index];
         }
 
         protected override Size ArrangeOverride(Size arrangeBounds)
         {
-            this.chrome.Arrange(new Rect(new Point(0.0, 0.0), arrangeBounds));
+            chrome.Arrange(new Rect(new Point(0.0, 0.0), arrangeBounds));
             return arrangeBounds;
         }
     }
diff --git a/BrightSharp/Diagrams/Adorners/SizeChrome.cs b/BrightSharp/Diagrams/Adorners/SizeChrome.cs
index 22f068c..1160a92 100644
--- a/BrightSharp/Diagrams/Adorners/SizeChrome.cs
+++ b/BrightSharp/Diagrams/Adorners/SizeChrome.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
 
     [ToolboxItem(false)]
@@ -13,7 +13,7 @@ namespace Diagrams
     {
         static SizeChrome()
         {
-            FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata(typeof(SizeChrome), new FrameworkPropertyMetadata(typeof(SizeChrome)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(SizeChrome), new FrameworkPropertyMetadata(typeof(SizeChrome)));
         }
     }
 
diff --git a/BrightSharp/Diagrams/DesignerItemDecorator.cs b/BrightSharp/Diagrams/DesignerItemDecorator.cs
index 3febc28..918d9b4 100644
--- a/BrightSharp/Diagrams/DesignerItemDecorator.cs
+++ b/BrightSharp/Diagrams/DesignerItemDecorator.cs
@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows;
 using System.Windows.Media;
-using System.Windows.Input;
 using System.Windows.Media.Animation;
 using System.ComponentModel;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class DesignerItemDecorator : Control
@@ -29,63 +25,63 @@ namespace Diagrams
 
         public DesignerItemDecorator()
         {
-            Unloaded += new RoutedEventHandler(this.DesignerItemDecorator_Unloaded);
+            Unloaded += new RoutedEventHandler(DesignerItemDecorator_Unloaded);
         }
 
         private void HideAdorner()
         {
-            if (this.adorner != null)
+            if (adorner != null)
             {
-                this.adorner.Visibility = Visibility.Hidden;
+                adorner.Visibility = Visibility.Hidden;
             }
         }
 
         private void ShowAdorner()
         {
-            if (this.adorner == null)
+            if (adorner == null)
             {
                 AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this);
 
                 if (adornerLayer != null)
                 {
-                    ContentControl designerItem = this.DataContext as ContentControl;
+                    ContentControl designerItem = DataContext as ContentControl;
                     Canvas canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
-                    this.adorner = new ResizeRotateAdorner(designerItem);
-                    adornerLayer.Add(this.adorner);
+                    adorner = new ResizeRotateAdorner(designerItem);
+                    adornerLayer.Add(adorner);
 
-                    if (this.ShowDecorator)
+                    if (ShowDecorator)
                     {
-                        this.adorner.Visibility = Visibility.Visible;
+                        adorner.Visibility = Visibility.Visible;
 
                         var anim = new DoubleAnimation(0, 1, TimeSpan.FromSeconds(.2));
-                        this.adorner.BeginAnimation(OpacityProperty, anim);
+                        adorner.BeginAnimation(OpacityProperty, anim);
                     }
                     else
                     {
-                        this.adorner.Visibility = Visibility.Hidden;
+                        adorner.Visibility = Visibility.Hidden;
                     }
                 }
             }
             else
             {
-                this.adorner.Visibility = Visibility.Visible;
+                adorner.Visibility = Visibility.Visible;
 
                 var anim = new DoubleAnimation(0, 1, TimeSpan.FromSeconds(.2));
-                this.adorner.BeginAnimation(OpacityProperty, anim);
+                adorner.BeginAnimation(OpacityProperty, anim);
             }
         }
 
         private void DesignerItemDecorator_Unloaded(object sender, RoutedEventArgs e)
         {
-            if (this.adorner != null)
+            if (adorner != null)
             {
                 AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this);
                 if (adornerLayer != null)
                 {
-                    adornerLayer.Remove(this.adorner);
+                    adornerLayer.Remove(adorner);
                 }
 
-                this.adorner = null;
+                adorner = null;
             }
         }
 
diff --git a/BrightSharp/Diagrams/Resources/DesignerItem.xaml b/BrightSharp/Diagrams/Resources/DesignerItem.xaml
index 178496e..4028bcd 100644
--- a/BrightSharp/Diagrams/Resources/DesignerItem.xaml
+++ b/BrightSharp/Diagrams/Resources/DesignerItem.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Diagrams">
+                    xmlns:s="clr-namespace:BrightSharp.Diagrams">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="SizeChrome.xaml"/>
diff --git a/BrightSharp/Diagrams/Resources/ResizeRotateChrome.xaml b/BrightSharp/Diagrams/Resources/ResizeRotateChrome.xaml
index d034582..ae89737 100644
--- a/BrightSharp/Diagrams/Resources/ResizeRotateChrome.xaml
+++ b/BrightSharp/Diagrams/Resources/ResizeRotateChrome.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Diagrams">
+                    xmlns:s="clr-namespace:BrightSharp.Diagrams">
     <BooleanToVisibilityConverter x:Key="btvc" />
     <Style TargetType="{x:Type Shape}" x:Key="ThumbCorner">
         <Setter Property="SnapsToDevicePixels" Value="true" />
diff --git a/BrightSharp/Diagrams/Resources/SizeChrome.xaml b/BrightSharp/Diagrams/Resources/SizeChrome.xaml
index 953c26e..cdae020 100644
--- a/BrightSharp/Diagrams/Resources/SizeChrome.xaml
+++ b/BrightSharp/Diagrams/Resources/SizeChrome.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Diagrams">
+                    xmlns:s="clr-namespace:BrightSharp.Diagrams">
 
     <s:DoubleFormatConverter x:Key="doubleFormatConverter"/>
 
diff --git a/BrightSharp/Diagrams/SelectionBehavior.cs b/BrightSharp/Diagrams/SelectionBehavior.cs
index 4f132e0..f8b26b0 100644
--- a/BrightSharp/Diagrams/SelectionBehavior.cs
+++ b/BrightSharp/Diagrams/SelectionBehavior.cs
@@ -3,9 +3,8 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     public static class SelectionBehavior
     {
diff --git a/BrightSharp/Diagrams/Thumbs/MoveThumb.cs b/BrightSharp/Diagrams/Thumbs/MoveThumb.cs
index 3351067..a875e3e 100644
--- a/BrightSharp/Diagrams/Thumbs/MoveThumb.cs
+++ b/BrightSharp/Diagrams/Thumbs/MoveThumb.cs
@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class MoveThumb : Thumb
@@ -25,10 +25,10 @@ namespace Diagrams
         }
 
         private void MoveThumb_DragStarted(object sender, DragStartedEventArgs e) {
-            this.designerItem = DataContext as ContentControl;
+            designerItem = DataContext as ContentControl;
 
-            if (this.designerItem != null) {
-                this.rotateTransform = this.designerItem.RenderTransform as RotateTransform;
+            if (designerItem != null) {
+                rotateTransform = designerItem.RenderTransform as RotateTransform;
                 if (designerItem.GetBindingExpression(Panel.ZIndexProperty) == null) {
                     zIndex = Math.Max(zIndex ?? 0, Panel.GetZIndex(designerItem));
                     Panel.SetZIndex(designerItem, zIndex.Value + 1);
@@ -37,17 +37,17 @@ namespace Diagrams
         }
 
         private void MoveThumb_DragDelta(object sender, DragDeltaEventArgs e) {
-            if (this.designerItem != null) {
+            if (designerItem != null) {
                 Point dragDelta = new Point(e.HorizontalChange, e.VerticalChange);
 
-                if (this.rotateTransform != null) {
-                    dragDelta = this.rotateTransform.Transform(dragDelta);
+                if (rotateTransform != null) {
+                    dragDelta = rotateTransform.Transform(dragDelta);
                 }
-                if (double.IsNaN(Canvas.GetLeft(this.designerItem))) Canvas.SetLeft(this.designerItem, 0);
-                if (double.IsNaN(Canvas.GetTop(this.designerItem))) Canvas.SetTop(this.designerItem, 0);
+                if (double.IsNaN(Canvas.GetLeft(designerItem))) Canvas.SetLeft(designerItem, 0);
+                if (double.IsNaN(Canvas.GetTop(designerItem))) Canvas.SetTop(designerItem, 0);
 
-                Canvas.SetLeft(this.designerItem, Canvas.GetLeft(this.designerItem) + dragDelta.X);
-                Canvas.SetTop(this.designerItem, Canvas.GetTop(this.designerItem) + dragDelta.Y);
+                Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + dragDelta.X);
+                Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + dragDelta.Y);
 
 
             }
diff --git a/BrightSharp/Diagrams/Thumbs/ResizeThumb.cs b/BrightSharp/Diagrams/Thumbs/ResizeThumb.cs
index b9178c1..40907df 100644
--- a/BrightSharp/Diagrams/Thumbs/ResizeThumb.cs
+++ b/BrightSharp/Diagrams/Thumbs/ResizeThumb.cs
@@ -4,11 +4,10 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
 using System.Windows.Media;
-using System.Collections.Generic;
 using System.Windows.Input;
 using System.ComponentModel;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class ResizeThumb : Thumb
@@ -22,53 +21,53 @@ namespace Diagrams
 
         public ResizeThumb()
         {
-            DragStarted += new DragStartedEventHandler(this.ResizeThumb_DragStarted);
-            DragDelta += new DragDeltaEventHandler(this.ResizeThumb_DragDelta);
-            DragCompleted += new DragCompletedEventHandler(this.ResizeThumb_DragCompleted);
-            MouseRightButtonDown += new MouseButtonEventHandler(this.ResizeThumb_MouseRightButtonDown);
+            DragStarted += new DragStartedEventHandler(ResizeThumb_DragStarted);
+            DragDelta += new DragDeltaEventHandler(ResizeThumb_DragDelta);
+            DragCompleted += new DragCompletedEventHandler(ResizeThumb_DragCompleted);
+            MouseRightButtonDown += new MouseButtonEventHandler(ResizeThumb_MouseRightButtonDown);
         }
 
         private void ResizeThumb_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
-            this.designerItem = this.designerItem ?? this.DataContext as ContentControl;
+            designerItem = designerItem ?? DataContext as ContentControl;
 
             if (VerticalAlignment == VerticalAlignment.Top || VerticalAlignment == VerticalAlignment.Bottom)
             {
-                this.designerItem.Height = double.NaN;
+                designerItem.Height = double.NaN;
             }
             if (HorizontalAlignment == HorizontalAlignment.Left || HorizontalAlignment == HorizontalAlignment.Right)
             {
-                this.designerItem.Width = double.NaN;
+                designerItem.Width = double.NaN;
             }
         }
 
         private void ResizeThumb_DragStarted(object sender, DragStartedEventArgs e)
         {
-            this.designerItem = this.DataContext as ContentControl;
+            designerItem = DataContext as ContentControl;
 
-            if (this.designerItem != null)
+            if (designerItem != null)
             {
-                this.canvas = VisualTreeHelper.GetParent(this.designerItem) as Canvas;
+                canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
 
-                if (this.canvas != null)
+                if (canvas != null)
                 {
-                    this.transformOrigin = this.designerItem.RenderTransformOrigin;
+                    transformOrigin = designerItem.RenderTransformOrigin;
 
-                    this.rotateTransform = this.designerItem.RenderTransform as RotateTransform;
-                    if (this.rotateTransform != null)
+                    rotateTransform = designerItem.RenderTransform as RotateTransform;
+                    if (rotateTransform != null)
                     {
-                        this.angle = this.rotateTransform.Angle * Math.PI / 180.0;
+                        angle = rotateTransform.Angle * Math.PI / 180.0;
                     }
                     else
                     {
-                        this.angle = 0.0d;
+                        angle = 0.0d;
                     }
 
-                    AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this.canvas);
+                    AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(canvas);
                     if (adornerLayer != null)
                     {
-                        this.adorner = new SizeAdorner(this.designerItem);
-                        adornerLayer.Add(this.adorner);
+                        adorner = new SizeAdorner(designerItem);
+                        adornerLayer.Add(adorner);
                     }
                 }
             }
@@ -76,29 +75,29 @@ namespace Diagrams
 
         private void ResizeThumb_DragDelta(object sender, DragDeltaEventArgs e)
         {
-            if (this.designerItem != null)
+            if (designerItem != null)
             {
                 double deltaVertical, deltaHorizontal;
-                if (double.IsNaN(Canvas.GetTop(this.designerItem))) Canvas.SetTop(this.designerItem, 0);
-                if (double.IsNaN(Canvas.GetLeft(this.designerItem))) Canvas.SetLeft(this.designerItem, 0);
-                if ((VerticalAlignment == VerticalAlignment.Top || VerticalAlignment == VerticalAlignment.Bottom) && double.IsNaN(this.designerItem.Height)) this.designerItem.Height = this.designerItem.ActualHeight;
-                if ((HorizontalAlignment == HorizontalAlignment.Left || HorizontalAlignment == HorizontalAlignment.Right) && double.IsNaN(this.designerItem.Width)) this.designerItem.Width = this.designerItem.ActualWidth;
+                if (double.IsNaN(Canvas.GetTop(designerItem))) Canvas.SetTop(designerItem, 0);
+                if (double.IsNaN(Canvas.GetLeft(designerItem))) Canvas.SetLeft(designerItem, 0);
+                if ((VerticalAlignment == VerticalAlignment.Top || VerticalAlignment == VerticalAlignment.Bottom) && double.IsNaN(designerItem.Height)) designerItem.Height = designerItem.ActualHeight;
+                if ((HorizontalAlignment == HorizontalAlignment.Left || HorizontalAlignment == HorizontalAlignment.Right) && double.IsNaN(designerItem.Width)) designerItem.Width = designerItem.ActualWidth;
 
                 switch (VerticalAlignment)
                 {
                     case System.Windows.VerticalAlignment.Bottom:
-                        deltaVertical = Math.Min(-e.VerticalChange, this.designerItem.ActualHeight - this.designerItem.MinHeight);
-                        deltaVertical = Math.Max(deltaVertical, this.designerItem.ActualHeight - this.designerItem.MaxHeight);
-                        Canvas.SetTop(this.designerItem, Canvas.GetTop(this.designerItem) + (this.transformOrigin.Y * deltaVertical * (1 - Math.Cos(-this.angle))));
-                        Canvas.SetLeft(this.designerItem, Canvas.GetLeft(this.designerItem) - deltaVertical * this.transformOrigin.Y * Math.Sin(-this.angle));
-                        this.designerItem.Height -= deltaVertical;
+                        deltaVertical = Math.Min(-e.VerticalChange, designerItem.ActualHeight - designerItem.MinHeight);
+                        deltaVertical = Math.Max(deltaVertical, designerItem.ActualHeight - designerItem.MaxHeight);
+                        Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + (transformOrigin.Y * deltaVertical * (1 - Math.Cos(-angle))));
+                        Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) - deltaVertical * transformOrigin.Y * Math.Sin(-angle));
+                        designerItem.Height -= deltaVertical;
                         break;
                     case System.Windows.VerticalAlignment.Top:
-                        deltaVertical = Math.Min(e.VerticalChange, this.designerItem.ActualHeight - this.designerItem.MinHeight);
-                        deltaVertical = Math.Max(deltaVertical, this.designerItem.ActualHeight - this.designerItem.MaxHeight);
-                        Canvas.SetTop(this.designerItem, Canvas.GetTop(this.designerItem) + deltaVertical * Math.Cos(-this.angle) + (this.transformOrigin.Y * deltaVertical * (1 - Math.Cos(-this.angle))));
-                        Canvas.SetLeft(this.designerItem, Canvas.GetLeft(this.designerItem) + deltaVertical * Math.Sin(-this.angle) - (this.transformOrigin.Y * deltaVertical * Math.Sin(-this.angle)));
-                        this.designerItem.Height -= deltaVertical;
+                        deltaVertical = Math.Min(e.VerticalChange, designerItem.ActualHeight - designerItem.MinHeight);
+                        deltaVertical = Math.Max(deltaVertical, designerItem.ActualHeight - designerItem.MaxHeight);
+                        Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + deltaVertical * Math.Cos(-angle) + (transformOrigin.Y * deltaVertical * (1 - Math.Cos(-angle))));
+                        Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + deltaVertical * Math.Sin(-angle) - (transformOrigin.Y * deltaVertical * Math.Sin(-angle)));
+                        designerItem.Height -= deltaVertical;
                         break;
                     default:
                         break;
@@ -107,18 +106,18 @@ namespace Diagrams
                 switch (HorizontalAlignment)
                 {
                     case System.Windows.HorizontalAlignment.Left:
-                        deltaHorizontal = Math.Min(e.HorizontalChange, this.designerItem.ActualWidth - this.designerItem.MinWidth);
-                        deltaHorizontal = Math.Max(deltaHorizontal, this.designerItem.ActualWidth - this.designerItem.MaxWidth);
-                        Canvas.SetTop(this.designerItem, Canvas.GetTop(this.designerItem) + deltaHorizontal * Math.Sin(this.angle) - this.transformOrigin.X * deltaHorizontal * Math.Sin(this.angle));
-                        Canvas.SetLeft(this.designerItem, Canvas.GetLeft(this.designerItem) + deltaHorizontal * Math.Cos(this.angle) + (this.transformOrigin.X * deltaHorizontal * (1 - Math.Cos(this.angle))));
-                        this.designerItem.Width -= deltaHorizontal;
+                        deltaHorizontal = Math.Min(e.HorizontalChange, designerItem.ActualWidth - designerItem.MinWidth);
+                        deltaHorizontal = Math.Max(deltaHorizontal, designerItem.ActualWidth - designerItem.MaxWidth);
+                        Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + deltaHorizontal * Math.Sin(angle) - transformOrigin.X * deltaHorizontal * Math.Sin(angle));
+                        Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + deltaHorizontal * Math.Cos(angle) + (transformOrigin.X * deltaHorizontal * (1 - Math.Cos(angle))));
+                        designerItem.Width -= deltaHorizontal;
                         break;
                     case System.Windows.HorizontalAlignment.Right:
-                        deltaHorizontal = Math.Min(-e.HorizontalChange, this.designerItem.ActualWidth - this.designerItem.MinWidth);
-                        deltaHorizontal = Math.Max(deltaHorizontal, this.designerItem.ActualWidth - this.designerItem.MaxWidth);
-                        Canvas.SetTop(this.designerItem, Canvas.GetTop(this.designerItem) - this.transformOrigin.X * deltaHorizontal * Math.Sin(this.angle));
-                        Canvas.SetLeft(this.designerItem, Canvas.GetLeft(this.designerItem) + (deltaHorizontal * this.transformOrigin.X * (1 - Math.Cos(this.angle))));
-                        this.designerItem.Width -= deltaHorizontal;
+                        deltaHorizontal = Math.Min(-e.HorizontalChange, designerItem.ActualWidth - designerItem.MinWidth);
+                        deltaHorizontal = Math.Max(deltaHorizontal, designerItem.ActualWidth - designerItem.MaxWidth);
+                        Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) - transformOrigin.X * deltaHorizontal * Math.Sin(angle));
+                        Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + (deltaHorizontal * transformOrigin.X * (1 - Math.Cos(angle))));
+                        designerItem.Width -= deltaHorizontal;
                         break;
                     default:
                         break;
@@ -130,15 +129,15 @@ namespace Diagrams
 
         private void ResizeThumb_DragCompleted(object sender, DragCompletedEventArgs e)
         {
-            if (this.adorner != null)
+            if (adorner != null)
             {
-                AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this.canvas);
+                AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(canvas);
                 if (adornerLayer != null)
                 {
-                    adornerLayer.Remove(this.adorner);
+                    adornerLayer.Remove(adorner);
                 }
 
-                this.adorner = null;
+                adorner = null;
             }
         }
     }
diff --git a/BrightSharp/Diagrams/Thumbs/RotateThumb.cs b/BrightSharp/Diagrams/Thumbs/RotateThumb.cs
index dd076ba..1edb7ac 100644
--- a/BrightSharp/Diagrams/Thumbs/RotateThumb.cs
+++ b/BrightSharp/Diagrams/Thumbs/RotateThumb.cs
@@ -6,7 +6,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     [ToolboxItem(false)]
     public class RotateThumb : Thumb
@@ -20,8 +20,8 @@ namespace Diagrams
 
         public RotateThumb()
         {
-            DragDelta += new DragDeltaEventHandler(this.RotateThumb_DragDelta);
-            DragStarted += new DragStartedEventHandler(this.RotateThumb_DragStarted);
+            DragDelta += new DragDeltaEventHandler(RotateThumb_DragDelta);
+            DragStarted += new DragStartedEventHandler(RotateThumb_DragStarted);
             MouseRightButtonDown += RotateThumb_MouseLeftButtonDown;
         }
 
@@ -29,42 +29,42 @@ namespace Diagrams
         {
             if (e.RightButton == MouseButtonState.Pressed)
             {
-                this.rotateTransform = this.designerItem.RenderTransform as RotateTransform;
-                if (this.rotateTransform != null)
+                rotateTransform = designerItem.RenderTransform as RotateTransform;
+                if (rotateTransform != null)
                 {
-                    this.rotateTransform.Angle = 0;
-                    this.designerItem.InvalidateMeasure();
+                    rotateTransform.Angle = 0;
+                    designerItem.InvalidateMeasure();
                 }
             }
         }
 
         private void RotateThumb_DragStarted(object sender, DragStartedEventArgs e)
         {
-            this.designerItem = DataContext as ContentControl;
+            designerItem = DataContext as ContentControl;
 
-            if (this.designerItem != null)
+            if (designerItem != null)
             {
-                this.canvas = VisualTreeHelper.GetParent(this.designerItem) as Canvas;
+                canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
 
-                if (this.canvas != null)
+                if (canvas != null)
                 {
-                    this.centerPoint = this.designerItem.TranslatePoint(
-                        new Point(this.designerItem.ActualWidth * this.designerItem.RenderTransformOrigin.X,
-                                  this.designerItem.ActualHeight * this.designerItem.RenderTransformOrigin.Y),
-                                  this.canvas);
+                    centerPoint = designerItem.TranslatePoint(
+                        new Point(designerItem.ActualWidth * designerItem.RenderTransformOrigin.X,
+                                  designerItem.ActualHeight * designerItem.RenderTransformOrigin.Y),
+                                  canvas);
 
-                    Point startPoint = Mouse.GetPosition(this.canvas);
-                    this.startVector = Point.Subtract(startPoint, this.centerPoint);
+                    Point startPoint = Mouse.GetPosition(canvas);
+                    startVector = Point.Subtract(startPoint, centerPoint);
 
-                    this.rotateTransform = this.designerItem.RenderTransform as RotateTransform;
-                    if (this.rotateTransform == null)
+                    rotateTransform = designerItem.RenderTransform as RotateTransform;
+                    if (rotateTransform == null)
                     {
-                        this.designerItem.RenderTransform = new RotateTransform(0);
-                        this.initialAngle = 0;
+                        designerItem.RenderTransform = new RotateTransform(0);
+                        initialAngle = 0;
                     }
                     else
                     {
-                        this.initialAngle = this.rotateTransform.Angle;
+                        initialAngle = rotateTransform.Angle;
                     }
                 }
             }
@@ -72,16 +72,16 @@ namespace Diagrams
 
         private void RotateThumb_DragDelta(object sender, DragDeltaEventArgs e)
         {
-            if (this.designerItem != null && this.canvas != null)
+            if (designerItem != null && canvas != null)
             {
-                Point currentPoint = Mouse.GetPosition(this.canvas);
-                Vector deltaVector = Point.Subtract(currentPoint, this.centerPoint);
+                Point currentPoint = Mouse.GetPosition(canvas);
+                Vector deltaVector = Point.Subtract(currentPoint, centerPoint);
 
-                double angle = Vector.AngleBetween(this.startVector, deltaVector);
+                double angle = Vector.AngleBetween(startVector, deltaVector);
 
-                RotateTransform rotateTransform = this.designerItem.RenderTransform as RotateTransform;
-                rotateTransform.Angle = this.initialAngle + Math.Round(angle, 0);
-                this.designerItem.InvalidateMeasure();
+                RotateTransform rotateTransform = designerItem.RenderTransform as RotateTransform;
+                rotateTransform.Angle = initialAngle + Math.Round(angle, 0);
+                designerItem.InvalidateMeasure();
             }
         }
     }
diff --git a/BrightSharp/Diagrams/VisualExtensions.cs b/BrightSharp/Diagrams/VisualExtensions.cs
index 1742b15..52a4a3f 100644
--- a/BrightSharp/Diagrams/VisualExtensions.cs
+++ b/BrightSharp/Diagrams/VisualExtensions.cs
@@ -1,12 +1,11 @@
-using BrightSharp;
-using BrightSharp.Extensions;
+using BrightSharp.Extensions;
 using System;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
     /// <summary>
     /// If starts with a(A) then use animation,
diff --git a/BrightSharp/Generic.xaml b/BrightSharp/Generic.xaml
index 1bce5d4..a829288 100644
--- a/BrightSharp/Generic.xaml
+++ b/BrightSharp/Generic.xaml
@@ -4,7 +4,7 @@
                     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:Diagrams">
+                    xmlns:diag="clr-namespace:BrightSharp.Diagrams">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Diagrams/Resources/DesignerItem.xaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/BrightSharp/Properties/AssemblyInfo.cs b/BrightSharp/Properties/AssemblyInfo.cs
index 267c412..9678de3 100644
--- a/BrightSharp/Properties/AssemblyInfo.cs
+++ b/BrightSharp/Properties/AssemblyInfo.cs
@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Markup;
@@ -32,13 +30,13 @@ using System.Windows.Markup;
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 
-[assembly:ThemeInfo(
+[assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                             //(used if a resource is not found in the page, 
-                             // or application resource dictionaries)
+                                     //(used if a resource is not found in the page, 
+                                     // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                      //(used if a resource is not found in the page, 
-                                      // app, or any theme specific resource dictionaries)
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -62,4 +60,4 @@ using System.Windows.Markup;
 
 
 [assembly: XmlnsPrefix("http://schemas.brightsharp.com/diagrams", "bsDiag")]
-[assembly: XmlnsDefinition("http://schemas.brightsharp.com/diagrams", "Diagrams")]
\ No newline at end of file
+[assembly: XmlnsDefinition("http://schemas.brightsharp.com/diagrams", "BrightSharp.Diagrams")]
\ No newline at end of file
diff --git a/BrightSharp/ThemeManager.cs b/BrightSharp/ThemeManager.cs
index 6e888d7..a562786 100644
--- a/BrightSharp/ThemeManager.cs
+++ b/BrightSharp/ThemeManager.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace BrightSharp
diff --git a/BrightSharp/ZoomControl.cs b/BrightSharp/ZoomControl.cs
index 62016de..1d5182c 100644
--- a/BrightSharp/ZoomControl.cs
+++ b/BrightSharp/ZoomControl.cs
@@ -6,7 +6,7 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
 
-namespace Diagrams
+namespace BrightSharp.Diagrams
 {
 
     public partial class ZoomControl : ItemsControl
@@ -121,13 +121,13 @@ namespace Diagrams
             {
                 DoubleAnimation anim = new DoubleAnimation(newValue, TimeSpan.FromSeconds(.3));
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
-                this.BeginAnimation(ZoomControl.RenderZoomProperty, anim);
+                BeginAnimation(ZoomControl.RenderZoomProperty, anim);
             }
             else 
             {
                 DoubleAnimation anim = new DoubleAnimation(newValue, TimeSpan.FromSeconds(0));
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
-                this.BeginAnimation(ZoomControl.RenderZoomProperty, anim);
+                BeginAnimation(ZoomControl.RenderZoomProperty, anim);
             }
 
             RaiseZoomChangedEvent();
@@ -138,21 +138,21 @@ namespace Diagrams
             {
                 DoubleAnimation anim = new DoubleAnimation(translateXTo, TimeSpan.FromSeconds(.3));
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
-                this.BeginAnimation(ZoomControl.TranslateXProperty, anim);
+                BeginAnimation(ZoomControl.TranslateXProperty, anim);
 
                 anim = new DoubleAnimation(translateYTo, TimeSpan.FromSeconds(.3));
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
-                this.BeginAnimation(ZoomControl.TranslateYProperty, anim);
+                BeginAnimation(ZoomControl.TranslateYProperty, anim);
             }
             else
             {
                 DoubleAnimation anim = new DoubleAnimation(translateXTo, TimeSpan.FromSeconds(0));
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
-                this.BeginAnimation(ZoomControl.TranslateXProperty, anim);
+                BeginAnimation(ZoomControl.TranslateXProperty, anim);
 
                 anim = new DoubleAnimation(translateYTo, TimeSpan.FromSeconds(0));
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
-                this.BeginAnimation(ZoomControl.TranslateYProperty, anim);
+                BeginAnimation(ZoomControl.TranslateYProperty, anim);
             }
 
             e.Handled = true;