diff --git a/Quest Map.sln b/Quest Map.sln
index 5f0539f..3c804bd 100644
--- a/Quest Map.sln	
+++ b/Quest Map.sln	
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quest Map", "Quest Map\Quest Map.csproj", "{63ACA302-ADBE-4353-A722-D38531C8A34D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestMap", "QuestMap\QuestMap.csproj", "{63ACA302-ADBE-4353-A722-D38531C8A34D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Quest Map/Commands.cs b/QuestMap/Commands.cs
similarity index 100%
rename from Quest Map/Commands.cs
rename to QuestMap/Commands.cs
diff --git a/Quest Map/Configuration.cs b/QuestMap/Configuration.cs
similarity index 100%
rename from Quest Map/Configuration.cs
rename to QuestMap/Configuration.cs
diff --git a/Quest Map/GraphInfo.cs b/QuestMap/GraphInfo.cs
similarity index 100%
rename from Quest Map/GraphInfo.cs
rename to QuestMap/GraphInfo.cs
diff --git a/Quest Map/Node.cs b/QuestMap/Node.cs
similarity index 100%
rename from Quest Map/Node.cs
rename to QuestMap/Node.cs
diff --git a/Quest Map/Plugin.cs b/QuestMap/Plugin.cs
similarity index 100%
rename from Quest Map/Plugin.cs
rename to QuestMap/Plugin.cs
diff --git a/Quest Map/PluginUi.cs b/QuestMap/PluginUi.cs
similarity index 100%
rename from Quest Map/PluginUi.cs
rename to QuestMap/PluginUi.cs
diff --git a/Quest Map/QuestData.cs b/QuestMap/QuestData.cs
similarity index 100%
rename from Quest Map/QuestData.cs
rename to QuestMap/QuestData.cs
diff --git a/Quest Map/Quest Map.csproj b/QuestMap/QuestMap.csproj
similarity index 54%
rename from Quest Map/Quest Map.csproj
rename to QuestMap/QuestMap.csproj
index 251df28..3619e8a 100755
--- a/Quest Map/Quest Map.csproj	
+++ b/QuestMap/QuestMap.csproj
@@ -1,52 +1,57 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5-windows</TargetFramework>
+        <TargetFramework>net6-windows</TargetFramework>
         <RootNamespace>QuestMap</RootNamespace>
         <Version>1.4.2</Version>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-        <IgnoredLints>
-            D0008
-        </IgnoredLints>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev</DalamudLibPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
+        <DalamudLibPath>$(DALAMUD_HOME)</DalamudLibPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(IsCI)' == 'true'">
+        <DalamudLibPath>$(HOME)/dalamud</DalamudLibPath>
     </PropertyGroup>
 
     <ItemGroup>
         <Reference Include="Dalamud">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Dalamud.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGui.NET">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGuiScene">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\ImGuiScene.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Lumina">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Lumina.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Lumina.Excel">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Lumina.Excel.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
-        <PackageReference Include="DalamudLinter" Version="1.0.3"/>
-        <PackageReference Include="DalamudPackager" Version="2.1.6"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.7"/>
         <PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
-        <PackageReference Include="XivCommon" Version="5.0.1-alpha.1"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Content Include="..\icon.png" Link="images/icon.png" CopyToOutputDirectory="PreserveNewest" Visible="false"/>
+        <PackageReference Include="XivCommon" Version="6.0.0"/>
     </ItemGroup>
 
 </Project>
diff --git a/Quest Map/Quest Map.yaml b/QuestMap/QuestMap.yaml
similarity index 96%
rename from Quest Map/Quest Map.yaml
rename to QuestMap/QuestMap.yaml
index 6a4440d..e7efdf4 100644
--- a/Quest Map/Quest Map.yaml	
+++ b/QuestMap/QuestMap.yaml
@@ -12,3 +12,4 @@ description: |-
   Icons: treasure map by Anthony Ledoux from the Noun Project and
   locked book by Anthony Ledoux from the Noun Project
 repo_url: https://git.annaclemens.io/ascclemens/QuestMap
+dalamud_api_level: 7
diff --git a/Quest Map/Quests.cs b/QuestMap/Quests.cs
similarity index 100%
rename from Quest Map/Quests.cs
rename to QuestMap/Quests.cs
diff --git a/Quest Map/Util.cs b/QuestMap/Util.cs
similarity index 100%
rename from Quest Map/Util.cs
rename to QuestMap/Util.cs
diff --git a/Quest Map/Visibility.cs b/QuestMap/Visibility.cs
similarity index 100%
rename from Quest Map/Visibility.cs
rename to QuestMap/Visibility.cs
diff --git a/QuestMap/packages.lock.json b/QuestMap/packages.lock.json
new file mode 100644
index 0000000..4aac5df
--- /dev/null
+++ b/QuestMap/packages.lock.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net6.0-windows7.0": {
+      "AutomaticGraphLayout": {
+        "type": "Direct",
+        "requested": "[1.1.12, )",
+        "resolved": "1.1.12",
+        "contentHash": "Txc1uVLwnKemnPWmGSAVSZaBR95VTxU7/LfarvSOuJC6KuwPW4xrLpIGTOUbCXYZiSnkxN2jiC3FwX/2051+9g=="
+      },
+      "DalamudPackager": {
+        "type": "Direct",
+        "requested": "[2.1.7, )",
+        "resolved": "2.1.7",
+        "contentHash": "jnZ/sdInyn07ycuWI+pPOtP/xE3v+c4+jYJfDt36FWnBF9NKqkpzfviJtPl/jGLgbaCmFIXu+Yid0N8GvdKefg=="
+      },
+      "System.Threading.Channels": {
+        "type": "Direct",
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
+      },
+      "XivCommon": {
+        "type": "Direct",
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "8HwrC7mnkcaP+JxRoIIu9MqFElQRVL8HOr8EQ6Te+11zzvKoXTZZrZ7VWETF2CHfB+7c1v5wONZKqZJ2hETpjg=="
+      }
+    }
+  }
+}
\ No newline at end of file