diff --git a/Cairo/Perspex.Cairo/CairoExtensions.cs b/Cairo/Perspex.Cairo/CairoExtensions.cs
index 51a78ab6e8..f6f8502cac 100644
--- a/Cairo/Perspex.Cairo/CairoExtensions.cs
+++ b/Cairo/Perspex.Cairo/CairoExtensions.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="CairoPlatform.cs" company="Steven Kirk">
+// <copyright file="CairoExtensions.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -25,5 +25,4 @@ namespace Perspex.Cairo
             return new Cairo.Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/Cairo/Perspex.Cairo/CairoPlatform.cs b/Cairo/Perspex.Cairo/CairoPlatform.cs
index d9e04a91f5..0fd02284c9 100644
--- a/Cairo/Perspex.Cairo/CairoPlatform.cs
+++ b/Cairo/Perspex.Cairo/CairoPlatform.cs
@@ -20,6 +20,11 @@ namespace Perspex.Cairo
 
         private static TextService textService = new TextService();
 
+        public ITextService TextService
+        {
+            get { return textService; }
+        }
+
         public static void Initialize()
         {
             var locator = Locator.CurrentMutable;
@@ -27,22 +32,17 @@ namespace Perspex.Cairo
             locator.Register(() => textService, typeof(ITextService));
         }
 
-        public ITextService TextService
-        {
-            get { return textService; }
-        }
-
         public IBitmapImpl CreateBitmap(int width, int height)
         {
             throw new NotImplementedException();
-            //return new BitmapImpl(imagingFactory, width, height);
+            ////return new BitmapImpl(imagingFactory, width, height);
         }
 
         public IRenderer CreateRenderer(IPlatformHandle handle, double width, double height)
         {
             if (textService.Context == null)
             {
-                textService.Context = GetPangoContext(handle);
+                textService.Context = this.GetPangoContext(handle);
             }
 
             return new Renderer(handle, width, height);
diff --git a/Cairo/Perspex.Cairo/Media/DrawingContext.cs b/Cairo/Perspex.Cairo/Media/DrawingContext.cs
index b44cb0dbed..e765a6ce8b 100644
--- a/Cairo/Perspex.Cairo/Media/DrawingContext.cs
+++ b/Cairo/Perspex.Cairo/Media/DrawingContext.cs
@@ -3,12 +3,11 @@
 // Copyright 2013 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
-using Perspex.Cairo.Media.Imaging;
-
 namespace Perspex.Cairo.Media
 {
     using System;
     using System.Reactive.Disposables;
+    using Perspex.Cairo.Media.Imaging;
     using Perspex.Media;
     using Perspex.Platform;
     using Splat;
diff --git a/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs b/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
index ca36fd7c4d..457e7fc179 100644
--- a/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
+++ b/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
@@ -12,7 +12,6 @@ namespace Perspex.Cairo.Media.Imaging
 
     public class BitmapImpl : IBitmapImpl
     {
-
         public BitmapImpl(Cairo.ImageSurface surface)
         {
             this.Surface = surface;
diff --git a/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs b/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
index 99e1d4e46b..864fe7d41f 100644
--- a/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
+++ b/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Direct2D1StreamGeometryContext.cs" company="Steven Kirk">
+// <copyright file="StreamGeometryContextImpl.cs" company="Steven Kirk">
 // Copyright 2013 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs b/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs
index dec4d03727..89aef0d408 100644
--- a/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs
+++ b/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Direct2DStreamGeometry.cs" company="Steven Kirk">
+// <copyright file="StreamGeometryImpl.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj b/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
index 3a75223eaa..56a0e5ac88 100644
--- a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
+++ b/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>Perspex.Cairo</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>b122e795</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,6 +89,13 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Cairo/Perspex.Cairo/Renderer.cs b/Cairo/Perspex.Cairo/Renderer.cs
index 75115fda69..79e34dad06 100644
--- a/Cairo/Perspex.Cairo/Renderer.cs
+++ b/Cairo/Perspex.Cairo/Renderer.cs
@@ -52,7 +52,7 @@ namespace Perspex.Cairo
         }
 
         [DllImport("user32.dll")]
-        private static extern IntPtr GetDC(IntPtr hWnd);
+        private static extern IntPtr GetDC(IntPtr hwnd);
 
         /// <summary>
         /// Creates a cairo surface that targets a platform-specific resource.
diff --git a/Cairo/Perspex.Cairo/packages.config b/Cairo/Perspex.Cairo/packages.config
index 0ab7b56b8d..9f4c14955a 100644
--- a/Cairo/Perspex.Cairo/packages.config
+++ b/Cairo/Perspex.Cairo/packages.config
@@ -3,4 +3,5 @@
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Splat" version="1.5.1" targetFramework="net45" />
+  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/GtkExtensions.cs b/Gtk/Perspex.Gtk/GtkExtensions.cs
index c8bd6df652..1485643f0c 100644
--- a/Gtk/Perspex.Gtk/GtkExtensions.cs
+++ b/Gtk/Perspex.Gtk/GtkExtensions.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Window.cs" company="Steven Kirk">
+// <copyright file="GtkExtensions.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Gtk/Perspex.Gtk/GtkPlatform.cs b/Gtk/Perspex.Gtk/GtkPlatform.cs
index 70c0342ea0..198589c5cb 100644
--- a/Gtk/Perspex.Gtk/GtkPlatform.cs
+++ b/Gtk/Perspex.Gtk/GtkPlatform.cs
@@ -1,55 +1,56 @@
 // -----------------------------------------------------------------------
-// <copyright file="IDescription.cs" company="Steven Kirk">
+// <copyright file="GtkPlatform.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
 
 namespace Perspex.Gtk
 {
-	using System;
-	using System.Reactive.Disposables;
+    using System;
+    using System.Reactive.Disposables;
     using Perspex.Input;
-	using Perspex.Platform;
-	using Splat;
-	using Gtk = global::Gtk;
-
-	public class GtkPlatform : IPlatformThreadingInterface
-	{
-		private static GtkPlatform instance = new GtkPlatform ();
-
-		public GtkPlatform ()
-		{
-			Gtk.Application.Init();
-		}
-
-		public static void Initialize()
-		{
-			var locator = Locator.CurrentMutable;
+    using Perspex.Platform;
+    using Splat;
+    using Gtk = global::Gtk;
+
+    public class GtkPlatform : IPlatformThreadingInterface
+    {
+        private static GtkPlatform instance = new GtkPlatform();
+
+        public GtkPlatform()
+        {
+            Gtk.Application.Init();
+        }
+
+        public static void Initialize()
+        {
+            var locator = Locator.CurrentMutable;
             locator.Register(() => new WindowImpl(), typeof(IWindowImpl));
             locator.Register(() => GtkKeyboardDevice.Instance, typeof(IKeyboardDevice));
             locator.Register(() => instance, typeof(IPlatformThreadingInterface));
-		}
+        }
 
-		public void ProcessMessage ()
-		{
-			Gtk.Application.RunIteration();
-		}
+        public void ProcessMessage()
+        {
+            Gtk.Application.RunIteration();
+        }
 
-		public IDisposable StartTimer (TimeSpan interval, Action tick)
-		{
+        public IDisposable StartTimer(TimeSpan interval, Action tick)
+        {
             var result = true;
-            var handle = GLib.Timeout.Add((uint)interval.TotalMilliseconds, () =>
-            {
-                tick();
-                return result;
-            });
+            var handle = GLib.Timeout.Add(
+                (uint)interval.TotalMilliseconds, 
+                () =>
+                {
+                    tick();
+                    return result;
+                });
 
             return Disposable.Create(() => result = false);
-		}
-
-		public void Wake ()
-		{
-		}
-	}
-}
+        }
 
+        public void Wake()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs b/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs
index fb42e5e817..1ce6cfb357 100644
--- a/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs
+++ b/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs
@@ -55,5 +55,4 @@ namespace Perspex.Gtk
             }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs b/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs
index e0a7ccaaec..3a78a6bb03 100644
--- a/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs
+++ b/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs
@@ -37,5 +37,4 @@ namespace Perspex.Gtk
             return this.clientPosition;
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj b/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
index a63a6510b9..424a2ff691 100644
--- a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
+++ b/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
@@ -8,6 +8,7 @@
     <RootNamespace>Perspex.Gtk</RootNamespace>
     <AssemblyName>Perspex.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>ad245ae8</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -96,7 +97,12 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Input\" />
-  </ItemGroup>
+  <ItemGroup />
+  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs b/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs
index 97680abc0e..1367ae3c61 100644
--- a/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs
+++ b/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs
@@ -1,27 +1,24 @@
-using System.Reflection;
+// -----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Perspex.Gtk")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("steven")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
+[assembly: AssemblyTitle("Perspex.Gtk")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("steven")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
 
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/Gtk/Perspex.Gtk/WindowImpl.cs b/Gtk/Perspex.Gtk/WindowImpl.cs
index 9a78fc78fb..046e7f5412 100644
--- a/Gtk/Perspex.Gtk/WindowImpl.cs
+++ b/Gtk/Perspex.Gtk/WindowImpl.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Window.cs" company="Steven Kirk">
+// <copyright file="WindowImpl.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -13,16 +13,16 @@ namespace Perspex.Gtk
     using Gtk = global::Gtk;
 
     public class WindowImpl : Gtk.Window, IWindowImpl
-	{
+    {
         private Window owner;
 
         private IPlatformHandle windowHandle;
 
         private Size clientSize;
 
-		public WindowImpl()
+        public WindowImpl()
             : base(Gtk.WindowType.Toplevel)
-		{
+        {
             this.DefaultSize = new Gdk.Size(640, 480);
             this.Events = Gdk.EventMask.PointerMotionMask | 
                           Gdk.EventMask.ButtonPressMask | 
@@ -94,7 +94,7 @@ namespace Perspex.Gtk
             if (newSize != this.clientSize)
             {
                 this.clientSize = newSize;
-                this.Resized(clientSize);
+                this.Resized(this.clientSize);
             }
 
             return true;
@@ -118,7 +118,7 @@ namespace Perspex.Gtk
 
         protected override bool OnExposeEvent(Gdk.EventExpose evnt)
         {
-            this.Paint(evnt.Area.ToPerspex(), GetHandle(evnt.Window));
+            this.Paint(evnt.Area.ToPerspex(), this.GetHandle(evnt.Window));
             return true;
         }
 
diff --git a/Gtk/Perspex.Gtk/packages.config b/Gtk/Perspex.Gtk/packages.config
index 4dbe72e8fe..fc92db68ae 100644
--- a/Gtk/Perspex.Gtk/packages.config
+++ b/Gtk/Perspex.Gtk/packages.config
@@ -4,4 +4,5 @@
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
   <package id="Splat" version="1.5.1" targetFramework="net45" />
+  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Controls/Primitives/HeaderedContentControl.cs b/Perspex.Controls/Primitives/HeaderedContentControl.cs
index 31686a31aa..bfd9478706 100644
--- a/Perspex.Controls/Primitives/HeaderedContentControl.cs
+++ b/Perspex.Controls/Primitives/HeaderedContentControl.cs
@@ -6,10 +6,6 @@
 
 namespace Perspex.Controls.Primitives
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
     public class HeaderedContentControl : ContentControl, IHeadered
     {
         public static readonly PerspexProperty<object> HeaderProperty =
diff --git a/Perspex.Diagnostics/Debug.cs b/Perspex.Diagnostics/Debug.cs
index d656aa6405..bc3330b286 100644
--- a/Perspex.Diagnostics/Debug.cs
+++ b/Perspex.Diagnostics/Debug.cs
@@ -65,7 +65,7 @@ namespace Perspex.Diagnostics
 
         private static string Indent(int indent)
         {
-            return string.Join("", Enumerable.Repeat("    ", Math.Max(indent, 0)));
+            return string.Join(string.Empty, Enumerable.Repeat("    ", Math.Max(indent, 0)));
         }
     }
 }
diff --git a/Perspex.Diagnostics/LogManager.cs b/Perspex.Diagnostics/LogManager.cs
index 61dcd3eef3..f3843784ac 100644
--- a/Perspex.Diagnostics/LogManager.cs
+++ b/Perspex.Diagnostics/LogManager.cs
@@ -53,8 +53,8 @@ namespace Perspex.Diagnostics
 
         public IFullLogger GetLogger(Type type)
         {
-            if ((type == typeof(PerspexObject) && LogPropertyMessages) ||
-                (type == typeof(Layoutable) && LogLayoutMessages))
+            if ((type == typeof(PerspexObject) && this.LogPropertyMessages) ||
+                (type == typeof(Layoutable) && this.LogLayoutMessages))
             {
                 return new WrappingFullLogger(this.Logger, type);
             }
diff --git a/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
index 91e89ecee9..e60fff019f 100644
--- a/Perspex.Diagnostics/Perspex.Diagnostics.csproj
+++ b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
@@ -15,6 +15,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>4c22110b</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -98,6 +99,13 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Perspex.Diagnostics/Properties/AssemblyInfo.cs b/Perspex.Diagnostics/Properties/AssemblyInfo.cs
index 77fa382618..65270a3446 100644
--- a/Perspex.Diagnostics/Properties/AssemblyInfo.cs
+++ b/Perspex.Diagnostics/Properties/AssemblyInfo.cs
@@ -1,7 +1,11 @@
-using System.Resources;
+// -----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Resources;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
diff --git a/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs b/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
index 1a0d90bf88..cd96c02f8a 100644
--- a/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
+++ b/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
@@ -37,7 +37,7 @@ namespace Perspex.Diagnostics.ViewModels
                     }
                     else
                     {
-                        this.Classes = "";
+                        this.Classes = string.Empty;
                     }
                 });
             }
diff --git a/Perspex.Diagnostics/packages.config b/Perspex.Diagnostics/packages.config
index eff7ad5772..59f5ceccf7 100644
--- a/Perspex.Diagnostics/packages.config
+++ b/Perspex.Diagnostics/packages.config
@@ -8,4 +8,5 @@
   <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
   <package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
+  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Windows/Perspex.Direct2D1/Direct2D1Platform.cs b/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
index 9199583e6b..d66363cc43 100644
--- a/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
+++ b/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
@@ -18,11 +18,16 @@ namespace Perspex.Direct2D1
 
         private static SharpDX.Direct2D1.Factory d2d1Factory = new SharpDX.Direct2D1.Factory();
 
-        private static SharpDX.DirectWrite.Factory dwFactory = new SharpDX.DirectWrite.Factory();
+        private static SharpDX.DirectWrite.Factory dwfactory = new SharpDX.DirectWrite.Factory();
 
         private static SharpDX.WIC.ImagingFactory imagingFactory = new SharpDX.WIC.ImagingFactory();
 
-        private static TextService textService = new TextService(dwFactory);
+        private static TextService textService = new TextService(dwfactory);
+
+        public ITextService TextService
+        {
+            get { return textService; }
+        }
 
         public static void Initialize()
         {
@@ -30,15 +35,10 @@ namespace Perspex.Direct2D1
             locator.Register(() => instance, typeof(IPlatformRenderInterface));
             locator.Register(() => textService, typeof(ITextService));
             locator.Register(() => d2d1Factory, typeof(SharpDX.Direct2D1.Factory));
-            locator.Register(() => dwFactory, typeof(SharpDX.DirectWrite.Factory));
+            locator.Register(() => dwfactory, typeof(SharpDX.DirectWrite.Factory));
             locator.Register(() => imagingFactory, typeof(SharpDX.WIC.ImagingFactory));
         }
 
-        public ITextService TextService
-        {
-            get { return textService; }
-        }
-
         public IBitmapImpl CreateBitmap(int width, int height)
         {
             return new BitmapImpl(imagingFactory, width, height);
diff --git a/Windows/Perspex.Direct2D1/Media/DrawingContext.cs b/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
index 31a9f7604a..d02477cc95 100644
--- a/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
+++ b/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
@@ -46,8 +46,8 @@ namespace Perspex.Direct2D1.Media
 
         public Matrix CurrentTransform
         {
-            get { return Convert(this.renderTarget.Transform); }
-            set { this.renderTarget.Transform = Convert(value); }
+            get { return this.Convert(this.renderTarget.Transform); }
+            set { this.renderTarget.Transform = this.Convert(value); }
         }
 
         /// <summary>
diff --git a/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs b/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
index 7a93a434e2..7fedd1fab3 100644
--- a/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -76,7 +76,7 @@ namespace Perspex.Direct2D1.Media
 
             using (FileStream s = new FileStream(fileName, FileMode.Create))
             {
-                PngBitmapEncoder encoder = new PngBitmapEncoder(factory);
+                PngBitmapEncoder encoder = new PngBitmapEncoder(this.factory);
                 encoder.Initialize(s);
 
                 BitmapFrameEncode frame = new BitmapFrameEncode(encoder);
diff --git a/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs b/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
index bacb55ab66..ddd903f1ec 100644
--- a/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
+++ b/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Direct2D1StreamGeometryContext.cs" company="Steven Kirk">
+// <copyright file="StreamGeometryContextImpl.cs" company="Steven Kirk">
 // Copyright 2013 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs b/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
index 4460f8f4a7..7452a74024 100644
--- a/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Direct2DStreamGeometry.cs" company="Steven Kirk">
+// <copyright file="StreamGeometryImpl.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -25,17 +25,17 @@ namespace Perspex.Direct2D1.Media
 
         public override Rect Bounds
         {
-            get { return geometry.GetBounds().ToPerspex(); }
+            get { return this.geometry.GetBounds().ToPerspex(); }
         }
 
         public override Rect GetRenderBounds(double strokeThickness)
         {
-            return geometry.GetWidenedBounds((float)strokeThickness).ToPerspex();
+            return this.geometry.GetWidenedBounds((float)strokeThickness).ToPerspex();
         }
 
         public IStreamGeometryContextImpl Open()
         {
-            return new StreamGeometryContextImpl(geometry.Open());
+            return new StreamGeometryContextImpl(this.geometry.Open());
         }
     }
 }
diff --git a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index 07e4bb1800..e936f0f84c 100644
--- a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Perspex.Direct2D1</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>3a241101</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>48ceee32</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -99,7 +99,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
+    <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
   </Target>
+  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Windows/Perspex.Direct2D1/TextService.cs b/Windows/Perspex.Direct2D1/TextService.cs
index 054c48f04a..b4673d6427 100644
--- a/Windows/Perspex.Direct2D1/TextService.cs
+++ b/Windows/Perspex.Direct2D1/TextService.cs
@@ -43,7 +43,7 @@ namespace Perspex.Direct2D1
 
         public int GetCaretIndex(FormattedText text, Point point, Size constraint)
         {
-            using (TextLayout layout = GetTextLayout(this.factory, text, constraint))
+            using (TextLayout layout = this.GetTextLayout(this.factory, text, constraint))
             {
                 SharpDX.Bool isTrailingHit;
                 SharpDX.Bool isInside;
@@ -60,7 +60,7 @@ namespace Perspex.Direct2D1
 
         public Point GetCaretPosition(FormattedText text, int caretIndex, Size constraint)
         {
-            using (TextLayout layout = GetTextLayout(this.factory, text, constraint))
+            using (TextLayout layout = this.GetTextLayout(this.factory, text, constraint))
             {
                 float x;
                 float y;
@@ -71,7 +71,7 @@ namespace Perspex.Direct2D1
 
         public double[] GetLineHeights(FormattedText text, Size constraint)
         {
-            using (TextLayout layout = GetTextLayout(this.factory, text, constraint))
+            using (TextLayout layout = this.GetTextLayout(this.factory, text, constraint))
             {
                 return layout.GetLineMetrics().Select(x => (double)x.Height).ToArray();
             }
@@ -79,7 +79,7 @@ namespace Perspex.Direct2D1
 
         public Size Measure(FormattedText text, Size constraint)
         {
-            using (TextLayout layout = GetTextLayout(this.factory, text, constraint))
+            using (TextLayout layout = this.GetTextLayout(this.factory, text, constraint))
             {
                 return new Size(
                     layout.Metrics.WidthIncludingTrailingWhitespace,
diff --git a/Windows/Perspex.Direct2D1/packages.config b/Windows/Perspex.Direct2D1/packages.config
index 7fa020bb4c..5cfa7e2de9 100644
--- a/Windows/Perspex.Direct2D1/packages.config
+++ b/Windows/Perspex.Direct2D1/packages.config
@@ -7,4 +7,5 @@
   <package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />
   <package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" />
   <package id="Splat" version="1.5.1" targetFramework="net45" />
+  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file