diff --git a/BeatmapCombinator/.vs/BeatmapCombinator.csproj.dtbcache.json b/BeatmapCombinator/.vs/BeatmapCombinator.csproj.dtbcache.json
new file mode 100644
index 00000000..e8b9e532
--- /dev/null
+++ b/BeatmapCombinator/.vs/BeatmapCombinator.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\Projects\\osu-stream\\BeatmapCombinator","ProjectFileName":"BeatmapCombinator.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"BeatmapDifficulty.cs"},{"SourceFile":"FakeAudioTimeSource.cs"},{"SourceFile":"HitObjectLine.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.6.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Projects\\osu-stream\\osu!stream\\OpenTK.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Projects\\osu-stream\\osu!stream\\bin\\Debug\\osu!stream.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.DataSetExtensions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_32\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Projects\\osu-stream\\BeatmapCombinator\\bin\\Debug\\BeatmapCombinator.exe","OutputItemRelativePath":"BeatmapCombinator.exe"},{"OutputItemFullPath":"D:\\Projects\\osu-stream\\BeatmapCombinator\\bin\\Debug\\BeatmapCombinator.pdb","OutputItemRelativePath":"BeatmapCombinator.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/BeatmapCombinator/BeatmapCombinator.csproj b/BeatmapCombinator/BeatmapCombinator.csproj
index 0d3bce94..0320f919 100644
--- a/BeatmapCombinator/BeatmapCombinator.csproj
+++ b/BeatmapCombinator/BeatmapCombinator.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BeatmapCombinator</RootNamespace>
     <AssemblyName>BeatmapCombinator</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -68,6 +68,53 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;DIST M4A</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoEncryption|x64'">
+    <OutputPath>bin\x64\ReleaseNoEncryption\</OutputPath>
+    <DefineConstants>TRACE;M4A</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleasePreview|x64'">
+    <OutputPath>bin\x64\ReleasePreview\</OutputPath>
+    <DefineConstants>TRACE;DIST M4A PREVIEW</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
       <HintPath>..\osu!stream\OpenTK.dll</HintPath>
@@ -92,6 +139,9 @@
       <Name>osu!stream_desktop</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BeatmapCombinator/app.config b/BeatmapCombinator/app.config
new file mode 100644
index 00000000..3e0e37cf
--- /dev/null
+++ b/BeatmapCombinator/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/LocalisationUpdater/.vs/LocalisationUpdater.csproj.dtbcache.json b/LocalisationUpdater/.vs/LocalisationUpdater.csproj.dtbcache.json
new file mode 100644
index 00000000..30b24e2d
--- /dev/null
+++ b/LocalisationUpdater/.vs/LocalisationUpdater.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\Projects\\osu-stream\\LocalisationUpdater","ProjectFileName":"LocalisationUpdater.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Projects\\osu-stream\\LocalisationUpdater\\Google.GData.Client.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Projects\\osu-stream\\LocalisationUpdater\\Google.GData.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Projects\\osu-stream\\LocalisationUpdater\\Google.GData.Spreadsheets.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.CSharp\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.DataSetExtensions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_32\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Projects\\osu-stream\\LocalisationUpdater\\bin\\Debug\\LocalisationUpdater.exe","OutputItemRelativePath":"LocalisationUpdater.exe"},{"OutputItemFullPath":"D:\\Projects\\osu-stream\\LocalisationUpdater\\bin\\Debug\\LocalisationUpdater.pdb","OutputItemRelativePath":"LocalisationUpdater.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/LocalisationUpdater/LocalisationUpdater.csproj b/LocalisationUpdater/LocalisationUpdater.csproj
index 434e2cdf..22de2b84 100644
--- a/LocalisationUpdater/LocalisationUpdater.csproj
+++ b/LocalisationUpdater/LocalisationUpdater.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LocalisationUpdater</RootNamespace>
     <AssemblyName>LocalisationUpdater</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,6 +34,25 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Google.GData.Client">
@@ -55,6 +76,9 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/LocalisationUpdater/app.config b/LocalisationUpdater/app.config
new file mode 100644
index 00000000..3e0e37cf
--- /dev/null
+++ b/LocalisationUpdater/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/StreamTester/.vs/StreamTester.csproj.dtbcache.json b/StreamTester/.vs/StreamTester.csproj.dtbcache.json
new file mode 100644
index 00000000..60d2bdfd
--- /dev/null
+++ b/StreamTester/.vs/StreamTester.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\Projects\\osu-stream\\StreamTester","ProjectFileName":"StreamTester.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"ConsoleRedirection.cs"},{"SourceFile":"Form1.cs"},{"SourceFile":"Form1.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.6.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Projects\\osu-stream\\BeatmapCombinator\\bin\\Debug\\BeatmapCombinator.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Projects\\osu-stream\\osu!stream\\bin\\Debug\\osu!stream.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_32\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Deployment\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Drawing\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Windows.Forms\\v4.0_4.0.0.0__b77a5c561934e089\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Projects\\osu-stream\\StreamTester\\bin\\Debug\\StreamTester.exe","OutputItemRelativePath":"StreamTester.exe"},{"OutputItemFullPath":"D:\\Projects\\osu-stream\\StreamTester\\bin\\Debug\\StreamTester.pdb","OutputItemRelativePath":"StreamTester.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/StreamTester/Properties/Resources.Designer.cs b/StreamTester/Properties/Resources.Designer.cs
index 7cec82da..5265704b 100644
--- a/StreamTester/Properties/Resources.Designer.cs
+++ b/StreamTester/Properties/Resources.Designer.cs
@@ -1,23 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17020
+//     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>
 //------------------------------------------------------------------------------
 
-using System.CodeDom.Compiler;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.Globalization;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
 namespace StreamTester.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -25,27 +19,27 @@ namespace StreamTester.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [DebuggerNonUserCode()]
-    [CompilerGenerated()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
         
-        private static ResourceManager resourceMan;
+        private static global::System.Resources.ResourceManager resourceMan;
         
-        private static CultureInfo resourceCulture;
+        private static global::System.Globalization.CultureInfo resourceCulture;
         
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
         
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static ResourceManager ResourceManager {
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (ReferenceEquals(resourceMan, null)) {
-                    ResourceManager temp = new ResourceManager("StreamTester.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("StreamTester.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -56,8 +50,8 @@ internal static ResourceManager ResourceManager {
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static CultureInfo Culture {
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -66,10 +60,13 @@ internal static CultureInfo Culture {
             }
         }
         
-        internal static Bitmap arrow {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow {
             get {
                 object obj = ResourceManager.GetObject("arrow", resourceCulture);
-                return ((Bitmap)(obj));
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
     }
diff --git a/StreamTester/StreamTester.csproj b/StreamTester/StreamTester.csproj
index 633cfda0..320fecdb 100644
--- a/StreamTester/StreamTester.csproj
+++ b/StreamTester/StreamTester.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StreamTester</RootNamespace>
     <AssemblyName>StreamTester</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -37,6 +37,28 @@
   <PropertyGroup>
     <ApplicationIcon>osu!s.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -81,6 +103,9 @@
   <ItemGroup>
     <Content Include="osu!s.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/StreamTester/app.config b/StreamTester/app.config
new file mode 100644
index 00000000..3e0e37cf
--- /dev/null
+++ b/StreamTester/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 00000000..c20b1f3f
--- /dev/null
+++ b/UpgradeLog.htm
@@ -0,0 +1,273 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+ <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="ConversionReport0">
+          Migration Report
+        </title><style> 
+                    /* Body style, for the entire document */
+                    body
+                    {
+                        background: #F3F3F4;
+                        color: #1E1E1F;
+                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+                        padding: 0;
+                        margin: 0;
+                    }
+
+                    /* Header1 style, used for the main title */
+                    h1
+                    {
+                        padding: 10px 0px 10px 10px;
+                        font-size: 21pt;
+                        background-color: #E2E2E2;
+                        border-bottom: 1px #C1C1C2 solid; 
+                        color: #201F20;
+                        margin: 0;
+                        font-weight: normal;
+                    }
+
+                    /* Header2 style, used for "Overview" and other sections */
+                    h2
+                    {
+                        font-size: 18pt;
+                        font-weight: normal;
+                        padding: 15px 0 5px 0;
+                        margin: 0;
+                    }
+
+                    /* Header3 style, used for sub-sections, such as project name */
+                    h3
+                    {
+                        font-weight: normal;
+                        font-size: 15pt;
+                        margin: 0;
+                        padding: 15px 0 5px 0;
+                        background-color: transparent;
+                    }
+
+                    /* Color all hyperlinks one color */
+                    a
+                    {
+                        color: #1382CE;
+                    }
+
+                    /* Table styles */ 
+                    table
+                    {
+                        border-spacing: 0 0;
+                        border-collapse: collapse;
+                        font-size: 10pt;
+                    }
+
+                    table th
+                    {
+                        background: #E7E7E8;
+                        text-align: left;
+                        text-decoration: none;
+                        font-weight: normal;
+                        padding: 3px 6px 3px 6px;
+                    }
+
+                    table td
+                    {
+                        vertical-align: top;
+                        padding: 3px 6px 5px 5px;
+                        margin: 0px;
+                        border: 1px solid #E7E7E8;
+                        background: #F7F7F8;
+                    }
+
+                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+                    .localLink
+                    {
+                        color: #1E1E1F;
+                        background: #EEEEED;
+                        text-decoration: none;
+                    }
+
+                    .localLink:hover
+                    {
+                        color: #1382CE;
+                        background: #FFFF99;
+                        text-decoration: none;
+                    }
+
+                    /* Center text, used in the over views cells that contain message level counts */ 
+                    .textCentered
+                    {
+                        text-align: center;
+                    }
+
+                    /* The message cells in message tables should take up all avaliable space */
+                    .messageCell
+                    {
+                        width: 100%;
+                    }
+
+                    /* Padding around the content after the h1 */ 
+                    #content 
+                    {
+	                    padding: 0px 12px 12px 12px; 
+                    }
+
+                    /* The overview table expands to width, with a max width of 97% */ 
+                    #overview table
+                    {
+                        width: auto;
+                        max-width: 75%; 
+                    }
+
+                    /* The messages tables are always 97% width */
+                    #messages table
+                    {
+                        width: 97%;
+                    }
+
+                    /* All Icons */
+                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+                    {
+                        min-width:18px;
+                        min-height:18px; 
+                        background-repeat:no-repeat;
+                        background-position:center;
+                    }
+
+                    /* Success icon encoded */
+                    .IconSuccessEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconSuccess#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+                    }
+
+                    /* Information icon encoded */
+                    .IconInfoEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconInformation#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+                    }
+
+                    /* Warning icon encoded */
+                    .IconWarningEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconWarning#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+                    }
+
+                    /* Error icon encoded */
+                    .IconErrorEncoded
+                    {
+                        /* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
+                        /* [---XsltValidateInternal-Base64EncodedImage:IconError#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+                    }
+                 </style><script type="text/javascript" language="javascript"> 
+          
+            // Startup 
+            // Hook up the the loaded event for the document/window, to linkify the document content
+            var startupFunction = function() { linkifyElement("messages"); };
+            
+            if(window.attachEvent)
+            {
+              window.attachEvent('onload', startupFunction);
+            }
+            else if (window.addEventListener) 
+            {
+              window.addEventListener('load', startupFunction, false);
+            }
+            else 
+            {
+              document.addEventListener('load', startupFunction, false);
+            } 
+            
+            // Toggles the visibility of table rows with the specified name 
+            function toggleTableRowsByName(name)
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  if(!!currentName && currentName.indexOf(name) == 0)
+                  {
+                      var isVisible = allRows[i].style.display == ''; 
+                      isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
+                  }
+               }
+            }
+            
+            function scrollToFirstVisibleRow(name) 
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  var isVisible = allRows[i].style.display == ''; 
+                  if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
+                  {
+                     allRows[i].scrollIntoView(true); 
+                     return true; 
+                  }
+               }
+               
+               return false;
+            }
+            
+            // Linkifies the specified text content, replaces candidate links with html links 
+            function linkify(text)
+            {
+                 if(!text || 0 === text.length)
+                 {
+                     return text; 
+                 }
+
+                 // Find http, https and ftp links and replace them with hyper links 
+                 var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
+                 
+                 return text.replace(urlLink, '<a href="$&">$&</a>') ;
+            }
+            
+            // Linkifies the specified element by ID
+            function linkifyElement(id)
+            {
+                var element = document.getElementById(id);
+                if(!!element)
+                {
+                  element.innerHTML = linkify(element.innerHTML); 
+                }
+            }
+            
+            function ToggleMessageVisibility(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              toggleTableRowsByName("MessageRowClass" + projectName);
+              toggleTableRowsByName('MessageRowHeaderShow' + projectName);
+              toggleTableRowsByName('MessageRowHeaderHide' + projectName); 
+            }
+            
+            function ScrollToFirstVisibleMessage(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              // First try the 'Show messages' row
+              if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
+              {
+                // Failed to find a visible row for 'Show messages', try an actual message row 
+                scrollToFirstVisibleRow('MessageRowClass' + projectName); 
+              }
+            }
+           </script></head><body><h1 _locID="ConversionReport">
+          Migration Report - </h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div id="overview"><table><tr><th></th><th _locID="ProjectTableHeader">Project</th><th _locID="PathTableHeader">Path</th><th _locID="ErrorsTableHeader">Errors</th><th _locID="WarningsTableHeader">Warnings</th><th _locID="MessagesTableHeader">Messages</th></tr><tr><td class="IconErrorEncoded" /><td><strong><a href="#osu!stream_android">osu!stream_android</a></strong></td><td>osu!stream\osu!stream_android.csproj</td><td class="textCentered"><a href="#osu!stream_androidError">1</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr><tr><td class="IconSuccessEncoded" /><td><strong><a href="#Solution"><span _locID="OverviewSolutionSpan">Solution</span></a></strong></td><td>osu!stream_android.sln</td><td class="textCentered"><a>0</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#" onclick="ScrollToFirstVisibleMessage('Solution'); return false;">1</a></td></tr></table></div><h2 _locID="SolutionAndProjectsTitle">Solution and projects</h2><div id="messages"><a name="osu!stream_android" /><h3>osu!stream_android</h3><table><tr id="osu!stream_androidHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">Message</th></tr><tr name="ErrorRowClassosu!stream_android"><td class="IconErrorEncoded"><a name="osu!stream_androidError" /></td><td class="messageCell"><strong>osu!stream\osu!stream_android.csproj:
+        </strong><span>The application which this project type is based on was not found. Please try this link for further information: http://go.microsoft.com/fwlink/?LinkID=299083&amp;projecttype=EFBA0AD7-5A72-4C68-AF49-83D382785DCF</span></td></tr></table><a name="Solution" /><h3 _locID="ProjectDisplayNameHeader">Solution</h3><table><tr id="SolutionHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">Message</th></tr><tr name="MessageRowHeaderShowSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="ShowAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+          Show 1 additional messages
+        </a></td></tr><tr name="MessageRowClassSolution" style="display: none"><td class="IconInfoEncoded"><a name="SolutionMessage" /></td><td class="messageCell"><strong>osu!stream_android.sln:
+        </strong><span>The solution file does not require migration.</span></td></tr><tr style="display: none" name="MessageRowHeaderHideSolution"><td class="IconInfoEncoded" /><td class="messageCell"><a _locID="HideAdditionalMessages" href="#" name="SolutionMessage" onclick="ToggleMessageVisibility('Solution'); return false;">
+          Hide 1 additional messages
+        </a></td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/osu!stream/.vs/osu!stream_desktop.csproj.dtbcache.json b/osu!stream/.vs/osu!stream_desktop.csproj.dtbcache.json
new file mode 100644
index 00000000..e362bae7
--- /dev/null
+++ b/osu!stream/.vs/osu!stream_desktop.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\Projects\\osu-stream\\osu!stream","ProjectFileName":"osu!stream_desktop.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"AssetManager\\NativeAssetManager.cs"},{"SourceFile":"Audio\\AudioEngine.cs"},{"SourceFile":"Audio\\BackgroundAudioPlayerDesktop.cs"},{"SourceFile":"Audio\\ISoundEffectPlayer.cs"},{"SourceFile":"Audio\\IBackgroundAudioPlayer.cs"},{"SourceFile":"Audio\\SoundEffectPlayerBassDesktop.cs"},{"SourceFile":"Audio\\SoundEffectPlayerOpenAL.cs"},{"SourceFile":"Director.cs"},{"SourceFile":"GameBase.cs"},{"SourceFile":"GameModes\\Empty.cs"},{"SourceFile":"GameModes\\GameComponent.cs"},{"SourceFile":"GameModes\\GameMode.cs"},{"SourceFile":"GameModes\\MainMenu\\MainMenu.cs"},{"SourceFile":"GameModes\\MainMenu\\MainMenu_BeatMatching.cs"},{"SourceFile":"GameModes\\MainMenu\\MenuBackground.cs"},{"SourceFile":"GameModes\\MainMenu\\NewsButton.cs"},{"SourceFile":"GameModes\\Options\\Credits.cs"},{"SourceFile":"GameModes\\Options\\Options.cs"},{"SourceFile":"GameModes\\Play\\Components\\ComboCounter.cs"},{"SourceFile":"GameModes\\Play\\Components\\Countdown.cs"},{"SourceFile":"GameModes\\Play\\Components\\GuideFinger.cs"},{"SourceFile":"GameModes\\Play\\Components\\PauseMenu.cs"},{"SourceFile":"GameModes\\Play\\Components\\PlayfieldBackground.cs"},{"SourceFile":"GameModes\\Play\\Components\\ProgressDisplay.cs"},{"SourceFile":"GameModes\\Play\\Components\\ScoreDisplay.cs"},{"SourceFile":"GameModes\\Play\\Components\\StreamSwitchDisplay.cs"},{"SourceFile":"GameModes\\Play\\PlayCombinate.cs"},{"SourceFile":"GameModes\\Play\\Player.cs"},{"SourceFile":"GameModes\\Play\\PlayTest.cs"},{"SourceFile":"GameModes\\Play\\PreviewPlayer.cs"},{"SourceFile":"GameModes\\Play\\Rulesets\\Ruleset.cs"},{"SourceFile":"GameModes\\Play\\Tutorial.cs"},{"SourceFile":"GameModes\\PositioningTest.cs"},{"SourceFile":"GameModes\\Results\\Results.cs"},{"SourceFile":"GameModes\\Results\\ResultTransition.cs"},{"SourceFile":"GameModes\\SongSelect\\ScorePanel.cs"},{"SourceFile":"GameModes\\SongSelect\\SongSelect_Ranking.cs"},{"SourceFile":"GameModes\\SongSelect\\SongSelect.cs"},{"SourceFile":"GameModes\\SongSelect\\BackButton.cs"},{"SourceFile":"GameModes\\SongSelect\\BeatmapPanel.cs"},{"SourceFile":"GameModes\\SongSelect\\pTabController.cs"},{"SourceFile":"GameModes\\SongSelect\\SongSelect_DifficultySelection.cs"},{"SourceFile":"GameModes\\SongSelect\\SongSelect_SongInfo.cs"},{"SourceFile":"GameModes\\Store\\PackPanel.cs"},{"SourceFile":"GameModes\\Store\\StoreMode.cs"},{"SourceFile":"GameModes\\VideoPreview.cs"},{"SourceFile":"GameplayElements\\Beatmaps\\Beatmap.cs"},{"SourceFile":"GameplayElements\\Beatmaps\\BeatmapDifficultyInfo.cs"},{"SourceFile":"GameplayElements\\Beatmaps\\Beatmap_Timing.cs"},{"SourceFile":"GameplayElements\\Beatmaps\\ControlPoint.cs"},{"SourceFile":"GameplayElements\\Events\\Event.cs"},{"SourceFile":"GameplayElements\\HitFactory.cs"},{"SourceFile":"GameplayElements\\HitObjectManager.cs"},{"SourceFile":"GameplayElements\\HitObjectManagerPreview.cs"},{"SourceFile":"GameplayElements\\HitObjectManager_Load.cs"},{"SourceFile":"GameplayElements\\HitObjects\\HitObjectSpannable.cs"},{"SourceFile":"GameplayElements\\HitObjects\\Osu\\HitCircle.cs"},{"SourceFile":"GameplayElements\\HitObjects\\Osu\\HitFactoryOsu.cs"},{"SourceFile":"GameplayElements\\HitObjects\\HitObject.cs"},{"SourceFile":"GameplayElements\\HitObjects\\Osu\\HoldCircle.cs"},{"SourceFile":"GameplayElements\\HitObjects\\Osu\\Slider.cs"},{"SourceFile":"GameplayElements\\HitObjects\\Osu\\Spinner.cs"},{"SourceFile":"GameModes\\Play\\Components\\HealthBar.cs"},{"SourceFile":"GameplayElements\\Scoring\\Score.cs"},{"SourceFile":"Graphics\\Drawables\\CircularProgress.cs"},{"SourceFile":"Graphics\\Drawables\\ApproachCircle.cs"},{"SourceFile":"Graphics\\SpriteSheetTexture.cs"},{"SourceFile":"Graphics\\Sprites\\pQuad.cs"},{"SourceFile":"Graphics\\Sprites\\pSpriteDynamic.cs"},{"SourceFile":"Graphics\\Sprites\\pSpriteWeb.cs"},{"SourceFile":"Graphics\\Sprites\\SpriteManagerDraggable.cs"},{"SourceFile":"Graphics\\TextureManager_Load.cs"},{"SourceFile":"Graphics\\TouchBurster.cs"},{"SourceFile":"Graphics\\Primitives\\Line.cs"},{"SourceFile":"Graphics\\Renderers\\NativeTextRenderer.cs"},{"SourceFile":"Graphics\\Renderers\\NativeTextRendererDesktop.cs"},{"SourceFile":"Graphics\\Renderers\\SliderTrackRenderer.cs"},{"SourceFile":"Graphics\\Sprites\\pButton.cs"},{"SourceFile":"Graphics\\Sprites\\pDrawable.cs"},{"SourceFile":"Graphics\\Sprites\\pRectangle.cs"},{"SourceFile":"Graphics\\Sprites\\pDrawable_Interaction.cs"},{"SourceFile":"Graphics\\Sprites\\pText.cs"},{"SourceFile":"Graphics\\TextureManager.cs"},{"SourceFile":"Helpers\\Audio\\AudioReader.cs"},{"SourceFile":"Helpers\\Audio\\AudioReaderException.cs"},{"SourceFile":"Helpers\\Audio\\Sound.cs"},{"SourceFile":"Helpers\\Audio\\SoundData.cs"},{"SourceFile":"Helpers\\Audio\\SoundFormat.cs"},{"SourceFile":"Helpers\\Audio\\WaveReader.cs"},{"SourceFile":"Helpers\\ColourHelper.cs"},{"SourceFile":"Helpers\\ListHelper.cs"},{"SourceFile":"Helpers\\osu!common\\Aes.cs"},{"SourceFile":"Helpers\\osu!common\\AesManaged.cs"},{"SourceFile":"Helpers\\osu!common\\bSerializable.cs"},{"SourceFile":"Helpers\\osu!common\\CryptoHelper.cs"},{"SourceFile":"Helpers\\osu!common\\DynamicDeserializer.cs"},{"SourceFile":"Helpers\\osu!common\\FastEncryptionProvider.cs"},{"SourceFile":"Helpers\\osu!common\\FastEncryptorStream.cs"},{"SourceFile":"Helpers\\osu!common\\FastRandom.cs"},{"SourceFile":"Helpers\\osu!common\\FastSerializer.cs"},{"SourceFile":"Helpers\\osu!common\\GeneralHelper.cs"},{"SourceFile":"Helpers\\osu!common\\MapPackage.cs"},{"SourceFile":"Helpers\\osu!common\\MapStream.cs"},{"SourceFile":"Helpers\\osu!common\\Scheduler.cs"},{"SourceFile":"Helpers\\pConfigManager.cs"},{"SourceFile":"Helpers\\pList.cs"},{"SourceFile":"Helpers\\pMathHelper.cs"},{"SourceFile":"Helpers\\UnixTimestamp.cs"},{"SourceFile":"Input\\Sources\\InputSourceBaanto.cs"},{"SourceFile":"Input\\Sources\\InputSource.cs"},{"SourceFile":"Input\\Sources\\InputSourceMouse.cs"},{"SourceFile":"Input\\Sources\\InputSourceRawBase.cs"},{"SourceFile":"Input\\Sources\\InputSourceRaw.cs"},{"SourceFile":"Input\\Sources\\UsbHID\\Interface.cs"},{"SourceFile":"Input\\Sources\\UsbHID\\USB\\HidDeclarations.cs"},{"SourceFile":"Input\\Sources\\UsbHID\\USB\\HIDUSBDevice.cs"},{"SourceFile":"Input\\Sources\\UsbHID\\USB\\ListWithEvent.cs"},{"SourceFile":"Input\\Sources\\UsbHID\\USB\\USBSharp.cs"},{"SourceFile":"Input\\TrackingPoint.cs"},{"SourceFile":"Libraries\\NetLib\\DataNetRequest.cs"},{"SourceFile":"Libraries\\NetLib\\FileNetRequest.cs"},{"SourceFile":"Libraries\\NetLib\\NetManager.cs"},{"SourceFile":"Libraries\\NetLib\\NetRequest.cs"},{"SourceFile":"Libraries\\NetLib\\StringNetRequest.cs"},{"SourceFile":"Localisation\\LocalisationManager.cs"},{"SourceFile":"Main.cs"},{"SourceFile":"GameplayElements\\BeatmapDatabase.cs"},{"SourceFile":"GameplayElements\\DifficultyManager.cs"},{"SourceFile":"Helpers\\Clock.cs"},{"SourceFile":"Helpers\\Delegates.cs"},{"SourceFile":"Graphics\\pTexture.cs"},{"SourceFile":"Graphics\\TextureGl.cs"},{"SourceFile":"Graphics\\Sprites\\SpriteManager.cs"},{"SourceFile":"Support\\Benchmarker.cs"},{"SourceFile":"Support\\CrashHandler.cs"},{"SourceFile":"Support\\FadeTransition.cs"},{"SourceFile":"Support\\DebugOverlay.cs"},{"SourceFile":"Support\\IDrawable.cs"},{"SourceFile":"Graphics\\Sprites\\pAnimation.cs"},{"SourceFile":"Graphics\\Sprites\\pSprite.cs"},{"SourceFile":"Graphics\\Sprites\\pSpriteCollection.cs"},{"SourceFile":"Graphics\\Sprites\\pSpriteText.cs"},{"SourceFile":"Graphics\\Sprites\\SpriteEffect.cs"},{"SourceFile":"Graphics\\Sprites\\Transform.cs"},{"SourceFile":"Input\\InputManager.cs"},{"SourceFile":"Constants.cs"},{"SourceFile":"Support\\Desktop\\GameBaseDesktop.cs"},{"SourceFile":"Support\\Desktop\\GameWindowDesktop.cs"},{"SourceFile":"Support\\ITimeSource.cs"},{"SourceFile":"Support\\IUpdateable.cs"},{"SourceFile":"Support\\Transition.cs"},{"SourceFile":"UI\\Notification.cs"},{"SourceFile":"UI\\SliderControl.cs"},{"SourceFile":"UI\\TextInputNotification.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.5.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Projects\\osu-stream\\osu!stream\\Bass.Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Projects\\osu-stream\\osu!stream\\OpenTK.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_32\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Drawing\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Net.Http\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Windows.Forms\\v4.0_4.0.0.0__b77a5c561934e089\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Projects\\osu-stream\\osu!stream\\bin\\Debug\\osu!stream.exe","OutputItemRelativePath":"osu!stream.exe"},{"OutputItemFullPath":"D:\\Projects\\osu-stream\\osu!stream\\bin\\Debug\\osu!stream.pdb","OutputItemRelativePath":"osu!stream.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/osu!stream/GameModes/Options/Options.cs b/osu!stream/GameModes/Options/Options.cs
index f08b280c..3307a086 100644
--- a/osu!stream/GameModes/Options/Options.cs
+++ b/osu!stream/GameModes/Options/Options.cs
@@ -126,7 +126,7 @@ public override void Initialize()
 
             vPos += 60;
 
-            const int offset_range = 32;
+            const int offset_range = 300;
 
             universalOffsetSlider = new SliderControl(LocalisationManager.GetString(OsuString.UniversalOffset), (float)(Clock.USER_OFFSET + offset_range) / (offset_range * 2), new Vector2(button_x_offset - 30, vPos),
                 delegate(float v)
diff --git a/osu!stream/app.config b/osu!stream/app.config
new file mode 100644
index 00000000..3e0e37cf
--- /dev/null
+++ b/osu!stream/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/osu!stream/osu!stream_desktop.csproj b/osu!stream/osu!stream_desktop.csproj
index eb73f57b..717ed00a 100644
--- a/osu!stream/osu!stream_desktop.csproj
+++ b/osu!stream/osu!stream_desktop.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,8 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>osum</RootNamespace>
     <AssemblyName>osu!stream</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,6 +59,41 @@
   <PropertyGroup>
     <ApplicationIcon>osu!s.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG OSUM MONO MAPPER</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;MONO OSUM DIST</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoEncryption|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\ReleaseNoEncryption\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;MONO OSUM</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="AssetManager\NativeAssetManager.cs" />
@@ -484,6 +520,7 @@
     <Folder Include="GameModes\Play\Rulesets\Osu\" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Beatmaps\nekodex - Liquid Future %28mm201%29.osf2">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/osu!stream_desktop.sln b/osu!stream_desktop.sln
index 6adf2fef..3e7bfe2f 100644
--- a/osu!stream_desktop.sln
+++ b/osu!stream_desktop.sln
@@ -1,7 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu!stream", "osu!stream\osu!stream_desktop.csproj", "{2698AF2E-F64B-4D61-99F3-52EF2D215F2F}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35027.167
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu!stream_desktop", "osu!stream\osu!stream_desktop.csproj", "{2698AF2E-F64B-4D61-99F3-52EF2D215F2F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeatmapCombinator", "BeatmapCombinator\BeatmapCombinator.csproj", "{EE17F8FB-6F6F-41CC-B384-7CC9FF1B1CCF}"
 EndProject
@@ -36,12 +38,12 @@ Global
 		{EE17F8FB-6F6F-41CC-B384-7CC9FF1B1CCF}.ReleaseNoEncryption|x86.ActiveCfg = ReleaseNoEncryption|x86
 		{EE17F8FB-6F6F-41CC-B384-7CC9FF1B1CCF}.ReleaseNoEncryption|x86.Build.0 = ReleaseNoEncryption|x86
 		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.ReleaseLocal|x86.ActiveCfg = Release|Any CPU
-		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.ReleaseNoEncryption|x86.ActiveCfg = Release|Any CPU
 		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.Debug|x86.Build.0 = Debug|Any CPU
+		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.Release|x86.ActiveCfg = Release|Any CPU
 		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.Release|x86.Build.0 = Release|Any CPU
+		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.ReleaseLocal|x86.ActiveCfg = Release|Any CPU
 		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.ReleaseLocal|x86.Build.0 = Release|Any CPU
+		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.ReleaseNoEncryption|x86.ActiveCfg = Release|Any CPU
 		{1AC0A15F-98D2-477D-A620-A8F7B79935F4}.ReleaseNoEncryption|x86.Build.0 = Release|Any CPU
 		{C6404F0D-4669-4D8D-ABD5-22107C83D7D4}.Debug|x86.ActiveCfg = Debug|x86
 		{C6404F0D-4669-4D8D-ABD5-22107C83D7D4}.Debug|x86.Build.0 = Debug|x86
@@ -63,6 +65,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5D74709A-FB94-425F-B736-0E1EA7D420A7}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = osum\osum.csproj
 	EndGlobalSection
diff --git a/sspack/.vs/sspack.csproj.dtbcache.json b/sspack/.vs/sspack.csproj.dtbcache.json
new file mode 100644
index 00000000..508de814
--- /dev/null
+++ b/sspack/.vs/sspack.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\Projects\\osu-stream\\sspack","ProjectFileName":"sspack.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Exporters\\BmpImageExporter.cs"},{"SourceFile":"Exporters\\JpegImageExporter.cs"},{"SourceFile":"Packing\\ArevaloRectanglePacker.cs"},{"SourceFile":"Constants.cs"},{"SourceFile":"Exporters\\Exporters.cs"},{"SourceFile":"Exporters\\PngImageExporter.cs"},{"SourceFile":"Exporters\\TxtMapExporter.cs"},{"SourceFile":"Exporters\\IImageExporter.cs"},{"SourceFile":"Exporters\\IMapExporter.cs"},{"SourceFile":"Packing\\ImagePacker.cs"},{"SourceFile":"Packing\\MiscHelper.cs"},{"SourceFile":"Packing\\OutOfSpaceException.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"ProgramArguments.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Packing\\RectanglePacker.cs"}],"References":[{"Reference":"C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Projects\\osu-stream\\sspack\\bin\\Debug\\sspack.exe","OutputItemRelativePath":"sspack.exe"},{"OutputItemFullPath":"D:\\Projects\\osu-stream\\sspack\\bin\\Debug\\sspack.pdb","OutputItemRelativePath":"sspack.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/sspack/app.config b/sspack/app.config
index 8494f728..99dca759 100644
--- a/sspack/app.config
+++ b/sspack/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/sspack/sspack.csproj b/sspack/sspack.csproj
index b457a155..ad57c0d4 100644
--- a/sspack/sspack.csproj
+++ b/sspack/sspack.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,9 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>sspack</RootNamespace>
     <AssemblyName>sspack</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>sspack.Program</StartupObject>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -29,6 +31,25 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />