diff --git a/.gitignore b/.gitignore
index 0570523..bb30d9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,9 @@ DocProject/Help/html
 # Click-Once directory
 publish/
 
+# Visual studio settings directory
+.vs/
+
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..523f392
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "netDxf"]
+	path = netDxf
+	url = https://github.com/haplokuon/netDxf.git
diff --git a/PepLib.Dxf/DxfConverter.cs b/PepLib.Dxf/DxfConverter.cs
index 6737ca8..36a3290 100644
--- a/PepLib.Dxf/DxfConverter.cs
+++ b/PepLib.Dxf/DxfConverter.cs
@@ -27,7 +27,7 @@ namespace PepLib.Dxf
 
             rapidLayer = new Layer("Rapid");
             rapidLayer.Color = AciColor.Blue;
-            rapidLayer.LineType = LineType.Dashed;
+            rapidLayer.Linetype = Linetype.Dashed;
 
             plateLayer = new Layer("Plate");
             plateLayer.Color = AciColor.Cyan;
diff --git a/PepLib.Dxf/PepLib.Dxf.csproj b/PepLib.Dxf/PepLib.Dxf.csproj
index 11d81b5..184d6a7 100644
--- a/PepLib.Dxf/PepLib.Dxf.csproj
+++ b/PepLib.Dxf/PepLib.Dxf.csproj
@@ -33,9 +33,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="netDxf">
-      <HintPath>..\..\lib\netDxf.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -45,6 +42,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\netDxf\netDxf\netDxf.csproj">
+      <Project>{785380e0-ceb9-4c34-82e5-60d0e33e848e}</Project>
+      <Name>netDxf</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PepLib\PepLib.csproj">
       <Project>{22360453-B878-49FA-A5DC-0D9C577DE902}</Project>
       <Name>PepLib</Name>
diff --git a/PepLib.Dxf/lib/netDxf.dll b/PepLib.Dxf/lib/netDxf.dll
deleted file mode 100644
index 07d43fd..0000000
Binary files a/PepLib.Dxf/lib/netDxf.dll and /dev/null differ
diff --git a/PepLib.sln b/PepLib.sln
index b88be71..09835ac 100644
--- a/PepLib.sln
+++ b/PepLib.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepLib", "PepLib\PepLib.csproj", "{22360453-B878-49FA-A5DC-0D9C577DE902}"
 EndProject
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepLib.Dxf", "PepLib.Dxf\Pe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepLib.UI", "PepLib.UI\PepLib.UI.csproj", "{7A7D21F5-8EF1-4A63-A65B-86D10BEDFC2A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "netDxf", "netDxf\netDxf\netDxf.csproj", "{785380E0-CEB9-4C34-82E5-60D0E33E848E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,8 +29,15 @@ Global
 		{7A7D21F5-8EF1-4A63-A65B-86D10BEDFC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A7D21F5-8EF1-4A63-A65B-86D10BEDFC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A7D21F5-8EF1-4A63-A65B-86D10BEDFC2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{785380E0-CEB9-4C34-82E5-60D0E33E848E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{785380E0-CEB9-4C34-82E5-60D0E33E848E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{785380E0-CEB9-4C34-82E5-60D0E33E848E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{785380E0-CEB9-4C34-82E5-60D0E33E848E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F01261B9-29C3-4237-BE68-03EF8DCEC2B2}
+	EndGlobalSection
 EndGlobal
diff --git a/netDxf b/netDxf
new file mode 160000
index 0000000..9ec082c
--- /dev/null
+++ b/netDxf
@@ -0,0 +1 @@
+Subproject commit 9ec082c92f2d6f459332c422941a8b89fc5cb94f