diff --git a/EtchBendLines/BendLineExtractor.cs b/EtchBendLines/BendLineExtractor.cs
index fc62ee3..f79119c 100644
--- a/EtchBendLines/BendLineExtractor.cs
+++ b/EtchBendLines/BendLineExtractor.cs
@@ -68,7 +68,18 @@ namespace EtchBendLines
 
         private bool IsBendLine(Line line)
         {
-            return line.Linetype.Name == "CENTERX2" && line.Layer.Name == "BEND";
+            if (line.Linetype.Name != "CENTERX2")
+                return false;
+
+            switch (line.Layer.Name.ToUpperInvariant())
+            {
+                case "BEND":
+                case "BEND LINES":
+                case "BENDLINES":
+                    return true;
+                default:
+                    return false;
+            }
         }
 
         private List<MText> GetBendNotes()
diff --git a/EtchBendLines/EtchBendLines.csproj b/EtchBendLines/EtchBendLines.csproj
index d85932b..7864aa4 100644
--- a/EtchBendLines/EtchBendLines.csproj
+++ b/EtchBendLines/EtchBendLines.csproj
@@ -1,69 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{229C2FB9-6AD6-4A5D-B83A-D1146573D6F9}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <OutputType>Library</OutputType>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
     <RootNamespace>EtchBendLines</RootNamespace>
     <AssemblyName>EtchBendLines</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NoWin32Manifest>true</NoWin32Manifest>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="AppConfig.cs" />
-    <Compile Include="Bend.cs" />
-    <Compile Include="BendDirection.cs" />
-    <Compile Include="BendLineExtractor.cs" />
-    <Compile Include="Etcher.cs" />
-    <Compile Include="Extensions.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\netDxf\netDxf\netDxf.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\netDxf\netDxf\netDxf.csproj">
-      <Project>{785380e0-ceb9-4c34-82e5-60d0e33e848e}</Project>
-      <Name>netDxf</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/EtchBendLines/Etcher.cs b/EtchBendLines/Etcher.cs
index 9a9f6ff..5b9ea95 100644
--- a/EtchBendLines/Etcher.cs
+++ b/EtchBendLines/Etcher.cs
@@ -40,12 +40,10 @@ namespace EtchBendLines
             }
         }
 
-        private IEnumerable<Bend> ExtractUpBends(DxfDocument doc)
+        private List<Bend> ExtractBends(DxfDocument doc)
         {
-            // your existing BendLineExtractor logic
             var extractor = new BendLineExtractor(doc);
-            return extractor.GetBendLines()
-                            .Where(b => b.Direction == BendDirection.Up);
+            return extractor.GetBendLines();
         }
 
         private HashSet<string> BuildExistingKeySet(DxfDocument doc)
@@ -93,7 +91,15 @@ namespace EtchBendLines
             Console.WriteLine(filePath);
 
             var doc = LoadDocument(filePath);
-            var upBends = ExtractUpBends(doc);
+            var bends = ExtractBends(doc);
+
+            // Ensure all bend lines are on the BEND layer
+            foreach (var bend in bends)
+            {
+                bend.Line.Layer = BendLayer;
+            }
+
+            var upBends = bends.Where(b => b.Direction == BendDirection.Up);
             var existing = BuildExistingKeySet(doc);
 
             InsertEtchLines(doc, upBends, existing, etchLength);
@@ -119,7 +125,7 @@ namespace EtchBendLines
             }
         }
 
-        private IEnumerable<Line> GetEtchLines(Line bendLine, double etchLength)
+        private List<Line> GetEtchLines(Line bendLine, double etchLength)
         {
             var lines = new List<Line>();
 
@@ -176,7 +182,7 @@ namespace EtchBendLines
                 line.Layer = EtchLayer;
             }
 
-            yield break;
+            return lines;
         }
     }
 }