Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -24,7 +24,6 @@
 
 using Core.Components.Gis.Data;
 using DotSpatial.Controls;
-using DotSpatial.Data;
 
 namespace Core.Components.DotSpatial.Converter
 {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs	(.../MapDataFactory.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs	(.../MapDataFactory.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -25,7 +25,6 @@
 
 using Core.Components.Gis.Data;
 using DotSpatial.Controls;
-using DotSpatial.Data;
 
 namespace Core.Components.DotSpatial.Converter
 {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -42,8 +42,10 @@
 
             featureSet.Features.Add(lineString);
 
-            var layer = new MapLineLayer(featureSet);
-            layer.IsVisible = data.IsVisible;
+            var layer = new MapLineLayer(featureSet)
+            {
+                IsVisible = data.IsVisible
+            };
 
             return new List<IMapFeatureLayer>
             {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs	(.../MapMultiLineDataConverter.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs	(.../MapMultiLineDataConverter.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -46,8 +46,10 @@
                 featureSet.Features.Add(lineString);
             }
 
-            var layer = new MapLineLayer(featureSet);
-            layer.IsVisible = data.IsVisible;
+            var layer = new MapLineLayer(featureSet)
+            {
+                IsVisible = data.IsVisible
+            };
 
             return new List<IMapFeatureLayer>
             {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -42,8 +42,10 @@
                 featureSet.Features.Add(new Coordinate(point.X, point.Y));
             }
 
-            var layer = new MapPointLayer(featureSet);
-            layer.IsVisible = data.IsVisible;
+            var layer = new MapPointLayer(featureSet)
+            {
+                IsVisible = data.IsVisible
+            };
 
             return new List<IMapFeatureLayer>
             {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -42,8 +42,10 @@
 
             featureSet.Features.Add(polygon);
 
-            var layer = new MapPolygonLayer(featureSet);
-            layer.IsVisible = data.IsVisible;
+            var layer = new MapPolygonLayer(featureSet)
+            {
+                IsVisible = data.IsVisible
+            };
 
             return new List<IMapFeatureLayer>
             {
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -40,42 +40,10 @@
       <HintPath>..\..\..\..\packages\DotSpatial.Data.1.7\lib\net40-Client\DotSpatial.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DotSpatial.Data.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=53ab5a198378d4c1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Data.Forms.1.7\lib\net40-Client\DotSpatial.Data.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Extensions, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Extensions.1.7\lib\net40-Client\DotSpatial.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Modeling.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=712bef29a31a9354, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Modeling.Forms.1.7\lib\net40-Client\DotSpatial.Modeling.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Mono, Version=1.7.0.0, Culture=neutral, PublicKeyToken=425ba4de41127026, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Mono.1.7\lib\net40-Client\DotSpatial.Mono.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Projections, Version=1.7.0.0, Culture=neutral, PublicKeyToken=272632bddd08a38b, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Projections.1.7\lib\net40-Client\DotSpatial.Projections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Projections.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=52099474f11b7ff0, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Projections.Forms.1.7\lib\net40-Client\DotSpatial.Projections.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Serialization, Version=1.7.0.0, Culture=neutral, PublicKeyToken=441f200f827611e7, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Serialization.1.7\lib\net40-Client\DotSpatial.Serialization.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="DotSpatial.Symbology, Version=1.7.0.0, Culture=neutral, PublicKeyToken=6178c08da7998387, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\DotSpatial.Symbology.1.7\lib\net40-Client\DotSpatial.Symbology.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DotSpatial.Symbology.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=0544cdeefb662382, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Symbology.Forms.1.7\lib\net40-Client\DotSpatial.Symbology.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="DotSpatial.Topology, Version=1.7.0.0, Culture=neutral, PublicKeyToken=a66b5e9434ca3671, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\DotSpatial.Topology.1.7\lib\net40-Client\DotSpatial.Topology.dll</HintPath>
       <Private>True</Private>
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -47,42 +47,10 @@
       <HintPath>..\..\..\..\packages\DotSpatial.Data.1.7\lib\net40-Client\DotSpatial.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DotSpatial.Data.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=53ab5a198378d4c1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Data.Forms.1.7\lib\net40-Client\DotSpatial.Data.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Extensions, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Extensions.1.7\lib\net40-Client\DotSpatial.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Modeling.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=712bef29a31a9354, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Modeling.Forms.1.7\lib\net40-Client\DotSpatial.Modeling.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Mono, Version=1.7.0.0, Culture=neutral, PublicKeyToken=425ba4de41127026, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Mono.1.7\lib\net40-Client\DotSpatial.Mono.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Projections, Version=1.7.0.0, Culture=neutral, PublicKeyToken=272632bddd08a38b, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Projections.1.7\lib\net40-Client\DotSpatial.Projections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Projections.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=52099474f11b7ff0, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Projections.Forms.1.7\lib\net40-Client\DotSpatial.Projections.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="DotSpatial.Serialization, Version=1.7.0.0, Culture=neutral, PublicKeyToken=441f200f827611e7, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Serialization.1.7\lib\net40-Client\DotSpatial.Serialization.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="DotSpatial.Symbology, Version=1.7.0.0, Culture=neutral, PublicKeyToken=6178c08da7998387, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\DotSpatial.Symbology.1.7\lib\net40-Client\DotSpatial.Symbology.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DotSpatial.Symbology.Forms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=0544cdeefb662382, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\DotSpatial.Symbology.Forms.1.7\lib\net40-Client\DotSpatial.Symbology.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="DotSpatial.Topology, Version=1.7.0.0, Culture=neutral, PublicKeyToken=a66b5e9434ca3671, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\DotSpatial.Topology.1.7\lib\net40-Client\DotSpatial.Topology.dll</HintPath>
       <Private>True</Private>
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -rc5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2 -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision c5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -110,7 +110,7 @@
 
         [TestCase(true)]
         [TestCase(false)]
-        public void LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
+        public void OnNodeChecked_LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
         {
             // Setup
             var mocks = new MockRepository();
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs
===================================================================
diff -u -rc5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2 -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision c5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -110,7 +110,7 @@
 
         [TestCase(true)]
         [TestCase(false)]
-        public void LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
+        public void OnNodeChecked_LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
         {
             // Setup
             var mocks = new MockRepository();
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs
===================================================================
diff -u -rc5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2 -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision c5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
@@ -110,7 +110,7 @@
 
         [TestCase(true)]
         [TestCase(false)]
-        public void LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
+        public void OnNodeChecked_LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
         {
             // Setup
             var mocks = new MockRepository();