diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8e9d9fa..b568acc 100755
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -32,43 +32,43 @@ jobs:
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=Linux64.pubxml
-        cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/"
-        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/"
-        mkdir "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www"
-        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www"
+        cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/"
+        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/"
+        mkdir "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www"
+        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www"
     
     - name: Build linux-arm
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=LinuxARM.pubxml
-        cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/"
-        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/"
-        mkdir "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www"
-        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www"
+        cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/"
+        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/"
+        mkdir "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www"
+        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www"
     
     - name: Build linux-arm64
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=LinuxARM64.pubxml
-        cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/"
-        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/"
-        mkdir "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/"
-        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/"
+        cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/"
+        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/"
+        mkdir "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/"
+        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/"
         
     - name: upload linux-64
       uses: actions/upload-artifact@v2
       with:
         name: linux-x64
-        path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/
+        path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/
 
     - name: upload linux-arm
       uses: actions/upload-artifact@v2
       with:
         name: linux-arm
-        path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/
+        path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/
     
     - name: upload linux-arm64
       uses: actions/upload-artifact@v2
       with:
         name: linux-arm64
-        path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/
+        path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 6046487..0561f87 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -32,28 +32,28 @@ jobs:
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=Osx64.pubxml
-        cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/"
-        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/"
-        mkdir "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www"
-        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www"
+        cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/"
+        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/"
+        mkdir "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www"
+        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www"
     
     - name: Build mac-arm64
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=OsxARM64.pubxml
-        cp ../HorseIsleData/*.json "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/"
-        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/"
-        mkdir "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/www"
-        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/www"
+        cp ../HorseIsleData/*.json "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/"
+        cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/"
+        mkdir "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/www"
+        cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/www"
 
     - name: upload mac-x64
       uses: actions/upload-artifact@v2
       with:
         name: mac-x64
-        path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/
+        path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/
 
     - name: upload mac-arm64
       uses: actions/upload-artifact@v2
       with:
         name: mac-arm64
-        path: HorseIsleServer/HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/
+        path: HorseIsleServer/HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c5af65e..680a9a8 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -32,50 +32,50 @@ jobs:
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=Win64.pubxml
-        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\gamedata.json"
-        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\HI1.MAP"
-        copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\www" -Recurse
+        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\gamedata.json"
+        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\HI1.MAP"
+        copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\www" -Recurse
     - name: Build win-x86
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=Win32.pubxml
-        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\gamedata.json"
-        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\HI1.MAP"
-        copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\www" -Recurse
+        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\gamedata.json"
+        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\HI1.MAP"
+        copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\www" -Recurse
     - name: Build win-arm
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=WinARM.pubxml
-        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\gamedata.json"
-        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\HI1.MAP"
-        copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\www" -Recurse
+        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\gamedata.json"
+        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\HI1.MAP"
+        copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\www" -Recurse
     - name: Build win-arm64
       continue-on-error: false
       run: |
         dotnet publish -p:PublishProfile=WinARM64.pubxml
-        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\gamedata.json"
-        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\HI1.MAP"
-        copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\www" -Recurse
+        copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\gamedata.json"
+        copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\HI1.MAP"
+        copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\www" -Recurse
     - name: Upload win-x64
       uses: actions/upload-artifact@v2
       with:
         name: win-x64
-        path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net5.0\win-x64\publish\
+        path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net6.0\win-x64\publish\
     
     - name: Upload win-x86
       uses: actions/upload-artifact@v2
       with:
         name: win-x86
-        path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\
+        path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\
         
     - name: Upload win-arm
       uses: actions/upload-artifact@v2
       with:
         name: win-arm
-        path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\
+        path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\
 
     - name: Upload win-arm64
       uses: actions/upload-artifact@v2
       with:
         name: win-arm64
-        path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\
+        path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\
diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
index f6cf7bc..d812e63 100644
--- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
+++ b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
@@ -4,16 +4,7 @@
     <RootNamespace>HISP</RootNamespace>
     <LangVersion>10.0</LangVersion>
     <Platforms>x64;x86;ARM;ARM64;AnyCPU</Platforms>
-    <Configurations>;Debug;Windows;Linux;MacOS</Configurations>
-	
-	<DefineConstants Condition="'$(Platform)'=='x86'">$(DefineConstants);ARCH_x86</DefineConstants>
-    <DefineConstants Condition="'$(Platform)'=='x64'">$(DefineConstants);ARCH_x86_64</DefineConstants>
-    <DefineConstants Condition="'$(Platform)'=='ARM'">$(DefineConstants);ARCH_ARM</DefineConstants>
-    <DefineConstants Condition="'$(Platform)'=='ARM64'">$(DefineConstants);ARCH_ARM64</DefineConstants>
-    <DefineConstants Condition="'$(Configuration)'=='Linux'">$(DefineConstants);OS_LINUX</DefineConstants>
-    <DefineConstants Condition="'$(Configuration)'=='MacOS'">$(DefineConstants);OS_MACOS</DefineConstants>
-    <DefineConstants Condition="'$(Configuration)'=='Windows'">$(DefineConstants);OS_WINDOWS</DefineConstants>
-    <DefineConstants Condition="'$(Configuration)'=='Debug'">$(DefineConstants);DEBUG;TRACE</DefineConstants>
+    <Configurations>Debug;Windows;Linux;MacOS</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -44,33 +35,38 @@
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoWin32Manifest>true</NoWin32Manifest>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <StartupObject>HISP.Program</StartupObject>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <DebugType>embedded</DebugType>
   </PropertyGroup>
     
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x86'">
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
+  	<DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x64'">
     <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>ARM32</PlatformTarget>
+    <DefineConstants>OS_WINDOWS;ARCH_ARM</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|ARM64'">
     <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
     <Optimize>true</Optimize>
     <PlatformTarget>ARM64</PlatformTarget>
+    <DefineConstants>OS_WINDOWS;ARCH_ARM64</DefineConstants>
   </PropertyGroup>
 
   
@@ -78,44 +74,101 @@
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <Optimize>true</Optimize>
     <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>
   </PropertyGroup>  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM'">
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
     <PlatformTarget>ARM</PlatformTarget>
     <Optimize>true</Optimize>
+    <DefineConstants>OS_LINUX;ARCH_ARM</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM64'">
     <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
     <PlatformTarget>ARM64</PlatformTarget>
     <Optimize>true</Optimize>
+    <DefineConstants>OS_LINUX;ARCH_ARM64</DefineConstants>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|x64'">
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>    
+    <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>OS_MACOS;ARCH_X86_64</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|ARM64'">
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
     <Optimize>true</Optimize>
-    <PlatformTarget>ARM64</PlatformTarget>    
+    <DefineConstants>OS_MACOS;ARCH_ARM64</DefineConstants>
   </PropertyGroup>
 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|AnyCPU'">
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-    <Optimize>true</Optimize>
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_ALL;ARCH_ANYCPU</DefineConstants>
   </PropertyGroup>
 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <PlatformTarget>ARM32</PlatformTarget>
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_ARM</DefineConstants>
   </PropertyGroup>
 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_ARM64</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_X86_64</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_X86</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|x86'">
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_MACOS;ARCH_X86</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|x86'">
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_LINUX;ARCH_X86</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|AnyCPU'">
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_LINUX;ARCH_ANYCPU</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|AnyCPU'">
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_WINDOWS;ARCH_ANYCPU</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|AnyCPU'">
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_MACOS;ARCH_ANYCPU</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|ARM'">
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_MACOS;ARCH_ARM</DefineConstants>
   </PropertyGroup>
 
   
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml
index 471f4a8..80a3911 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Linux\net5.0\linux-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Linux\net6.0\linux-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml
index db4d3fc..011adfe 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\ARM\Linux\net5.0\linux-arm\publish\</PublishDir>
+    <PublishDir>bin\ARM\Linux\net6.0\linux-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml
index 1bedc71..d88a07e 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\ARM64\Linux\net5.0\linux-arm64\publish\</PublishDir>
+    <PublishDir>bin\ARM64\Linux\net6.0\linux-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml
index 7080eec..7c47855 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>MacOS</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\MacOS\net5.0\osx-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\MacOS\net6.0\osx-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml
index 31e2553..47b2efd 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>MacOS</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\MacOS\net5.0\osx-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\MacOS\net6.0\osx-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml
index 59f878e..9b560f5 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml
@@ -6,11 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>x86</Platform>
-    <PublishDir>bin\x86\Windows\net5.0\win-x86\publish\</PublishDir>
+    <PublishDir>bin\x86\Windows\net6.0\win-x86\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>True</PublishReadyToRun>
     <PublishTrimmed>True</PublishTrimmed>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml
index 14e7809..b07a2d3 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Windows\net5.0\win-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Windows\net6.0\win-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml
index 8992c0e..05b3c8a 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml
@@ -6,11 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\Windows\net5.0\windows-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\Windows\net6.0\windows-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-arm</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>True</PublishReadyToRun>
     <PublishTrimmed>True</PublishTrimmed>
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml
index bd5dca7..545cf1c 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\Windows\net5.0\windows-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\Windows\net6.0\windows-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs b/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs
index 9c7bd80..f2d5cf5 100644
--- a/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs
@@ -15,7 +15,9 @@ namespace HISP.Server
 
         public static string GetArchitecture()
         {
-#if ARCH_X86_64
+#if ARCH_ANYCPU
+            return "ANYCPU";
+#elif ARCH_X86_64
             return "x86_64";
 #elif ARCH_X86
             return "x86";
@@ -29,7 +31,9 @@ namespace HISP.Server
         }
         public static string GetPlatform()
         {
-#if OS_WINDOWS
+#if OS_DEBUG
+            return "DEBUG";
+#elif OS_WINDOWS
             return "WINDOWS";
 #elif OS_LINUX
             return "LINUX";
@@ -50,7 +54,7 @@ namespace HISP.Server
         }
         public static string GetBuildString()
         {
-            return PRODUCT + " " + GetVersionString() + " " + GetCommitHash(4) + "; (" + GetArchitecture() + "; " + GetPlatform() + ")";
+            return PRODUCT + " " + GetVersionString() + " @" + GetCommitHash(4) + "; (" + GetArchitecture() + "; " + GetPlatform() + ")";
         }
     }
 }