diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
index 3c84c76..b693012 100644
--- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
+++ b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
@@ -5,6 +5,14 @@
     <LangVersion>8.0</LangVersion>
     <Platforms>x64;x86;ARM;ARM64</Platforms>
     <Configurations>Windows;Debug;Linux;MacOS</Configurations>
+	
+	<DefineConstants Condition="'$(Platform)'=='x86'">ARCH_x86</DefineConstants>
+    <DefineConstants Condition="'$(Platform)'=='x64'">ARCH_x86_64</DefineConstants>
+    <DefineConstants Condition="'$(Platform)'=='ARM'">ARCH_ARM</DefineConstants>
+    <DefineConstants Condition="'$(Platform)'=='ARM64'">ARCH_ARM64</DefineConstants>
+    <DefineConstants Condition="'$(Configuration)'=='Linux'">OS_LINUX</DefineConstants>
+    <DefineConstants Condition="'$(Configuration)'=='MacOS'">OS_MACOS</DefineConstants>
+    <DefineConstants Condition="'$(Configuration)'=='Windows'">OS_WINDOWS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -26,8 +34,8 @@
       copy "$(SolutionDir)..\HorseIsleData\HI1.MAP" "$(TargetDir)HI1.MAP" /Y
     </PostBuildEvent>
     <PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">
-      cp -f "$(MSBuildThisFileDirectory)../../HorseIsleData/gamedata.json" "$(TargetDir)gamedata.json"
-      cp -f "$(MSBuildThisFileDirectory)../../HorseIsleData/HI1.MAP" "$(TargetDir)HI1.MAP"
+      cp -f "$(SolutionDir)../HorseIsleData/gamedata.json" "$(TargetDir)gamedata.json"
+      cp -f "$(SolutionDir)./HorseIsleData/HI1.MAP" "$(TargetDir)HI1.MAP"
     </PostBuildEvent> 
   </PropertyGroup>
   <PropertyGroup>
@@ -42,50 +50,40 @@
     <StartupObject>HISP.Program</StartupObject>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
+    
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x86'">
-    <ApplicationIcon>icon.ico</ApplicationIcon>
-    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
-    <DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x64'">
-    <ApplicationIcon>icon.ico</ApplicationIcon>
-    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <Optimize>true</Optimize>
     <PlatformTarget>x64</PlatformTarget>
-    <DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|ARM'">
+    <RuntimeIdentifier>win-arm</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>arm</PlatformTarget>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|x64'">
-    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <Optimize>true</Optimize>
     <PlatformTarget>x64</PlatformTarget>
-    <DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|x64'">
-    <TargetFramework>net5.0</TargetFramework>
-    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <DefineConstants>OS_MACOS;ARCH_x86_64</DefineConstants>
-  </PropertyGroup>
+  </PropertyGroup>  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM'">
-    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
+    <PlatformTarget>arm</PlatformTarget>
     <Optimize>true</Optimize>
-    <PlatformTarget>ARM</PlatformTarget>
-    <DefineConstants>OS_LINUX;ARCH_ARM</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM64'">
-    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+    <PlatformTarget>arm64</PlatformTarget>
     <Optimize>true</Optimize>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DefineConstants>OS_LINUX;ARCH_ARM64</DefineConstants>
   </PropertyGroup>
+  
+  
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="git rev-parse --verify HEAD&gt;&quot;$(ProjectDir)Resources\GitCommit&quot;" />
   </Target>
diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj.user b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj.user
index 595e105..a9c955f 100644
--- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj.user
+++ b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj.user
@@ -2,6 +2,6 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ActiveDebugProfile>HorseIsleServer</ActiveDebugProfile>
-    <_LastSelectedProfileId>C:\Users\SilicaAndPina\Documents\HISP\HorseIsleServer\HorseIsleServer\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>C:\Users\Silica\Documents\GitHub\HISP\HorseIsleServer\HorseIsleServer\Properties\PublishProfiles\Win32.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml
new file mode 100644
index 0000000..8992c0e
--- /dev/null
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Windows</Configuration>
+    <Platform>ARM</Platform>
+    <PublishDir>bin\arm\Windows\net5.0\windows-arm\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net5.0</TargetFramework>
+    <RuntimeIdentifier>win-arm</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/HorseIsleServer/HorseIsleServer/Resources/GitCommit b/HorseIsleServer/HorseIsleServer/Resources/GitCommit
index 4b1e52c..4c6d344 100644
--- a/HorseIsleServer/HorseIsleServer/Resources/GitCommit
+++ b/HorseIsleServer/HorseIsleServer/Resources/GitCommit
@@ -1 +1 @@
-0cad1e0fac960fe59b55444cf1f0fd423d2e4951
+99f10ead55e2e76a0c31216d2aa6b8aa3b9d33c4