diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 985ec0b61..90cdf13fc 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -8,35 +8,21 @@
         <Copyright>Copyright © Robert Beekman - 2020</Copyright>
         <OutputPath>bin\</OutputPath>
         <Platforms>x64</Platforms>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-        <PlatformTarget>x64</PlatformTarget>
-        <DocumentationFile>bin\Artemis.Core.xml</DocumentationFile>
-        <NoWarn></NoWarn>
-        <WarningLevel>5</WarningLevel>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageId>ArtemisRGB.Core</PackageId>
+        <!-- API Version -->
+        <VersionPrefix>1.0.0.0</VersionPrefix>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <NrtRevisionFormat>1.0-{chash:6}</NrtRevisionFormat>
-        <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-        <NrtResolveInformationalAttribute>true</NrtResolveInformationalAttribute>
-        <NrtResolveCopyright>true</NrtResolveCopyright>
-        <NrtTagMatch>v[0-9]*</NrtTagMatch>
-        <NrtRemoveTagV>true</NrtRemoveTagV>
-        <NrtRequiredVcs>git</NrtRequiredVcs>
-        <NrtShowRevision>true</NrtShowRevision>
-        <Nullable>enable</Nullable>
-        <AnalysisLevel>latest</AnalysisLevel>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <DocumentationFile>bin\Artemis.Core.xml</DocumentationFile>
-    </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Artemis.Storage\Artemis.Storage.csproj">
-            <Private>false</Private>
-        </ProjectReference>
+        <ProjectReference Include="..\Artemis.Storage\Artemis.Storage.csproj"/>
+        <ProjectReference Condition="'$(BuildingNuget)' == 'True'" Update="..\Artemis.Storage\Artemis.Storage.csproj" PrivateAssets="All"/>
+        <_PackageFiles Include="$(OutputPath)\Artemis.Storage.dll">
+            <BuildAction>None</BuildAction>
+            <PackagePath>lib\$(TargetFramework)</PackagePath>
+        </_PackageFiles>
     </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="EmbedIO" Version="3.4.3" />
         <PackageReference Include="HidSharp" Version="2.1.0" />
@@ -59,20 +45,10 @@
         <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
         <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="Resources\intro-profile.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
     </ItemGroup>
 
     <ItemGroup>
-        <None Update="DefaultLayouts\**">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
+        <None Include="Resources/intro-profile.json" CopyToOutputDirectory="PreserveNewest" />
+        <None Include="DefaultLayouts/**" CopyToOutputDirectory="PreserveNewest" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj
index 799752473..2e7bb99ae 100644
--- a/src/Artemis.Storage/Artemis.Storage.csproj
+++ b/src/Artemis.Storage/Artemis.Storage.csproj
@@ -4,9 +4,6 @@
         <PreserveCompilationContext>false</PreserveCompilationContext>
         <Platforms>x64</Platforms>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-        <PlatformTarget>x64</PlatformTarget>
-    </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="LiteDB" Version="5.0.12" />
diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
index 9ed28b35d..54d227c86 100644
--- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
+++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
@@ -6,7 +6,8 @@
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>
-        <AssemblyTitle>Artemis 2</AssemblyTitle>
+        <AssemblyTitle>Artemis</AssemblyTitle>
+        <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
         <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>        
     </PropertyGroup>
     <ItemGroup>
diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
index 53c850bdf..143c04393 100644
--- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
+++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
@@ -6,7 +6,7 @@
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>
-        <AssemblyTitle>Artemis 2</AssemblyTitle>
+        <AssemblyTitle>Artemis</AssemblyTitle>
         <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 229e3ed0e..66fe3e2c7 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -1,19 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <ApplicationIcon />
-        <StartupObject />
         <OutputPath>bin\</OutputPath>
-        <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageId>ArtemisRGB.UI.Shared</PackageId>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-        <DocumentationFile>bin\Artemis.UI.Avalonia.Shared.xml</DocumentationFile>
-    </PropertyGroup>
-    <ItemGroup>
-    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="0.10.18" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
@@ -31,12 +26,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
     </ItemGroup>
-    <ItemGroup>
-        <Compile Update="Controls\HotkeyBox.axaml.cs">
-            <DependentUpon>HotkeyBox.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Services\Window\ExceptionDialogView.axaml.cs">
-            <DependentUpon>%(Filename)</DependentUpon>
-        </Compile>
-    </ItemGroup>
 </Project>
diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
index 55d394750..f9985abca 100644
--- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
+++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
@@ -3,11 +3,10 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <OutputPath>bin</OutputPath>
         <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
-        <AssemblyTitle>Artemis 2</AssemblyTitle>
+        <AssemblyTitle>Artemis</AssemblyTitle>
         <ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>
     </PropertyGroup>
     <ItemGroup>
@@ -27,7 +26,7 @@
         <None Remove="Assets\Cursors\aero_rotate_tl.cur" />
         <None Remove="Assets\Cursors\aero_rotate_tr.cur" />
         <None Include="..\Artemis.UI\Assets\Images\Logo\application.ico">
-          <Link>application.ico</Link>
+            <Link>application.ico</Link>
         </None>
     </ItemGroup>
     <ItemGroup>
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 5740fe5e8..c568a677c 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -3,18 +3,16 @@
         <OutputType>Library</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <OutputPath>bin\</OutputPath>
-        <PlatformTarget>x64</PlatformTarget>
+        <OutputPath>bin/</OutputPath>
         <Platforms>x64</Platforms>
     </PropertyGroup>
+    
     <ItemGroup>
-        <AvaloniaResource Include="Assets\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <None Remove="Artemis.UI.Avalonia.csproj.DotSettings" />
-        <None Remove="Artemis.UI.csproj.DotSettings" />
-        <None Remove="Assets\Images\Logo\application.ico" />
+        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
+        <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
+        <ProjectReference Include="..\Artemis.VisualScripting\Artemis.VisualScripting.csproj" />
     </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="0.10.18" />
         <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="10.14.0" />
@@ -36,56 +34,8 @@
         <PackageReference Include="SkiaSharp" Version="2.88.1-preview.108" />
         <PackageReference Include="Splat.Ninject" Version="14.4.1" />
     </ItemGroup>
+
     <ItemGroup>
-        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
-        <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
-        <ProjectReference Include="..\Artemis.VisualScripting\Artemis.VisualScripting.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Assets\Images\Logo\bow-white.ico" />
-        <Content Include="Assets\Images\Logo\bow.ico" />
-    </ItemGroup>
-    <ItemGroup>
-        <Resource Include="Assets\Images\Logo\bow-black.ico" />
-        <Resource Include="Assets\Images\Logo\bow-white.ico" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Update="DefaultTypes\PropertyInput\StringPropertyInputView.axaml.cs">
-            <DependentUpon>StringPropertyInputView.xaml</DependentUpon>
-        </Compile>
-        <Compile Update="Screens\ProfileEditor\Panels\Properties\PropertiesView.axaml.cs">
-            <DependentUpon>PropertiesView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Screens\ProfileEditor\Panels\VisualEditor\Visualizers\LayerShapeVisualizerView.axaml.cs">
-            <DependentUpon>LayerShapeVisualizerView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Screens\VisualScripting\DragCableView.axaml.cs">
-            <DependentUpon>DragCableView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Screens\VisualScripting\NodeScriptWindowView.axaml.cs">
-            <DependentUpon>NodeScriptWindowView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Screens\ProfileEditor\Panels\Properties\Tree\ContentDialogs\LayerEffectRenameView.axaml.cs">
-            <DependentUpon>LayerEffectRenameView.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Update="Screens\ProfileEditor\Panels\Properties\Tree\ContentDialogs\SidebarCategoryEditView.axaml.cs">
-            <DependentUpon>SidebarCategoryEditView.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Update="Screens\Scripting\Dialogs\ScriptConfigurationEditView.axaml.cs">
-            <DependentUpon>ScriptConfigurationEditView.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
-        <AvaloniaXaml Update="DefaultTypes\PropertyInput\StringPropertyInputView.axaml">
-            <Generator>MSBuild:Compile</Generator>
-        </AvaloniaXaml>
-    </ItemGroup>
-    <ItemGroup>
-      <Reference Include="SkiaSharp">
-        <HintPath>..\..\..\..\Users\Robert\.nuget\packages\skiasharp\2.88.1-preview.1\lib\netstandard2.0\SkiaSharp.dll</HintPath>
-      </Reference>
+        <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
index 67b919382..ddfbc38c5 100644
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@@ -23,23 +23,4 @@
         <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Update="Nodes\Easing\Screens\EasingTypeNodeEasingView.axaml.cs">
-            <DependentUpon>EasingTypeNodeEasingView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Nodes\Static\Screens\StaticStringValueNodeCustomView.axaml.cs">
-            <DependentUpon>StaticStringValueNodeCustomView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Nodes\DataModel\Screens\DataModelNodeCustomView.axaml.cs">
-            <DependentUpon>DataModelNodeCustomView.axaml</DependentUpon>
-        </Compile>
-        <Compile Update="Nodes\DataModel\Screens\DataModelEventNodeCustomView.axaml.cs">
-          <DependentUpon>DataModelEventNodeCustomView.axaml</DependentUpon>
-          <SubType>Code</SubType>
-        </Compile>
-        <Compile Update="Nodes\Color\Screens\ColorGradientNodeCustomView.axaml.cs">
-          <DependentUpon>ColorGradientNodeCustomView.axaml</DependentUpon>
-        </Compile>
-    </ItemGroup>
-
 </Project>