diff --git a/Heroes.ReplayParser b/Heroes.ReplayParser
deleted file mode 160000
index abf87de..0000000
--- a/Heroes.ReplayParser
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit abf87de8344f6b9beaecd0173592b9d8da78fe17
diff --git a/Hotsapi.Uploader.Common/Analyzer.cs b/Hotsapi.Uploader.Common/Analyzer.cs
index 9dd5eb3..09470fc 100644
--- a/Hotsapi.Uploader.Common/Analyzer.cs
+++ b/Hotsapi.Uploader.Common/Analyzer.cs
@@ -21,8 +21,8 @@ public class Analyzer : IAnalyzer
         /// <param name="file">Replay file</param>
         public Replay Analyze(ReplayFile file)
         {
-            try {
-                var result = DataParser.ParseReplay(file.Filename, false, false, false, true);
+            try {
+                var result = DataParser.ParseReplay(file.Filename, false, ParseOptions.MinimalParsing);
                 var replay = result.Item2;
                 var parseResult = result.Item1;
                 var status = GetPreStatus(replay, parseResult);
diff --git a/Hotsapi.Uploader.Common/Hotsapi.Uploader.Common.csproj b/Hotsapi.Uploader.Common/Hotsapi.Uploader.Common.csproj
index d412fbc..f4cf8e7 100644
--- a/Hotsapi.Uploader.Common/Hotsapi.Uploader.Common.csproj
+++ b/Hotsapi.Uploader.Common/Hotsapi.Uploader.Common.csproj
@@ -6,15 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Heroes.ReplayParser" Version="1.2.3" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0-pre-05" />
     <PackageReference Include="NLog" Version="4.5.11" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Heroes.ReplayParser\Heroes.ReplayParser\Heroes.ReplayParser.netstandard.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
diff --git a/Hotsapi.Uploader.Windows/Hotsapi.Uploader.Windows.csproj b/Hotsapi.Uploader.Windows/Hotsapi.Uploader.Windows.csproj
index 23e0e21..58edd8b 100644
--- a/Hotsapi.Uploader.Windows/Hotsapi.Uploader.Windows.csproj
+++ b/Hotsapi.Uploader.Windows/Hotsapi.Uploader.Windows.csproj
@@ -1,229 +1,229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" 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)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F774F86B-410F-410D-9719-ADF892D315D5}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Hotsapi.Uploader.Windows</RootNamespace>
-    <AssemblyName>Hotsapi.Uploader</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NOSQUIRREL</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NOSQUIRREL</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>Resources\uploader_icon_light.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Zip|AnyCPU'">
-    <OutputPath>bin\Zip\</OutputPath>
-    <DefineConstants>TRACE;NOSQUIRREL</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Installer|AnyCPU'">
-    <OutputPath>bin\Installer\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="DeltaCompressionDotNet" Version="1.1.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
-    <PackageReference Include="MSBuildTasks">
-      <Version>1.5.0.235</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="NLog" Version="4.5.11" />
-    <PackageReference Include="NLog.Config" Version="4.5.11" />
-    <PackageReference Include="NLog.Schema" Version="4.5.11" />
-    <PackageReference Include="NuGet.CommandLine" Version="4.3.0" />
-    <PackageReference Include="SharpCompress" Version="0.18.2" />
-    <PackageReference Include="Splat" Version="1.6.2" />
-    <PackageReference Include="squirrel.windows" Version="1.7.8" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="Program.cs" />
-    <Compile Include="SettingsWindow.xaml.cs">
-      <DependentUpon>SettingsWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UIHelpers\FilenameConverter.cs" />
-    <Compile Include="UIHelpers\FlagsConverter.cs" />
-    <Compile Include="UIHelpers\GenericValueConverter.cs" />
-    <Compile Include="UIHelpers\IntToVisibilityConverter.cs" />
-    <Compile Include="UIHelpers\MarginSetter.cs" />
-    <Compile Include="UIHelpers\UploadColorConverter.cs" />
-    <Compile Include="UIHelpers\UploadStatusConverter.cs" />
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="SettingsWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Default\Default.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\MetroDark\MetroDark.Hotsapi.Implicit.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\MetroDark\MetroDark.MSControls.Core.Implicit.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\MetroDark\Styles.Shared.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\MetroDark\Styles.WPF.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\MetroDark\Theme.Colors.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Resource Include="Resources\uploader_dark.png" />
-    <Resource Include="Resources\uploader_light.png" />
-    <Resource Include="Resources\uploader_icon_dark.ico" />
-    <Resource Include="Resources\uploader_icon_light.ico" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Content Include="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-    <None Include="Hotsapi.Uploader.nuspec">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="NLog.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>PublicSettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Hotsapi.Uploader.Common\Hotsapi.Uploader.Common.csproj">
-      <Project>{DC695BCC-4403-4B20-B4F5-EB80683E5967}</Project>
-      <Name>Hotsapi.Uploader.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <!-- Need to glob and get last versions instead of hard coding a version. This will break when NuGet package is updated -->
-    <NuGetCommandLine Include="$(UserProfile)\.nuget\packages\NuGet.CommandLine\4.3.0\tools\nuget.exe">
-      <InProject>False</InProject>
-    </NuGetCommandLine>
-    <Squirrel Include="$(UserProfile)\.nuget\packages\Squirrel.Windows\1.7.8\tools\squirrel.exe">
-      <InProject>False</InProject>
-    </Squirrel>
-  </ItemGroup>
-  <Target Name="AfterBuild" DependsOnTargets="BuildZip;BuildInstaller" />
-  <Target Name="BuildZip" Condition=" '$(Configuration)' == 'Zip'">
-    <ItemGroup>
-      <ZipFiles Include="$(OutDir)\*.*" Exclude="**/*.nupkg;**/*.vshost.*;**/*.xml;**/*.pdb;**/*.snk*;**/Squirrel.dll;**/NuGet.Squirrel.dll;**/Splat.dll;**/DeltaCompressionDotNet.*;**/Mono.*" />
-    </ItemGroup>
-    <Zip Files="@(ZipFiles)" WorkingDirectory="$(OutDir)" ZipFileName="../Releases/HotsApi.zip" ZipLevel="9" />
-  </Target>
-  <Target Name="BuildInstaller" Condition=" '$(Configuration)' == 'Installer'">
-    <!-- Add some nice errors for the next person that comes along -->
-    <Error Condition="!Exists(@(NuGetCommandLine->'%(FullPath)'))" Text="You are trying to use the NuGet.CommandLine package, but it is not installed. Please install NuGet.CommandLine from the Package Manager." />
-    <Error Condition="!Exists(@(Squirrel->'%(FullPath)'))" Text="You are trying to use the Squirrel.Windows package, but it is not installed. Please install Squirrel.Windows from the Package Manager." />
-    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-      <Output TaskParameter="Assemblies" ItemName="assemblyInfo" />
-    </GetAssemblyIdentity>
-    <Exec Command="&quot;@(NuGetCommandLine->'%(FullPath)')&quot; pack $(TargetName).nuspec -Version $([System.Version]::Parse(%(assemblyInfo.Version)).ToString(3)) -OutputDirectory $(OutDir) -BasePath $(OutDir)" />
-    <Exec Command="&quot;@(Squirrel->'%(FullPath)')&quot; --framework-version=net462 --no-msi --releasify $(OutDir)$(TargetName).$([System.Version]::Parse(%(assemblyInfo.Version)).ToString(3)).nupkg --releaseDir=../Releases --setupIcon=Resources\uploader_icon_light.ico" />
-    <Move SourceFiles="../Releases/Setup.exe" DestinationFiles="../Releases/HotsApiUploaderSetup.exe" />
-    <Message Importance="High" Text="Successfully created setup package" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" 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)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F774F86B-410F-410D-9719-ADF892D315D5}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Hotsapi.Uploader.Windows</RootNamespace>
+    <AssemblyName>Hotsapi.Uploader</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NOSQUIRREL</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NOSQUIRREL</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\uploader_icon_light.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Zip|AnyCPU'">
+    <OutputPath>bin\Zip\</OutputPath>
+    <DefineConstants>TRACE;NOSQUIRREL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Installer|AnyCPU'">
+    <OutputPath>bin\Installer\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="DeltaCompressionDotNet" Version="1.1.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
+    <PackageReference Include="MSBuildTasks">
+      <Version>1.5.0.235</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="NLog" Version="4.5.11" />
+    <PackageReference Include="NLog.Config" Version="4.5.11" />
+    <PackageReference Include="NLog.Schema" Version="4.5.11" />
+    <PackageReference Include="NuGet.CommandLine" Version="4.3.0" />
+    <PackageReference Include="SharpCompress" Version="0.24.0" />
+    <PackageReference Include="Splat" Version="1.6.2" />
+    <PackageReference Include="squirrel.windows" Version="1.7.8" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="Program.cs" />
+    <Compile Include="SettingsWindow.xaml.cs">
+      <DependentUpon>SettingsWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UIHelpers\FilenameConverter.cs" />
+    <Compile Include="UIHelpers\FlagsConverter.cs" />
+    <Compile Include="UIHelpers\GenericValueConverter.cs" />
+    <Compile Include="UIHelpers\IntToVisibilityConverter.cs" />
+    <Compile Include="UIHelpers\MarginSetter.cs" />
+    <Compile Include="UIHelpers\UploadColorConverter.cs" />
+    <Compile Include="UIHelpers\UploadStatusConverter.cs" />
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="SettingsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Default\Default.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\MetroDark\MetroDark.Hotsapi.Implicit.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\MetroDark\MetroDark.MSControls.Core.Implicit.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\MetroDark\Styles.Shared.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\MetroDark\Styles.WPF.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\MetroDark\Theme.Colors.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Resource Include="Resources\uploader_dark.png" />
+    <Resource Include="Resources\uploader_light.png" />
+    <Resource Include="Resources\uploader_icon_dark.ico" />
+    <Resource Include="Resources\uploader_icon_light.ico" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <Content Include="NLog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
+    <None Include="Hotsapi.Uploader.nuspec">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="NLog.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Hotsapi.Uploader.Common\Hotsapi.Uploader.Common.csproj">
+      <Project>{DC695BCC-4403-4B20-B4F5-EB80683E5967}</Project>
+      <Name>Hotsapi.Uploader.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <!-- Need to glob and get last versions instead of hard coding a version. This will break when NuGet package is updated -->
+    <NuGetCommandLine Include="$(UserProfile)\.nuget\packages\NuGet.CommandLine\4.3.0\tools\nuget.exe">
+      <InProject>False</InProject>
+    </NuGetCommandLine>
+    <Squirrel Include="$(UserProfile)\.nuget\packages\Squirrel.Windows\1.7.8\tools\squirrel.exe">
+      <InProject>False</InProject>
+    </Squirrel>
+  </ItemGroup>
+  <Target Name="AfterBuild" DependsOnTargets="BuildZip;BuildInstaller" />
+  <Target Name="BuildZip" Condition=" '$(Configuration)' == 'Zip'">
+    <ItemGroup>
+      <ZipFiles Include="$(OutDir)\*.*" Exclude="**/*.nupkg;**/*.vshost.*;**/*.xml;**/*.pdb;**/*.snk*;**/Squirrel.dll;**/NuGet.Squirrel.dll;**/Splat.dll;**/DeltaCompressionDotNet.*;**/Mono.*" />
+    </ItemGroup>
+    <Zip Files="@(ZipFiles)" WorkingDirectory="$(OutDir)" ZipFileName="../Releases/HotsApi.zip" ZipLevel="9" />
+  </Target>
+  <Target Name="BuildInstaller" Condition=" '$(Configuration)' == 'Installer'">
+    <!-- Add some nice errors for the next person that comes along -->
+    <Error Condition="!Exists(@(NuGetCommandLine->'%(FullPath)'))" Text="You are trying to use the NuGet.CommandLine package, but it is not installed. Please install NuGet.CommandLine from the Package Manager." />
+    <Error Condition="!Exists(@(Squirrel->'%(FullPath)'))" Text="You are trying to use the Squirrel.Windows package, but it is not installed. Please install Squirrel.Windows from the Package Manager." />
+    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
+      <Output TaskParameter="Assemblies" ItemName="assemblyInfo" />
+    </GetAssemblyIdentity>
+    <Exec Command="&quot;@(NuGetCommandLine->'%(FullPath)')&quot; pack $(TargetName).nuspec -Version $([System.Version]::Parse(%(assemblyInfo.Version)).ToString(3)) -OutputDirectory $(OutDir) -BasePath $(OutDir)" />
+    <Exec Command="&quot;@(Squirrel->'%(FullPath)')&quot; --framework-version=net462 --no-msi --releasify $(OutDir)$(TargetName).$([System.Version]::Parse(%(assemblyInfo.Version)).ToString(3)).nupkg --releaseDir=../Releases --setupIcon=Resources\uploader_icon_light.ico" />
+    <Move SourceFiles="../Releases/Setup.exe" DestinationFiles="../Releases/HotsApiUploaderSetup.exe" />
+    <Message Importance="High" Text="Successfully created setup package" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Hotsapi.Uploader.sln b/Hotsapi.Uploader.sln
index 22a4c3f..045a5fc 100644
--- a/Hotsapi.Uploader.sln
+++ b/Hotsapi.Uploader.sln
@@ -1,71 +1,51 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29519.87
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hotsapi.Uploader.Common", "Hotsapi.Uploader.Common\Hotsapi.Uploader.Common.csproj", "{DC695BCC-4403-4B20-B4F5-EB80683E5967}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotsapi.Uploader.Windows", "Hotsapi.Uploader.Windows\Hotsapi.Uploader.Windows.csproj", "{F774F86B-410F-410D-9719-ADF892D315D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MpqTool.netstandard", "Heroes.ReplayParser\MpqTool\MpqTool.netstandard.csproj", "{401F4637-5826-4DDA-A666-A3B4D1994330}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Heroes.ReplayParser.netstandard", "Heroes.ReplayParser\Heroes.ReplayParser\Heroes.ReplayParser.netstandard.csproj", "{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotsapi.Uploader.Common.Test", "Hotsapi.Uploader.Common.Test\Hotsapi.Uploader.Common.Test.csproj", "{F0AF2897-857E-462E-86E0-2812624E2F78}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Installer|Any CPU = Installer|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Zip|Any CPU = Zip|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Installer|Any CPU.Build.0 = Release|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Zip|Any CPU.ActiveCfg = Release|Any CPU
-		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Zip|Any CPU.Build.0 = Release|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Installer|Any CPU.Build.0 = Installer|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Zip|Any CPU.ActiveCfg = Zip|Any CPU
-		{F774F86B-410F-410D-9719-ADF892D315D5}.Zip|Any CPU.Build.0 = Zip|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Installer|Any CPU.Build.0 = Release|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Release|Any CPU.Build.0 = Release|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Zip|Any CPU.ActiveCfg = Release|Any CPU
-		{401F4637-5826-4DDA-A666-A3B4D1994330}.Zip|Any CPU.Build.0 = Release|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Installer|Any CPU.Build.0 = Release|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Zip|Any CPU.ActiveCfg = Release|Any CPU
-		{7CEC9C7E-3DC6-4C72-8DFF-FE07D086B3A4}.Zip|Any CPU.Build.0 = Release|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Installer|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Installer|Any CPU.Build.0 = Debug|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Zip|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0AF2897-857E-462E-86E0-2812624E2F78}.Zip|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {24555457-A9E2-4C94-B0E4-1BC34F4C042B}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29519.87
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hotsapi.Uploader.Common", "Hotsapi.Uploader.Common\Hotsapi.Uploader.Common.csproj", "{DC695BCC-4403-4B20-B4F5-EB80683E5967}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotsapi.Uploader.Windows", "Hotsapi.Uploader.Windows\Hotsapi.Uploader.Windows.csproj", "{F774F86B-410F-410D-9719-ADF892D315D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hotsapi.Uploader.Common.Test", "Hotsapi.Uploader.Common.Test\Hotsapi.Uploader.Common.Test.csproj", "{F0AF2897-857E-462E-86E0-2812624E2F78}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Installer|Any CPU = Installer|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Zip|Any CPU = Zip|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Installer|Any CPU.ActiveCfg = Release|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Installer|Any CPU.Build.0 = Release|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Zip|Any CPU.ActiveCfg = Release|Any CPU
+		{DC695BCC-4403-4B20-B4F5-EB80683E5967}.Zip|Any CPU.Build.0 = Release|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Installer|Any CPU.Build.0 = Installer|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Zip|Any CPU.ActiveCfg = Zip|Any CPU
+		{F774F86B-410F-410D-9719-ADF892D315D5}.Zip|Any CPU.Build.0 = Zip|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Installer|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Installer|Any CPU.Build.0 = Debug|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Zip|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0AF2897-857E-462E-86E0-2812624E2F78}.Zip|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {24555457-A9E2-4C94-B0E4-1BC34F4C042B}
+	EndGlobalSection
+EndGlobal