diff --git a/UWP/.gitignore b/UWP/.gitignore
index 6890c884c0..dae79e7cea 100644
--- a/UWP/.gitignore
+++ b/UWP/.gitignore
@@ -1,7 +1,6 @@
 # We copy other files on top of these at build time, depending on configuration (Normal/Gold)
 
 Assets
-Package.appxmanifest
 AppPackages
 x64
 ARM
diff --git a/UWP/PackageNormal.appxmanifest b/UWP/PackageNormal.appxmanifest
deleted file mode 100644
index 9a2de41ac2..0000000000
--- a/UWP/PackageNormal.appxmanifest
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
-	<Identity Name="0ad29e1a-1069-4cf5-8c97-620892505f0c" Publisher="CN=Henrik" Version="1.16.0.0" />
-	<mp:PhoneIdentity PhoneProductId="0ad29e1a-1069-4cf5-8c97-620892505f0c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-	<Properties>
-		<DisplayName>PPSSPP - PSP emulator</DisplayName>
-		<PublisherDisplayName>Henrik Rydgård</PublisherDisplayName>
-		<Logo>Assets\StoreLogo.png</Logo>
-	</Properties>
-	<Dependencies>
-		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-	</Dependencies>
-	<Resources>
-		<Resource Language="x-generate" />
-	</Resources>
-	<Applications>
-		<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="PPSSPP.App">
-			<uap:VisualElements DisplayName="PPSSPP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="PPSSPP - PSP emulator" BackgroundColor="transparent">
-				<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
-				</uap:DefaultTile>
-				<uap:SplashScreen Image="Assets\SplashScreen.png" />
-				<uap:InitialRotationPreference>
-					<uap:Rotation Preference="landscape" />
-				</uap:InitialRotationPreference>
-			</uap:VisualElements>
-			<Extensions>
-				<uap:Extension Category="windows.fileTypeAssociation">
-					<uap:FileTypeAssociation Name="psprom">
-						<uap:SupportedFileTypes>
-							<uap:FileType>.cso</uap:FileType>
-							<uap:FileType>.bin</uap:FileType>
-							<uap:FileType>.iso</uap:FileType>
-							<uap:FileType>.elf</uap:FileType>
-						</uap:SupportedFileTypes>
-					</uap:FileTypeAssociation>
-				</uap:Extension>
-				<uap:Extension Category="windows.protocol">
-					<uap:Protocol Name="ppsspp"/>
-				</uap:Extension>
-			</Extensions>
-		</Application>
-	</Applications>
-	<Capabilities>
-		<Capability Name="codeGeneration" />
-		<Capability Name="internetClient" />
-		<uap:Capability Name="removableStorage" />
-		<rescap:Capability Name="runFullTrust"/>
-		<rescap:Capability Name="broadFileSystemAccess" />
-		<rescap:Capability Name="expandedResources" />
-		<Capability Name="internetClientServer"/>
-		<Capability Name="privateNetworkClientServer"/>
-	</Capabilities>
-</Package>
diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj
index c7389f0d50..9a24e4e231 100644
--- a/UWP/UWP.vcxproj
+++ b/UWP/UWP.vcxproj
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
@@ -29,10 +13,26 @@
       <Configuration>UWP Gold</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="UWP Gold|ARM64">
       <Configuration>UWP Gold</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="UWP Gold|x64">
       <Configuration>UWP Gold</Configuration>
       <Platform>x64</Platform>
@@ -103,7 +103,6 @@
     </ClCompile>
     <PreBuildEvent>
       <Command>
-				copy PackageNormal.appxmanifest Package.appxmanifest /Y
 				copy AssetsNormal\*.* Assets /Y
 				../Windows/git-version-gen.cmd
 				EXIT 0
@@ -127,7 +126,6 @@
     </ClCompile>
     <PreBuildEvent>
       <Command>
-				copy PackageNormal.appxmanifest Package.appxmanifest /Y
 				copy AssetsNormal\*.* Assets /Y
 				../Windows/git-version-gen.cmd
 				EXIT 0
@@ -175,7 +173,6 @@
     </ClCompile>
     <PreBuildEvent>
       <Command>
-				copy PackageNormal.appxmanifest Package.appxmanifest /Y
 				copy AssetsNormal\*.* Assets /Y
 				../Windows/git-version-gen.cmd
 				EXIT 0
@@ -199,7 +196,6 @@
     </ClCompile>
     <PreBuildEvent>
       <Command>
-				copy PackageNormal.appxmanifest Package.appxmanifest /Y
 				copy AssetsNormal\*.* Assets /Y
 				../Windows/git-version-gen.cmd
 				EXIT 0
@@ -247,7 +243,6 @@
     </ClCompile>
     <PreBuildEvent>
       <Command>
-				copy PackageNormal.appxmanifest Package.appxmanifest /Y
 				copy AssetsNormal\*.* Assets /Y
 				../Windows/git-version-gen.cmd
 				EXIT 0
@@ -271,7 +266,6 @@
     </ClCompile>
     <PreBuildEvent>
       <Command>
-				copy PackageNormal.appxmanifest Package.appxmanifest /Y
 				copy AssetsNormal\*.* Assets /Y
 				../Windows/git-version-gen.cmd
 				EXIT 0
@@ -307,6 +301,10 @@
       <SubType>Designer</SubType>
       <FileType>Document</FileType>
     </AppxManifest>
+    <None Include="PackageGold.appxmanifest">
+      <SubType>Designer</SubType>
+      <FileType>Document</FileType>
+    </None>
     <Image Include="Assets\StoreLogo.png">
       <DeploymentContent>True</DeploymentContent>
     </Image>
diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters
index 2b50af1b09..0b635f0f43 100644
--- a/UWP/UWP.vcxproj.filters
+++ b/UWP/UWP.vcxproj.filters
@@ -95,6 +95,9 @@
     <ClCompile Include="Common\DeviceResources.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\LockScreenLogo.scale-200.png">
       <Filter>Assets</Filter>
     </Image>
@@ -168,6 +171,7 @@
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
+    <None Include="PackageGold.appxmanifest" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\Assets\*.png">