diff --git a/.github/workflows/patcher.yml b/.github/workflows/patcher.yml
index 71effe885..60ad19a41 100644
--- a/.github/workflows/patcher.yml
+++ b/.github/workflows/patcher.yml
@@ -8,25 +8,32 @@ on:
     branches: [ "v*", "master" ]
     paths: [ "patcher/**/*" ]
 
+env:
+  DOTNET_VERSION: 8.x
+
 jobs:
   build:
     name: Build Patcher
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          persist-credentials: false
 
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Build Patcher
-        run: msbuild.exe patcher\HitmanPatcher.sln -t:Build -p:Configuration=Release -p:Platform=x64 -m
+        run: |
+          export DOTNET_NOLOGO=true
+          export DOTNET_CLI_TELEMETRY_OPTOUT=true
+          cd patcher
+          dotnet publish HitmanPatcher/HitmanPatcher.csproj -c Release -p DebugType=none -o Publish/Windows
 
-      - name: Upload Patcher Artifacts
+      - name: Upload patcher-windows
         uses: actions/upload-artifact@v4
         with:
           name: patcher-windows
-          path: patcher/bin/x64/Release/PeacockPatcher.exe
+          path: patcher/Publish/Windows/ILRepack
diff --git a/patcher/AOBScanner.cs b/patcher/HitmanPatcher.Core/AOBScanner.cs
similarity index 92%
rename from patcher/AOBScanner.cs
rename to patcher/HitmanPatcher.Core/AOBScanner.cs
index bbe396230..3047f8e57 100644
--- a/patcher/AOBScanner.cs
+++ b/patcher/HitmanPatcher.Core/AOBScanner.cs
@@ -68,6 +68,15 @@ public static bool TryGetHitmanVersionByScanning(Process process,
                     tasks =>
                         tasks.Select(task => task.Result)
                             .Where(x => x != null));
+            
+            Task<IEnumerable<Patch[]>> getDynresEnablePatches =
+                Task.Factory.ContinueWhenAll(new Task<Patch[]>[]
+                    {
+                        findDynresEnable(exeData),
+                    },
+                    tasks =>
+                        tasks.Select(task => task.Result)
+                            .Where(x => x != null));
 
 
             Task<IEnumerable<Patch[]>>[] alltasks =
@@ -76,11 +85,13 @@ public static bool TryGetHitmanVersionByScanning(Process process,
                 getProtocolPatches, getDynresForceofflinePatches
             };
             // ReSharper disable once CoVariantArrayConversion
-            Task.WaitAll(alltasks);
+            Task.WaitAll([..alltasks, getDynresEnablePatches]);
 
             bench.Stop();
-            Console.WriteLine(bench.Elapsed.ToString());
-
+#if DEBUG
+            Compositions.Logger.log(bench.Elapsed.ToString());
+#endif
+            
             // error out if any task does not have exactly 1 result
             if (alltasks.Any(task => task.Result.Count() != 1))
             {
@@ -94,7 +105,8 @@ public static bool TryGetHitmanVersionByScanning(Process process,
             Note("AuthHeader2", getAuthheadPatches.Result.First()[1]);
             Note("ConfigDomain", getConfigdomainPatches.Result.First()[0]);
             Note("Protocol", getProtocolPatches.Result.First()[0]);
-            Note("DynamicResources", getDynresForceofflinePatches.Result.First()[0]);
+            Note("DynamicResources->ForceOffline", getDynresForceofflinePatches.Result.First()[0]);
+            Note("DynamicResources->Enable", getDynresEnablePatches.Result.FirstOrDefault()?[0]);
 #endif
 
             result = new HitmanVersion()
@@ -104,7 +116,9 @@ public static bool TryGetHitmanVersionByScanning(Process process,
                 configdomain = getConfigdomainPatches.Result.First(),
                 protocol = getProtocolPatches.Result.First(),
                 dynres_noforceoffline =
-                    getDynresForceofflinePatches.Result.First()
+                    getDynresForceofflinePatches.Result.First(),
+                dynres_enable = 
+                    getDynresEnablePatches.Result.FirstOrDefault() ?? []
             };
 
             return true;
@@ -115,7 +129,14 @@ public static bool TryGetHitmanVersionByScanning(Process process,
 #if DEBUG
         private static void Note(string name, Patch patch)
         {
-            MainForm.GetInstance().log($"{name}: {patch.offset:X} {BitConverter.ToString(patch.original).Replace("-", string.Empty)} {BitConverter.ToString(patch.patch).Replace("-", string.Empty)}");
+            if (patch == null)
+            {
+                Compositions.Logger.log($"{name}: n/a");
+                
+                return;
+            }
+            
+            Compositions.Logger.log($"{name}: {patch.offset:X} {BitConverter.ToString(patch.original).Replace("-", string.Empty)} {BitConverter.ToString(patch.patch).Replace("-", string.Empty)}");
         }
 #endif
 
@@ -526,6 +547,31 @@ private static Task<Patch[]> findDynresForceoffline(byte[] data)
 
         #endregion
 
+        #region dynres_enable
+
+        private static Task<Patch[]> findDynresEnable(byte[] data)
+        {
+            return Task.Factory.ContinueWhenAll(new[]
+            {
+                Task.Factory.StartNew(() => findPattern(data, 0x4, "ba502e23f1488d0d")) // 3.210
+					.ContinueWith(task =>
+                        task.Result.Select(addr => addr + 0x22 + BitConverter.ToInt32(data, addr + 0x1A)).ToArray()),
+            }, tasks =>
+            {
+                IEnumerable<int> offsets =
+                    tasks.SelectMany(task => task.Result);
+                if (offsets.Count() != 1)
+                    return null;
+                return new[]
+                {
+                    new Patch(offsets.First(), "01", "00",
+                        MemProtection.PAGE_EXECUTE_READWRITE)
+                };
+            });
+        }
+
+        #endregion
+
         private static int[] findPattern(byte[] data, byte alignment,
             string pattern)
         {
diff --git a/patcher/HitmanPatcher.Core/Compositions.cs b/patcher/HitmanPatcher.Core/Compositions.cs
new file mode 100644
index 000000000..aec7e09fa
--- /dev/null
+++ b/patcher/HitmanPatcher.Core/Compositions.cs
@@ -0,0 +1,9 @@
+namespace HitmanPatcher
+{
+    public static class Compositions
+    {
+        public static bool HasAdmin { get; set; }
+
+        public static ILoggingProvider Logger { get; set; }
+    }
+}
diff --git a/patcher/HitmanPatcher.Core/HitmanPatcher.Core.csproj b/patcher/HitmanPatcher.Core/HitmanPatcher.Core.csproj
new file mode 100644
index 000000000..bfd65fbf1
--- /dev/null
+++ b/patcher/HitmanPatcher.Core/HitmanPatcher.Core.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net46</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+
+        <PlatformTarget>x64</PlatformTarget>
+        <Prefer32bit>true</Prefer32bit>
+
+        <RootNamespace>HitmanPatcher</RootNamespace>
+        <AssemblyName>PeacockPatcher.Core</AssemblyName>
+
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DefineConstants>TRACE;PLATFORM_STEAM;PLATFORM_EPIC;PLATFORM_GOG;PLATFORM_SCARLETT</DefineConstants>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <DefineConstants>TRACE;PLATFORM_STEAM;PLATFORM_EPIC</DefineConstants>
+    </PropertyGroup>
+</Project>
diff --git a/patcher/HitmanVersion.cs b/patcher/HitmanPatcher.Core/HitmanVersion.cs
similarity index 98%
rename from patcher/HitmanVersion.cs
rename to patcher/HitmanPatcher.Core/HitmanVersion.cs
index 24ac7dc77..55b6a4a75 100644
--- a/patcher/HitmanVersion.cs
+++ b/patcher/HitmanPatcher.Core/HitmanVersion.cs
@@ -34,7 +34,7 @@ public Patch(int offset, string original, string patch, MemProtection defaultPro
 
     public class HitmanVersion
     {
-        public Patch[] certpin, authheader, configdomain, protocol, dynres_noforceoffline;
+        public Patch[] certpin, authheader, configdomain, protocol, dynres_noforceoffline, dynres_enable;
 
         private static Dictionary<uint, string> timestampMap = new Dictionary<uint, string>();
 
diff --git a/patcher/MemoryPatcher.cs b/patcher/HitmanPatcher.Core/MemoryPatcher.cs
similarity index 97%
rename from patcher/MemoryPatcher.cs
rename to patcher/HitmanPatcher.Core/MemoryPatcher.cs
index 668556b30..94debb928 100644
--- a/patcher/MemoryPatcher.cs
+++ b/patcher/HitmanPatcher.Core/MemoryPatcher.cs
@@ -69,7 +69,7 @@ public static void PatchAllProcesses(ILoggingProvider logger, Options patchOptio
 						}
 						catch (Win32Exception ex)
 						{
-							if (ex.NativeErrorCode == 5 && !Program.HasAdmin)
+							if (ex.NativeErrorCode == 5 && !Compositions.HasAdmin)
 							{
 								logger.log(String.Format("Access denied, try running the patcher as admin."));
 								process.Dispose();
@@ -184,6 +184,10 @@ public static bool Patch(Process process, Options patchOptions)
 				{
 					patches.AddRange(v.protocol);
 				}
+				if (patchOptions.EnableDynamicResources)
+				{
+					patches.AddRange(v.dynres_enable);
+				}
 				if (patchOptions.DisableForceOfflineOnFailedDynamicResources)
 				{
 					patches.AddRange(v.dynres_noforceoffline);
@@ -275,6 +279,7 @@ public struct Options
 			public bool SetCustomConfigDomain;
 			public string CustomConfigDomain;
 			public bool UseHttp;
+			public bool EnableDynamicResources;
 			public bool DisableForceOfflineOnFailedDynamicResources;
         }
 
diff --git a/patcher/PatchDefinitions/v1_12.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v1_12.cs
similarity index 100%
rename from patcher/PatchDefinitions/v1_12.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v1_12.cs
diff --git a/patcher/PatchDefinitions/v1_15.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v1_15.cs
similarity index 100%
rename from patcher/PatchDefinitions/v1_15.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v1_15.cs
diff --git a/patcher/PatchDefinitions/v1_16.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v1_16.cs
similarity index 100%
rename from patcher/PatchDefinitions/v1_16.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v1_16.cs
diff --git a/patcher/PatchDefinitions/v2_13.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v2_13.cs
similarity index 100%
rename from patcher/PatchDefinitions/v2_13.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v2_13.cs
diff --git a/patcher/PatchDefinitions/v2_71.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v2_71.cs
similarity index 100%
rename from patcher/PatchDefinitions/v2_71.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v2_71.cs
diff --git a/patcher/PatchDefinitions/v2_72.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v2_72.cs
similarity index 100%
rename from patcher/PatchDefinitions/v2_72.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v2_72.cs
diff --git a/patcher/PatchDefinitions/v3_10.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_10.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_10.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_10.cs
diff --git a/patcher/PatchDefinitions/v3_100.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_100.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_100.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_100.cs
diff --git a/patcher/PatchDefinitions/v3_11.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_11.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_11.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_11.cs
diff --git a/patcher/PatchDefinitions/v3_110.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_110.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_110.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_110.cs
diff --git a/patcher/PatchDefinitions/v3_120.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_120.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_120.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_120.cs
diff --git a/patcher/PatchDefinitions/v3_20.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_20.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_20.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_20.cs
diff --git a/patcher/PatchDefinitions/v3_30.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_30.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_30.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_30.cs
diff --git a/patcher/PatchDefinitions/v3_40.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_40.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_40.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_40.cs
diff --git a/patcher/PatchDefinitions/v3_50.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_50.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_50.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_50.cs
diff --git a/patcher/PatchDefinitions/v3_70.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/v3_70.cs
similarity index 100%
rename from patcher/PatchDefinitions/v3_70.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/v3_70.cs
diff --git a/patcher/PatchDefinitions/vScpc.cs b/patcher/HitmanPatcher.Core/PatchDefinitions/vScpc.cs
similarity index 100%
rename from patcher/PatchDefinitions/vScpc.cs
rename to patcher/HitmanPatcher.Core/PatchDefinitions/vScpc.cs
diff --git a/patcher/Pinvoke.cs b/patcher/HitmanPatcher.Core/Pinvoke.cs
similarity index 100%
rename from patcher/Pinvoke.cs
rename to patcher/HitmanPatcher.Core/Pinvoke.cs
diff --git a/patcher/Settings.cs b/patcher/HitmanPatcher.Core/Settings.cs
similarity index 98%
rename from patcher/Settings.cs
rename to patcher/HitmanPatcher.Core/Settings.cs
index eb7cabece..aff154ede 100644
--- a/patcher/Settings.cs
+++ b/patcher/HitmanPatcher.Core/Settings.cs
@@ -22,6 +22,7 @@ public Settings()
                 DisableCertPinning = true,
                 AlwaysSendAuthHeader = true,
                 SetCustomConfigDomain = true,
+                EnableDynamicResources = true,
                 DisableForceOfflineOnFailedDynamicResources = true,
             };
             darkModeEnabled = false;
diff --git a/patcher/HitmanPatcher.csproj b/patcher/HitmanPatcher.csproj
deleted file mode 100644
index c2914cd5e..000000000
--- a/patcher/HitmanPatcher.csproj
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  -     The Peacock Project - a HITMAN server replacement.
-  -     Copyright (C) 2021-2024 The Peacock Project Team
-  -
-  -     This program is free software: you can redistribute it and/or modify
-  -     it under the terms of the GNU Affero General Public License as published by
-  -     the Free Software Foundation, either version 3 of the License, or
-  -     (at your option) any later version.
-  -
-  -     This program is distributed in the hope that it will be useful,
-  -     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  -     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  -     GNU Affero General Public License for more details.
-  -
-  -     You should have received a copy of the GNU Affero General Public License
-  -     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{0487D44B-B3E1-4A6E-91E0-47016C391A20}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HitmanPatcher</RootNamespace>
-    <AssemblyName>PeacockPatcher</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <ShouldCreateLogs>True</ShouldCreateLogs>
-    <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
-    <UpdateAssemblyVersion>False</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyVersionSettings>None.None.None.Increment</AssemblyVersionSettings>
-    <AssemblyFileVersionSettings>None.None.None.Increment</AssemblyFileVersionSettings>
-    <LangVersion>8</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;PLATFORM_STEAM;PLATFORM_EPIC;PLATFORM_GOG;PLATFORM_SCARLETT</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;PLATFORM_STEAM;PLATFORM_EPIC</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ApplicationIcon>patcher.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="System" />
-    <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.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="Cli.cs" />
-    <Compile Include="CliLocale.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>CliLocale.resx</DependentUpon>
-    </Compile>
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="HitmanVersion.cs" />
-    <Compile Include="MemoryPatcher.cs" />
-    <Compile Include="OptionsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="OptionsForm.Designer.cs">
-      <DependentUpon>OptionsForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PatchDefinitions\v1_12.cs" />
-    <Compile Include="PatchDefinitions\v1_15.cs" />
-    <Compile Include="PatchDefinitions\v1_16.cs" />
-    <Compile Include="PatchDefinitions\v2_13.cs" />
-    <Compile Include="PatchDefinitions\v2_71.cs" />
-    <Compile Include="PatchDefinitions\v3_100.cs" />
-    <Compile Include="PatchDefinitions\v3_110.cs" />
-    <Compile Include="PatchDefinitions\v3_120.cs" />
-    <Compile Include="PatchDefinitions\v3_20.cs" />
-    <Compile Include="PatchDefinitions\v3_11.cs" />
-    <Compile Include="PatchDefinitions\v3_10.cs" />
-    <Compile Include="PatchDefinitions\v2_72.cs" />
-    <Compile Include="PatchDefinitions\v3_30.cs" />
-    <Compile Include="PatchDefinitions\v3_40.cs" />
-    <Compile Include="PatchDefinitions\v3_50.cs" />
-    <Compile Include="PatchDefinitions\v3_70.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings.cs" />
-    <Compile Include="TrayOptionsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TrayOptionsForm.Designer.cs">
-      <DependentUpon>TrayOptionsForm.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="CliLocale.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>CliLocale.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OptionsForm.resx">
-      <DependentUpon>OptionsForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <EmbeddedResource Include="TrayOptionsForm.resx">
-      <LastGenOutput>TrayOptionsForm.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Novikov_error.png" />
-    <None Include="Novikov_standard.png" />
-    <None Include="Novikov_success.png" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="PatchDefinitions\vScpc.cs" />
-    <Compile Include="AOBScanner.cs" />
-    <Compile Include="Pinvoke.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="App.config" />
-    <Content Include="patcher.ico" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/patcher/HitmanPatcher.sln b/patcher/HitmanPatcher.sln
index 1d06a1846..1672d72f8 100644
--- a/patcher/HitmanPatcher.sln
+++ b/patcher/HitmanPatcher.sln
@@ -3,18 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HitmanPatcher", "HitmanPatcher.csproj", "{0487D44B-B3E1-4A6E-91E0-47016C391A20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HitmanPatcher", "HitmanPatcher\HitmanPatcher.csproj", "{0487D44B-B3E1-4A6E-91E0-47016C391A20}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HitmanPatcher.Core", "HitmanPatcher.Core\HitmanPatcher.Core.csproj", "{596AFD4B-5BB1-4FE0-9C2A-12809C186AF4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
+		Release|Any CPU = Release|Any CPU
+		Debug|Any CPU = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Debug|x64.ActiveCfg = Debug|x64
-		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Debug|x64.Build.0 = Debug|x64
-		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Release|x64.ActiveCfg = Release|x64
-		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Release|x64.Build.0 = Release|x64
+		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0487D44B-B3E1-4A6E-91E0-47016C391A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{596AFD4B-5BB1-4FE0-9C2A-12809C186AF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{596AFD4B-5BB1-4FE0-9C2A-12809C186AF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{596AFD4B-5BB1-4FE0-9C2A-12809C186AF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{596AFD4B-5BB1-4FE0-9C2A-12809C186AF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/patcher/App.config b/patcher/HitmanPatcher/App.config
similarity index 94%
rename from patcher/App.config
rename to patcher/HitmanPatcher/App.config
index fcf2f62a0..d572e7498 100644
--- a/patcher/App.config
+++ b/patcher/HitmanPatcher/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   -     The Peacock Project - a HITMAN server replacement.
-  -     Copyright (C) 2021-2024 The Peacock Project Team
+  -     Copyright (C) 2021-2025 The Peacock Project Team
   -
   -     This program is free software: you can redistribute it and/or modify
   -     it under the terms of the GNU Affero General Public License as published by
diff --git a/patcher/Cli.cs b/patcher/HitmanPatcher/Cli.cs
similarity index 100%
rename from patcher/Cli.cs
rename to patcher/HitmanPatcher/Cli.cs
diff --git a/patcher/CliLocale.Designer.cs b/patcher/HitmanPatcher/CliLocale.Designer.cs
similarity index 100%
rename from patcher/CliLocale.Designer.cs
rename to patcher/HitmanPatcher/CliLocale.Designer.cs
diff --git a/patcher/CliLocale.resx b/patcher/HitmanPatcher/CliLocale.resx
similarity index 95%
rename from patcher/CliLocale.resx
rename to patcher/HitmanPatcher/CliLocale.resx
index b251cf8ee..da9d32daa 100644
--- a/patcher/CliLocale.resx
+++ b/patcher/HitmanPatcher/CliLocale.resx
@@ -2,7 +2,7 @@
 
 <!--
   -     The Peacock Project - a HITMAN server replacement.
-  -     Copyright (C) 2021-2024 The Peacock Project Team
+  -     Copyright (C) 2021-2025 The Peacock Project Team
   -
   -     This program is free software: you can redistribute it and/or modify
   -     it under the terms of the GNU Affero General Public License as published by
@@ -52,6 +52,6 @@
         <value>====== Peacock Patcher - Headless mode ======</value>
     </data>
     <data name="HelpHeader" xml:space="preserve">
-        <value>Peacock Patcher CLI - Copyright (c) 2020-2024 grappigegovert &amp; The Peacock Project</value>
+        <value>Peacock Patcher CLI - Copyright (c) 2020-2025 grappigegovert &amp; The Peacock Project</value>
     </data>
 </root>
diff --git a/patcher/HitmanPatcher/HitmanPatcher.csproj b/patcher/HitmanPatcher/HitmanPatcher.csproj
new file mode 100644
index 000000000..5553d2f1e
--- /dev/null
+++ b/patcher/HitmanPatcher/HitmanPatcher.csproj
@@ -0,0 +1,61 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net46</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+
+        <PlatformTarget>x64</PlatformTarget>
+        <Prefer32bit>true</Prefer32bit>
+        
+        <RootNamespace>HitmanPatcher</RootNamespace>
+        <AssemblyName>PeacockPatcher</AssemblyName>
+
+        <Title>Peacock Patcher</Title>
+        <Description>Peacock's HITMAN™ World of Assassination trilogy game patcher.</Description>
+        <Company>The Peacock Project</Company>
+        <Product>Peacock Patcher</Product>
+        <Copyright>Copyright © 2020-2025 grappigegovert &amp; The Peacock Project</Copyright>
+        <AssemblyVersion>9.0.0.0</AssemblyVersion>
+        <FileVersion>9.0.0.0</FileVersion>
+
+        <ApplicationIcon>patcher.ico</ApplicationIcon>
+        <UseWindowsForms>true</UseWindowsForms>
+
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.26">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\HitmanPatcher.Core\HitmanPatcher.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Remove="Novikov_error.png" />
+        <None Remove="Novikov_standard.png" />
+        <None Remove="Novikov_success.png" />
+        <None Remove="patcher.ico" />
+        <EmbeddedResource Include="Novikov_error.png" />
+        <EmbeddedResource Include="Novikov_standard.png" />
+        <EmbeddedResource Include="Novikov_success.png" />
+        <EmbeddedResource Include="patcher.ico" />
+        <EmbeddedResource Remove="MainForm.resx" />
+        <EmbeddedResource Remove="OptionsForm.resx" />
+        <EmbeddedResource Remove="TrayOptionsForm.resx" />
+        <Compile Update="MainForm.cs">
+            <SubType>Form</SubType>
+        </Compile>
+        <Compile Update="OptionsForm.cs">
+            <SubType>Form</SubType>
+        </Compile>
+        <Compile Update="TrayOptionsForm.cs">
+            <SubType>Form</SubType>
+        </Compile>
+    </ItemGroup>
+</Project>
diff --git a/patcher/HitmanPatcher/ILRepack.targets b/patcher/HitmanPatcher/ILRepack.targets
new file mode 100644
index 000000000..b585f5e92
--- /dev/null
+++ b/patcher/HitmanPatcher/ILRepack.targets
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="Custom-ILRepack" AfterTargets="Publish">
+        <Message Text="Running ILRepack..." Importance="high" />
+
+        <ItemGroup>
+            <InputAssemblies Include="$(PublishDir)PeacockPatcher.exe" />
+            <InputAssemblies Include="$(PublishDir)PeacockPatcher.Core.dll" />
+        </ItemGroup>
+
+        <ILRepack
+            InputAssemblies="@(InputAssemblies)"
+            TargetKind="WinExe"
+            OutputFile="$(PublishDir)\ILRepack\PeacockPatcher.exe" />
+    </Target>
+</Project>
\ No newline at end of file
diff --git a/patcher/MainForm.Designer.cs b/patcher/HitmanPatcher/MainForm.Designer.cs
similarity index 96%
rename from patcher/MainForm.Designer.cs
rename to patcher/HitmanPatcher/MainForm.Designer.cs
index 5778da907..a5ed1883c 100644
--- a/patcher/MainForm.Designer.cs
+++ b/patcher/HitmanPatcher/MainForm.Designer.cs
@@ -29,7 +29,6 @@ protected override void Dispose(bool disposing)
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.serverAddressLabel = new System.Windows.Forms.Label();
             this.logListView = new System.Windows.Forms.ListView();
             this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
@@ -209,8 +208,8 @@ private void InitializeComponent()
             this.novikovPictureBox.AccessibleDescription = "Icon showing the patcher status.";
             this.novikovPictureBox.AccessibleName = "Status icon";
             this.novikovPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.novikovPictureBox.Image = global::HitmanPatcher.Properties.Resources.Novikov_standard;
-            this.novikovPictureBox.InitialImage = ((System.Drawing.Image)(resources.GetObject("novikovPictureBox.InitialImage")));
+            this.novikovPictureBox.Image = Resources.Novikov_standard;
+            this.novikovPictureBox.InitialImage = Resources.Novikov_standard;
             this.novikovPictureBox.Location = new System.Drawing.Point(313, 44);
             this.novikovPictureBox.Margin = new System.Windows.Forms.Padding(4);
             this.novikovPictureBox.Name = "novikovPictureBox";
@@ -222,7 +221,7 @@ private void InitializeComponent()
             // trayIcon
             //
             this.trayIcon.ContextMenuStrip = this.trayMenu;
-            this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
+            this.trayIcon.Icon = Resources.Icon;
             this.trayIcon.Text = "Peacock Patcher";
             this.trayIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.menuItemOpen_Click);
             //
@@ -284,7 +283,7 @@ private void InitializeComponent()
             this.Controls.Add(this.logLabel);
             this.Controls.Add(this.logListView);
             this.Controls.Add(this.serverAddressLabel);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Icon = Resources.Icon;
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MaximizeBox = false;
             this.MinimumSize = new System.Drawing.Size(423, 238);
diff --git a/patcher/MainForm.cs b/patcher/HitmanPatcher/MainForm.cs
similarity index 96%
rename from patcher/MainForm.cs
rename to patcher/HitmanPatcher/MainForm.cs
index 5a30dfe0e..c9d0486b8 100644
--- a/patcher/MainForm.cs
+++ b/patcher/HitmanPatcher/MainForm.cs
@@ -6,6 +6,7 @@
 using System.Drawing;
 using System.IO;
 using System.Text;
+using Timer = System.Windows.Forms.Timer;
 
 namespace HitmanPatcher
 {
@@ -59,6 +60,8 @@ private void ToggleTheme(bool darkModeEnabled)
 
         public MainForm()
         {
+            Compositions.Logger = this;
+            
             InitializeComponent();
             logListView.Columns[0].Width = logListView.Width - 4 - SystemInformation.VerticalScrollBarWidth;
             Timer timer = new Timer
@@ -206,15 +209,15 @@ private void SetStatusImage(int status)
         {
             if (status == 0)
             {
-                novikovPictureBox.Image = Properties.Resources.Novikov_standard;
+                novikovPictureBox.Image = Resources.Novikov_standard;
             }
             else if (status > 0)
             {
-                novikovPictureBox.Image = Properties.Resources.Novikov_success;
+                novikovPictureBox.Image = Resources.Novikov_success;
             }
             else
             {
-                novikovPictureBox.Image = Properties.Resources.Novikov_error;
+                novikovPictureBox.Image = Resources.Novikov_error;
             }
         }
 
diff --git a/patcher/MainForm.resx b/patcher/HitmanPatcher/MainForm.resx
similarity index 100%
rename from patcher/MainForm.resx
rename to patcher/HitmanPatcher/MainForm.resx
diff --git a/patcher/Novikov_error.png b/patcher/HitmanPatcher/Novikov_error.png
similarity index 100%
rename from patcher/Novikov_error.png
rename to patcher/HitmanPatcher/Novikov_error.png
diff --git a/patcher/Novikov_standard.png b/patcher/HitmanPatcher/Novikov_standard.png
similarity index 100%
rename from patcher/Novikov_standard.png
rename to patcher/HitmanPatcher/Novikov_standard.png
diff --git a/patcher/Novikov_success.png b/patcher/HitmanPatcher/Novikov_success.png
similarity index 100%
rename from patcher/Novikov_success.png
rename to patcher/HitmanPatcher/Novikov_success.png
diff --git a/patcher/OptionsForm.Designer.cs b/patcher/HitmanPatcher/OptionsForm.Designer.cs
similarity index 100%
rename from patcher/OptionsForm.Designer.cs
rename to patcher/HitmanPatcher/OptionsForm.Designer.cs
diff --git a/patcher/OptionsForm.cs b/patcher/HitmanPatcher/OptionsForm.cs
similarity index 98%
rename from patcher/OptionsForm.cs
rename to patcher/HitmanPatcher/OptionsForm.cs
index 72ff6e1ce..1f0f11177 100644
--- a/patcher/OptionsForm.cs
+++ b/patcher/HitmanPatcher/OptionsForm.cs
@@ -59,6 +59,7 @@ public Settings Settings
                     {
                         CustomConfigDomain = customDomain,
                         UseHttp = checkBoxHttp.Checked,
+                        EnableDynamicResources = true,
                         DisableForceOfflineOnFailedDynamicResources = dynResources.Checked,
                         DisableCertPinning = true,
                         SetCustomConfigDomain = true,
diff --git a/patcher/OptionsForm.resx b/patcher/HitmanPatcher/OptionsForm.resx
similarity index 100%
rename from patcher/OptionsForm.resx
rename to patcher/HitmanPatcher/OptionsForm.resx
diff --git a/patcher/Program.cs b/patcher/HitmanPatcher/Program.cs
similarity index 95%
rename from patcher/Program.cs
rename to patcher/HitmanPatcher/Program.cs
index 2dadfe587..8cfca1f26 100644
--- a/patcher/Program.cs
+++ b/patcher/HitmanPatcher/Program.cs
@@ -6,15 +6,13 @@ namespace HitmanPatcher
 {
     static class Program
     {
-        public static bool HasAdmin;
-
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
         private static void Main(string[] args)
         {
-            HasAdmin = CheckForAdmin();
+            Compositions.HasAdmin = CheckForAdmin();
 #if !DEBUG
             Cli.EnsureConsole(args);
 #endif
diff --git a/patcher/HitmanPatcher/Resources.cs b/patcher/HitmanPatcher/Resources.cs
new file mode 100644
index 000000000..4d7bb9f53
--- /dev/null
+++ b/patcher/HitmanPatcher/Resources.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+
+namespace HitmanPatcher
+{
+    public static class Resources
+    {
+        public static Icon Icon { get; }
+        public static Bitmap Novikov_standard { get; }
+        public static Bitmap Novikov_success { get; }
+        public static Bitmap Novikov_error { get; }
+
+        static Resources()
+        {
+            Icon = new Icon(ReadResource("patcher.ico"));
+            Novikov_standard = new Bitmap(ReadResource("Novikov_standard.png"));
+            Novikov_success = new Bitmap(ReadResource("Novikov_success.png"));
+            Novikov_error = new Bitmap(ReadResource("Novikov_error.png"));
+        }
+
+        private static Stream ReadResource(string name)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+
+            string resourcePath = assembly
+                .GetManifestResourceNames()
+                .Single(str => str.EndsWith(name));
+
+            return assembly.GetManifestResourceStream(resourcePath);
+        }
+    }
+}
diff --git a/patcher/TrayOptionsForm.Designer.cs b/patcher/HitmanPatcher/TrayOptionsForm.Designer.cs
similarity index 100%
rename from patcher/TrayOptionsForm.Designer.cs
rename to patcher/HitmanPatcher/TrayOptionsForm.Designer.cs
diff --git a/patcher/TrayOptionsForm.cs b/patcher/HitmanPatcher/TrayOptionsForm.cs
similarity index 100%
rename from patcher/TrayOptionsForm.cs
rename to patcher/HitmanPatcher/TrayOptionsForm.cs
diff --git a/patcher/TrayOptionsForm.resx b/patcher/HitmanPatcher/TrayOptionsForm.resx
similarity index 100%
rename from patcher/TrayOptionsForm.resx
rename to patcher/HitmanPatcher/TrayOptionsForm.resx
diff --git a/patcher/patcher.ico b/patcher/HitmanPatcher/patcher.ico
similarity index 100%
rename from patcher/patcher.ico
rename to patcher/HitmanPatcher/patcher.ico
diff --git a/patcher/Properties/AssemblyInfo.cs b/patcher/Properties/AssemblyInfo.cs
deleted file mode 100644
index 40916fa24..000000000
--- a/patcher/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Peacock Patcher")]
-[assembly: AssemblyDescription("Peacock's HITMAN™ World of Assassination trilogy game patcher.")]
-#if DEBUG
-    [assembly: AssemblyConfiguration("Debug")]
-#else
-    [assembly: AssemblyConfiguration("Release")]
-#endif
-[assembly: AssemblyCompany("The Peacock Project")]
-[assembly: AssemblyProduct("Peacock Patcher")]
-[assembly: AssemblyCopyright("Copyright © 2020-2024 grappigegovert & The Peacock Project")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4f027fef-87be-47f7-a0c6-f3978dc707e3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.0.0.0")]
-[assembly: AssemblyFileVersion("8.0.0.0")]
diff --git a/patcher/Properties/Resources.Designer.cs b/patcher/Properties/Resources.Designer.cs
deleted file mode 100644
index 9aeb8e631..000000000
--- a/patcher/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
-//
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HitmanPatcher.Properties {    
-    /// <summary>
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    /// </summary>
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HitmanPatcher.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Novikov_error {
-            get {
-                object obj = ResourceManager.GetObject("Novikov_error", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Novikov_standard {
-            get {
-                object obj = ResourceManager.GetObject("Novikov_standard", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Novikov_success {
-            get {
-                object obj = ResourceManager.GetObject("Novikov_success", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}
diff --git a/patcher/Properties/Resources.resx b/patcher/Properties/Resources.resx
deleted file mode 100644
index 8de4204db..000000000
--- a/patcher/Properties/Resources.resx
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  -     The Peacock Project - a HITMAN server replacement.
-  -     Copyright (C) 2021-2024 The Peacock Project Team
-  -
-  -     This program is free software: you can redistribute it and/or modify
-  -     it under the terms of the GNU Affero General Public License as published by
-  -     the Free Software Foundation, either version 3 of the License, or
-  -     (at your option) any later version.
-  -
-  -     This program is distributed in the hope that it will be useful,
-  -     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  -     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  -     GNU Affero General Public License for more details.
-  -
-  -     You should have received a copy of the GNU Affero General Public License
-  -     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Novikov_standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Novikov_standard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Novikov_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Novikov_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Novikov_success" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Novikov_success.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>
diff --git a/patcher/Properties/Settings.Designer.cs b/patcher/Properties/Settings.Designer.cs
deleted file mode 100644
index eeee566bd..000000000
--- a/patcher/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HitmanPatcher.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/patcher/Properties/Settings.settings b/patcher/Properties/Settings.settings
deleted file mode 100644
index 39645652a..000000000
--- a/patcher/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>