diff --git a/_chver.sh b/_chver.sh
index 32eca302542..a149b66233a 100755
--- a/_chver.sh
+++ b/_chver.sh
@@ -33,7 +33,5 @@ _EOF
 # First run sed to substitute our variable in the sed command file
 sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" cmd.sed
 sed -b -i -f cmd.sed src/rufus.rc
-sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
-sed -b -i -f cmd.sed res/appstore/packme.cmd
 rm cmd.sed
 source ./bootstrap.sh
diff --git a/_pre-commit.sh b/_pre-commit.sh
index 15ccb63a516..12469c41ef9 100755
--- a/_pre-commit.sh
+++ b/_pre-commit.sh
@@ -38,9 +38,7 @@ _EOF
 sed -i -e "s/@@BUILD@@/$BUILD/g" cmd.sed
 # Run sed to update the nano version
 sed -b -i -f cmd.sed src/rufus.rc
-sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
 # NB: we need to run git add else the modified files may be ignored
 git add src/rufus.rc
-git add res/appstore/Package.appxmanifest
 
 rm cmd.sed
diff --git a/res/appstore/Package.StoreAssociation.xml b/res/appstore/Package.StoreAssociation.xml
deleted file mode 100644
index ea5c04d4081..00000000000
--- a/res/appstore/Package.StoreAssociation.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">
-  <Publisher>CN=7AC86D13-3E5A-491A-ADD5-80095C212740</Publisher>
-  <PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
-  <DeveloperAccountType>MSA</DeveloperAccountType>
-  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>
-  <SupportedLocales>
-    <Language Code="af" InMinimumRequirementSet="true" />
-    <Language Code="af-za" InMinimumRequirementSet="true" />
-    <Language Code="am" InMinimumRequirementSet="true" />
-    <Language Code="am-et" InMinimumRequirementSet="true" />
-    <Language Code="ar" InMinimumRequirementSet="true" />
-    <Language Code="ar-ae" InMinimumRequirementSet="true" />
-    <Language Code="ar-bh" InMinimumRequirementSet="true" />
-    <Language Code="ar-dz" InMinimumRequirementSet="true" />
-    <Language Code="ar-eg" InMinimumRequirementSet="true" />
-    <Language Code="ar-iq" InMinimumRequirementSet="true" />
-    <Language Code="ar-jo" InMinimumRequirementSet="true" />
-    <Language Code="ar-kw" InMinimumRequirementSet="true" />
-    <Language Code="ar-lb" InMinimumRequirementSet="true" />
-    <Language Code="ar-ly" InMinimumRequirementSet="true" />
-    <Language Code="ar-ma" InMinimumRequirementSet="true" />
-    <Language Code="ar-om" InMinimumRequirementSet="true" />
-    <Language Code="ar-qa" InMinimumRequirementSet="true" />
-    <Language Code="ar-sa" InMinimumRequirementSet="true" />
-    <Language Code="ar-sy" InMinimumRequirementSet="true" />
-    <Language Code="ar-tn" InMinimumRequirementSet="true" />
-    <Language Code="ar-ye" InMinimumRequirementSet="true" />
-    <Language Code="as" InMinimumRequirementSet="true" />
-    <Language Code="as-in" InMinimumRequirementSet="true" />
-    <Language Code="az" InMinimumRequirementSet="true" />
-    <Language Code="az-arab" InMinimumRequirementSet="true" />
-    <Language Code="az-arab-az" InMinimumRequirementSet="true" />
-    <Language Code="az-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="az-cyrl-az" InMinimumRequirementSet="true" />
-    <Language Code="az-latn" InMinimumRequirementSet="true" />
-    <Language Code="az-latn-az" InMinimumRequirementSet="true" />
-    <Language Code="be" InMinimumRequirementSet="true" />
-    <Language Code="be-by" InMinimumRequirementSet="true" />
-    <Language Code="bg" InMinimumRequirementSet="true" />
-    <Language Code="bg-bg" InMinimumRequirementSet="true" />
-    <Language Code="bn" InMinimumRequirementSet="true" />
-    <Language Code="bn-bd" InMinimumRequirementSet="true" />
-    <Language Code="bn-in" InMinimumRequirementSet="true" />
-    <Language Code="bs" InMinimumRequirementSet="true" />
-    <Language Code="bs-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="true" />
-    <Language Code="bs-latn" InMinimumRequirementSet="true" />
-    <Language Code="bs-latn-ba" InMinimumRequirementSet="true" />
-    <Language Code="ca" InMinimumRequirementSet="true" />
-    <Language Code="ca-es" InMinimumRequirementSet="true" />
-    <Language Code="ca-es-valencia" InMinimumRequirementSet="true" />
-    <Language Code="chr-cher" InMinimumRequirementSet="true" />
-    <Language Code="chr-cher-us" InMinimumRequirementSet="true" />
-    <Language Code="chr-latn" InMinimumRequirementSet="true" />
-    <Language Code="cs" InMinimumRequirementSet="true" />
-    <Language Code="cs-cz" InMinimumRequirementSet="true" />
-    <Language Code="cy" InMinimumRequirementSet="true" />
-    <Language Code="cy-gb" InMinimumRequirementSet="true" />
-    <Language Code="da" InMinimumRequirementSet="true" />
-    <Language Code="da-dk" InMinimumRequirementSet="true" />
-    <Language Code="de" InMinimumRequirementSet="true" />
-    <Language Code="de-at" InMinimumRequirementSet="true" />
-    <Language Code="de-ch" InMinimumRequirementSet="true" />
-    <Language Code="de-de" InMinimumRequirementSet="true" />
-    <Language Code="de-li" InMinimumRequirementSet="true" />
-    <Language Code="de-lu" InMinimumRequirementSet="true" />
-    <Language Code="el" InMinimumRequirementSet="true" />
-    <Language Code="el-gr" InMinimumRequirementSet="true" />
-    <Language Code="en" InMinimumRequirementSet="true" />
-    <Language Code="en-011" InMinimumRequirementSet="true" />
-    <Language Code="en-014" InMinimumRequirementSet="true" />
-    <Language Code="en-018" InMinimumRequirementSet="true" />
-    <Language Code="en-021" InMinimumRequirementSet="true" />
-    <Language Code="en-029" InMinimumRequirementSet="true" />
-    <Language Code="en-053" InMinimumRequirementSet="true" />
-    <Language Code="en-au" InMinimumRequirementSet="true" />
-    <Language Code="en-bz" InMinimumRequirementSet="true" />
-    <Language Code="en-ca" InMinimumRequirementSet="true" />
-    <Language Code="en-gb" InMinimumRequirementSet="true" />
-    <Language Code="en-hk" InMinimumRequirementSet="true" />
-    <Language Code="en-id" InMinimumRequirementSet="true" />
-    <Language Code="en-ie" InMinimumRequirementSet="true" />
-    <Language Code="en-in" InMinimumRequirementSet="true" />
-    <Language Code="en-jm" InMinimumRequirementSet="true" />
-    <Language Code="en-kz" InMinimumRequirementSet="true" />
-    <Language Code="en-mt" InMinimumRequirementSet="true" />
-    <Language Code="en-my" InMinimumRequirementSet="true" />
-    <Language Code="en-nz" InMinimumRequirementSet="true" />
-    <Language Code="en-ph" InMinimumRequirementSet="true" />
-    <Language Code="en-pk" InMinimumRequirementSet="true" />
-    <Language Code="en-sg" InMinimumRequirementSet="true" />
-    <Language Code="en-tt" InMinimumRequirementSet="true" />
-    <Language Code="en-us" InMinimumRequirementSet="true" />
-    <Language Code="en-vn" InMinimumRequirementSet="true" />
-    <Language Code="en-za" InMinimumRequirementSet="true" />
-    <Language Code="en-zw" InMinimumRequirementSet="true" />
-    <Language Code="es" InMinimumRequirementSet="true" />
-    <Language Code="es-019" InMinimumRequirementSet="true" />
-    <Language Code="es-419" InMinimumRequirementSet="true" />
-    <Language Code="es-ar" InMinimumRequirementSet="true" />
-    <Language Code="es-bo" InMinimumRequirementSet="true" />
-    <Language Code="es-cl" InMinimumRequirementSet="true" />
-    <Language Code="es-co" InMinimumRequirementSet="true" />
-    <Language Code="es-cr" InMinimumRequirementSet="true" />
-    <Language Code="es-do" InMinimumRequirementSet="true" />
-    <Language Code="es-ec" InMinimumRequirementSet="true" />
-    <Language Code="es-es" InMinimumRequirementSet="true" />
-    <Language Code="es-gt" InMinimumRequirementSet="true" />
-    <Language Code="es-hn" InMinimumRequirementSet="true" />
-    <Language Code="es-mx" InMinimumRequirementSet="true" />
-    <Language Code="es-ni" InMinimumRequirementSet="true" />
-    <Language Code="es-pa" InMinimumRequirementSet="true" />
-    <Language Code="es-pe" InMinimumRequirementSet="true" />
-    <Language Code="es-pr" InMinimumRequirementSet="true" />
-    <Language Code="es-py" InMinimumRequirementSet="true" />
-    <Language Code="es-sv" InMinimumRequirementSet="true" />
-    <Language Code="es-us" InMinimumRequirementSet="true" />
-    <Language Code="es-uy" InMinimumRequirementSet="true" />
-    <Language Code="es-ve" InMinimumRequirementSet="true" />
-    <Language Code="et" InMinimumRequirementSet="true" />
-    <Language Code="et-ee" InMinimumRequirementSet="true" />
-    <Language Code="eu" InMinimumRequirementSet="true" />
-    <Language Code="eu-es" InMinimumRequirementSet="true" />
-    <Language Code="fa" InMinimumRequirementSet="true" />
-    <Language Code="fa-ir" InMinimumRequirementSet="true" />
-    <Language Code="fi" InMinimumRequirementSet="true" />
-    <Language Code="fi-fi" InMinimumRequirementSet="true" />
-    <Language Code="fil" InMinimumRequirementSet="true" />
-    <Language Code="fil-latn" InMinimumRequirementSet="true" />
-    <Language Code="fil-ph" InMinimumRequirementSet="true" />
-    <Language Code="fr" InMinimumRequirementSet="true" />
-    <Language Code="fr-011" InMinimumRequirementSet="true" />
-    <Language Code="fr-015" InMinimumRequirementSet="true" />
-    <Language Code="fr-021" InMinimumRequirementSet="true" />
-    <Language Code="fr-029" InMinimumRequirementSet="true" />
-    <Language Code="fr-155" InMinimumRequirementSet="true" />
-    <Language Code="fr-be" InMinimumRequirementSet="true" />
-    <Language Code="fr-ca" InMinimumRequirementSet="true" />
-    <Language Code="fr-cd" InMinimumRequirementSet="true" />
-    <Language Code="fr-ch" InMinimumRequirementSet="true" />
-    <Language Code="fr-ci" InMinimumRequirementSet="true" />
-    <Language Code="fr-cm" InMinimumRequirementSet="true" />
-    <Language Code="fr-fr" InMinimumRequirementSet="true" />
-    <Language Code="fr-ht" InMinimumRequirementSet="true" />
-    <Language Code="fr-lu" InMinimumRequirementSet="true" />
-    <Language Code="fr-ma" InMinimumRequirementSet="true" />
-    <Language Code="fr-mc" InMinimumRequirementSet="true" />
-    <Language Code="fr-ml" InMinimumRequirementSet="true" />
-    <Language Code="fr-re" InMinimumRequirementSet="true" />
-    <Language Code="frc-latn" InMinimumRequirementSet="true" />
-    <Language Code="frp-latn" InMinimumRequirementSet="true" />
-    <Language Code="ga" InMinimumRequirementSet="true" />
-    <Language Code="ga-ie" InMinimumRequirementSet="true" />
-    <Language Code="gd-gb" InMinimumRequirementSet="true" />
-    <Language Code="gd-latn" InMinimumRequirementSet="true" />
-    <Language Code="gl" InMinimumRequirementSet="true" />
-    <Language Code="gl-es" InMinimumRequirementSet="true" />
-    <Language Code="gu" InMinimumRequirementSet="true" />
-    <Language Code="gu-in" InMinimumRequirementSet="true" />
-    <Language Code="ha" InMinimumRequirementSet="true" />
-    <Language Code="ha-latn" InMinimumRequirementSet="true" />
-    <Language Code="ha-latn-ng" InMinimumRequirementSet="true" />
-    <Language Code="he" InMinimumRequirementSet="true" />
-    <Language Code="he-il" InMinimumRequirementSet="true" />
-    <Language Code="hi" InMinimumRequirementSet="true" />
-    <Language Code="hi-in" InMinimumRequirementSet="true" />
-    <Language Code="hr" InMinimumRequirementSet="true" />
-    <Language Code="hr-ba" InMinimumRequirementSet="true" />
-    <Language Code="hr-hr" InMinimumRequirementSet="true" />
-    <Language Code="hu" InMinimumRequirementSet="true" />
-    <Language Code="hu-hu" InMinimumRequirementSet="true" />
-    <Language Code="hy" InMinimumRequirementSet="true" />
-    <Language Code="hy-am" InMinimumRequirementSet="true" />
-    <Language Code="id" InMinimumRequirementSet="true" />
-    <Language Code="id-id" InMinimumRequirementSet="true" />
-    <Language Code="ig-latn" InMinimumRequirementSet="true" />
-    <Language Code="ig-ng" InMinimumRequirementSet="true" />
-    <Language Code="is" InMinimumRequirementSet="true" />
-    <Language Code="is-is" InMinimumRequirementSet="true" />
-    <Language Code="it" InMinimumRequirementSet="true" />
-    <Language Code="it-ch" InMinimumRequirementSet="true" />
-    <Language Code="it-it" InMinimumRequirementSet="true" />
-    <Language Code="iu-cans" InMinimumRequirementSet="true" />
-    <Language Code="iu-latn" InMinimumRequirementSet="true" />
-    <Language Code="iu-latn-ca" InMinimumRequirementSet="true" />
-    <Language Code="ja" InMinimumRequirementSet="true" />
-    <Language Code="ja-jp" InMinimumRequirementSet="true" />
-    <Language Code="ka" InMinimumRequirementSet="true" />
-    <Language Code="ka-ge" InMinimumRequirementSet="true" />
-    <Language Code="kk" InMinimumRequirementSet="true" />
-    <Language Code="kk-kz" InMinimumRequirementSet="true" />
-    <Language Code="km" InMinimumRequirementSet="true" />
-    <Language Code="km-kh" InMinimumRequirementSet="true" />
-    <Language Code="kn" InMinimumRequirementSet="true" />
-    <Language Code="kn-in" InMinimumRequirementSet="true" />
-    <Language Code="ko" InMinimumRequirementSet="true" />
-    <Language Code="ko-kr" InMinimumRequirementSet="true" />
-    <Language Code="kok" InMinimumRequirementSet="true" />
-    <Language Code="kok-in" InMinimumRequirementSet="true" />
-    <Language Code="ku-arab" InMinimumRequirementSet="true" />
-    <Language Code="ku-arab-iq" InMinimumRequirementSet="true" />
-    <Language Code="ky-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="ky-kg" InMinimumRequirementSet="true" />
-    <Language Code="lb" InMinimumRequirementSet="true" />
-    <Language Code="lb-lu" InMinimumRequirementSet="true" />
-    <Language Code="lo" InMinimumRequirementSet="true" />
-    <Language Code="lo-la" InMinimumRequirementSet="true" />
-    <Language Code="lt" InMinimumRequirementSet="true" />
-    <Language Code="lt-lt" InMinimumRequirementSet="true" />
-    <Language Code="lv" InMinimumRequirementSet="true" />
-    <Language Code="lv-lv" InMinimumRequirementSet="true" />
-    <Language Code="mi" InMinimumRequirementSet="true" />
-    <Language Code="mi-latn" InMinimumRequirementSet="true" />
-    <Language Code="mi-nz" InMinimumRequirementSet="true" />
-    <Language Code="mk" InMinimumRequirementSet="true" />
-    <Language Code="mk-mk" InMinimumRequirementSet="true" />
-    <Language Code="ml" InMinimumRequirementSet="true" />
-    <Language Code="ml-in" InMinimumRequirementSet="true" />
-    <Language Code="mn-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="mn-mn" InMinimumRequirementSet="true" />
-    <Language Code="mn-mong" InMinimumRequirementSet="true" />
-    <Language Code="mn-phag" InMinimumRequirementSet="true" />
-    <Language Code="mr" InMinimumRequirementSet="true" />
-    <Language Code="mr-in" InMinimumRequirementSet="true" />
-    <Language Code="ms" InMinimumRequirementSet="true" />
-    <Language Code="ms-bn" InMinimumRequirementSet="true" />
-    <Language Code="ms-my" InMinimumRequirementSet="true" />
-    <Language Code="mt" InMinimumRequirementSet="true" />
-    <Language Code="mt-mt" InMinimumRequirementSet="true" />
-    <Language Code="nb" InMinimumRequirementSet="true" />
-    <Language Code="nb-no" InMinimumRequirementSet="true" />
-    <Language Code="ne" InMinimumRequirementSet="true" />
-    <Language Code="ne-np" InMinimumRequirementSet="true" />
-    <Language Code="nl" InMinimumRequirementSet="true" />
-    <Language Code="nl-be" InMinimumRequirementSet="true" />
-    <Language Code="nl-nl" InMinimumRequirementSet="true" />
-    <Language Code="nn" InMinimumRequirementSet="true" />
-    <Language Code="nn-no" InMinimumRequirementSet="true" />
-    <Language Code="no" InMinimumRequirementSet="true" />
-    <Language Code="no-no" InMinimumRequirementSet="true" />
-    <Language Code="nso" InMinimumRequirementSet="true" />
-    <Language Code="nso-za" InMinimumRequirementSet="true" />
-    <Language Code="om" InMinimumRequirementSet="false" />
-    <Language Code="om-et" InMinimumRequirementSet="false" />
-    <Language Code="or" InMinimumRequirementSet="true" />
-    <Language Code="or-in" InMinimumRequirementSet="true" />
-    <Language Code="pa" InMinimumRequirementSet="true" />
-    <Language Code="pa-arab" InMinimumRequirementSet="true" />
-    <Language Code="pa-arab-pk" InMinimumRequirementSet="true" />
-    <Language Code="pa-deva" InMinimumRequirementSet="true" />
-    <Language Code="pa-in" InMinimumRequirementSet="true" />
-    <Language Code="pl" InMinimumRequirementSet="true" />
-    <Language Code="pl-pl" InMinimumRequirementSet="true" />
-    <Language Code="prs" InMinimumRequirementSet="true" />
-    <Language Code="prs-af" InMinimumRequirementSet="true" />
-    <Language Code="prs-arab" InMinimumRequirementSet="true" />
-    <Language Code="pt" InMinimumRequirementSet="true" />
-    <Language Code="pt-br" InMinimumRequirementSet="true" />
-    <Language Code="pt-pt" InMinimumRequirementSet="true" />
-    <Language Code="quc-latn" InMinimumRequirementSet="true" />
-    <Language Code="qut-gt" InMinimumRequirementSet="true" />
-    <Language Code="qut-latn" InMinimumRequirementSet="true" />
-    <Language Code="quz" InMinimumRequirementSet="true" />
-    <Language Code="quz-bo" InMinimumRequirementSet="true" />
-    <Language Code="quz-ec" InMinimumRequirementSet="true" />
-    <Language Code="quz-pe" InMinimumRequirementSet="true" />
-    <Language Code="ro" InMinimumRequirementSet="true" />
-    <Language Code="ro-ro" InMinimumRequirementSet="true" />
-    <Language Code="ru" InMinimumRequirementSet="true" />
-    <Language Code="ru-ru" InMinimumRequirementSet="true" />
-    <Language Code="rw" InMinimumRequirementSet="true" />
-    <Language Code="rw-rw" InMinimumRequirementSet="true" />
-    <Language Code="sd-arab" InMinimumRequirementSet="true" />
-    <Language Code="sd-arab-pk" InMinimumRequirementSet="true" />
-    <Language Code="sd-deva" InMinimumRequirementSet="true" />
-    <Language Code="si" InMinimumRequirementSet="true" />
-    <Language Code="si-lk" InMinimumRequirementSet="true" />
-    <Language Code="sk" InMinimumRequirementSet="true" />
-    <Language Code="sk-sk" InMinimumRequirementSet="true" />
-    <Language Code="sl" InMinimumRequirementSet="true" />
-    <Language Code="sl-si" InMinimumRequirementSet="true" />
-    <Language Code="sq" InMinimumRequirementSet="true" />
-    <Language Code="sq-al" InMinimumRequirementSet="true" />
-    <Language Code="sr" InMinimumRequirementSet="true" />
-    <Language Code="sr-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="true" />
-    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="true" />
-    <Language Code="sr-cyrl-me" InMinimumRequirementSet="true" />
-    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />
-    <Language Code="sv" InMinimumRequirementSet="true" />
-    <Language Code="sv-fi" InMinimumRequirementSet="true" />
-    <Language Code="sv-se" InMinimumRequirementSet="true" />
-    <Language Code="sw" InMinimumRequirementSet="true" />
-    <Language Code="sw-ke" InMinimumRequirementSet="true" />
-    <Language Code="ta" InMinimumRequirementSet="true" />
-    <Language Code="ta-in" InMinimumRequirementSet="true" />
-    <Language Code="te" InMinimumRequirementSet="true" />
-    <Language Code="te-in" InMinimumRequirementSet="true" />
-    <Language Code="tg-arab" InMinimumRequirementSet="true" />
-    <Language Code="tg-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="true" />
-    <Language Code="tg-latn" InMinimumRequirementSet="true" />
-    <Language Code="th" InMinimumRequirementSet="true" />
-    <Language Code="th-th" InMinimumRequirementSet="true" />
-    <Language Code="ti" InMinimumRequirementSet="true" />
-    <Language Code="ti-et" InMinimumRequirementSet="true" />
-    <Language Code="tk-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="tk-cyrl-tr" InMinimumRequirementSet="true" />
-    <Language Code="tk-latn" InMinimumRequirementSet="true" />
-    <Language Code="tk-latn-tr" InMinimumRequirementSet="true" />
-    <Language Code="tk-tm" InMinimumRequirementSet="true" />
-    <Language Code="tn" InMinimumRequirementSet="true" />
-    <Language Code="tn-bw" InMinimumRequirementSet="true" />
-    <Language Code="tn-za" InMinimumRequirementSet="true" />
-    <Language Code="tr" InMinimumRequirementSet="true" />
-    <Language Code="tr-tr" InMinimumRequirementSet="true" />
-    <Language Code="tt-arab" InMinimumRequirementSet="true" />
-    <Language Code="tt-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="tt-latn" InMinimumRequirementSet="true" />
-    <Language Code="tt-ru" InMinimumRequirementSet="true" />
-    <Language Code="ug-arab" InMinimumRequirementSet="true" />
-    <Language Code="ug-cn" InMinimumRequirementSet="true" />
-    <Language Code="ug-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="ug-latn" InMinimumRequirementSet="true" />
-    <Language Code="uk" InMinimumRequirementSet="true" />
-    <Language Code="uk-ua" InMinimumRequirementSet="true" />
-    <Language Code="ur" InMinimumRequirementSet="true" />
-    <Language Code="ur-pk" InMinimumRequirementSet="true" />
-    <Language Code="uz" InMinimumRequirementSet="true" />
-    <Language Code="uz-cyrl" InMinimumRequirementSet="true" />
-    <Language Code="uz-latn" InMinimumRequirementSet="true" />
-    <Language Code="uz-latn-uz" InMinimumRequirementSet="true" />
-    <Language Code="vi" InMinimumRequirementSet="true" />
-    <Language Code="vi-vn" InMinimumRequirementSet="true" />
-    <Language Code="wo" InMinimumRequirementSet="true" />
-    <Language Code="wo-sn" InMinimumRequirementSet="true" />
-    <Language Code="xh" InMinimumRequirementSet="true" />
-    <Language Code="xh-za" InMinimumRequirementSet="true" />
-    <Language Code="yo-latn" InMinimumRequirementSet="true" />
-    <Language Code="yo-ng" InMinimumRequirementSet="true" />
-    <Language Code="zh" InMinimumRequirementSet="true" />
-    <Language Code="zh-cn" InMinimumRequirementSet="true" />
-    <Language Code="zh-hans" InMinimumRequirementSet="true" />
-    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />
-    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />
-    <Language Code="zh-hk" InMinimumRequirementSet="true" />
-    <Language Code="zh-mo" InMinimumRequirementSet="true" />
-    <Language Code="zh-sg" InMinimumRequirementSet="true" />
-    <Language Code="zh-tw" InMinimumRequirementSet="true" />
-    <Language Code="zu" InMinimumRequirementSet="true" />
-    <Language Code="zu-za" InMinimumRequirementSet="true" />
-  </SupportedLocales>
-  <ProductReservedInfo>
-    <MainPackageIdentityName>19453.net.Rufus</MainPackageIdentityName>
-    <ReservedNames>
-      <ReservedName>Rufus</ReservedName>
-    </ReservedNames>
-  </ProductReservedInfo>
-  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9PC3H3V7Q9CH" />
-</StoreAssociation>
\ No newline at end of file
diff --git a/res/appstore/Package.appxmanifest b/res/appstore/Package.appxmanifest
deleted file mode 100644
index 1b5a5251c7a..00000000000
--- a/res/appstore/Package.appxmanifest
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
-  xmlns:uap8="http://schemas.microsoft.com/appx/manifest/uap/windows10/8"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap uap7 uap8 rescap">
-
-  <Identity
-    Name="19453.net.Rufus"
-    Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
-    Version="3.17.1846.0" />
-
-  <Properties>
-    <DisplayName>Rufus</DisplayName>
-    <PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.19042.572" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="en-US" />
-    <Resource Language="Ar-SA" />
-    <Resource Language="bg-BG" />
-    <Resource Language="zh-CN" />
-    <Resource Language="zh-TW" />
-    <Resource Language="hr-HR" />
-    <Resource Language="cs-CZ" />
-    <Resource Language="da-DK" />
-    <Resource Language="nl-NL" />
-    <Resource Language="fi-FI" />
-    <Resource Language="fr-FR" />
-    <Resource Language="de-DE" />
-    <Resource Language="el-GR" />
-    <Resource Language="he-IL" />
-    <Resource Language="hu-HU" />
-    <Resource Language="id-ID" />
-    <Resource Language="it-IT" />
-    <Resource Language="ja-JP" />
-    <Resource Language="ko-KR" />
-    <Resource Language="lv-LV" />
-    <Resource Language="lt-LT" />
-    <Resource Language="ms-MY" />
-    <Resource Language="nb-NO" />
-    <Resource Language="fa-IR" />
-    <Resource Language="pl-PL" />
-    <Resource Language="pt-BR" />
-    <Resource Language="pt-PT" />
-    <Resource Language="ro-RO" />
-    <Resource Language="ru-RU" />
-    <Resource Language="sr-SP" />
-    <Resource Language="sk-SK" />
-    <Resource Language="sl-SI" />
-    <Resource Language="es-ES" />
-    <Resource Language="sv-SE" />
-    <Resource Language="th-TH" />
-    <Resource Language="tr-TR" />
-    <Resource Language="uk-UA" />
-    <Resource Language="vi-VN" />
-  </Resources>
-
-  <Applications>
-    <Application Id="Rufus"
-      Executable="rufus\rufus.exe"
-      EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements
-        DisplayName="Rufus"
-        Description="Rufus"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo"/>
-            <uap:ShowOn Tile="wide310x150Logo"/>
-            <uap:ShowOn Tile="square310x310Logo"/>
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile >
-      </uap:VisualElements>
-      <uap7:Properties>
-        <uap8:ActiveCodePage>UTF-8</uap8:ActiveCodePage>
-      </uap7:Properties>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-    <rescap:Capability Name="allowElevation" />
-  </Capabilities>
-</Package>
diff --git a/res/appstore/RufusAppxManifest.xml b/res/appstore/RufusAppxManifest.xml
new file mode 100644
index 00000000000..d55f373772f
--- /dev/null
+++ b/res/appstore/RufusAppxManifest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<Package
+ IgnorableNamespaces="uap uap7 uap8 rescap build"
+ xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+ xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
+ xmlns:uap8="http://schemas.microsoft.com/appx/manifest/uap/windows10/8"
+ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+ xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">
+  <Identity
+   Name="19453.net.Rufus"
+   Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
+   Version="@VERSION@"
+   ProcessorArchitecture="@ARCH@"/>
+  <Properties>
+    <DisplayName>Rufus</DisplayName>
+    <PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily 
+     Name="Windows.Desktop"
+     MinVersion="10.0.14316.0"
+     MaxVersionTested="10.0.22000.194"/>
+    <PackageDependency
+     Name="Microsoft.VCLibs.140.00.UWPDesktop"
+     MinVersion="14.0.30035.0"
+     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"/>
+  </Dependencies>
+  <Resources>
+    <Resource Language="en-US"/>
+    <Resource uap:Scale="200"/>
+  </Resources>
+  <Applications>
+    <Application
+     Id="Rufus"
+     Executable="rufus\rufus.exe"
+     EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+       DisplayName="Rufus"
+       Description="Rufus"
+       BackgroundColor="transparent"
+       Square150x150Logo="Images\Square150x150Logo.png"
+       Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile
+         Wide310x150Logo="Images\Wide310x150Logo.png"
+         Square71x71Logo="Images\SmallTile.png"
+         Square310x310Logo="Images\LargeTile.png">
+          <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo"/>
+            <uap:ShowOn Tile="wide310x150Logo"/>
+            <uap:ShowOn Tile="square310x310Logo"/>
+          </uap:ShowNameOnTiles>
+        </uap:DefaultTile>
+      </uap:VisualElements>
+      <uap7:Properties>
+        <uap8:ActiveCodePage>UTF-8</uap8:ActiveCodePage>
+      </uap7:Properties>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+    <rescap:Capability Name="allowElevation"/>
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/res/appstore/ScaleAppxManifest.xml b/res/appstore/ScaleAppxManifest.xml
new file mode 100644
index 00000000000..d4251edaf2d
--- /dev/null
+++ b/res/appstore/ScaleAppxManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Package
+ xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+ IgnorableNamespaces="uap">
+  <Identity
+   Name="19453.net.Rufus"
+   Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
+   Version="@VERSION@"
+   ResourceId="split.scale-@SCALE@"/>
+  <Properties>
+    <ResourcePackage>true</ResourcePackage>
+    <DisplayName>Rufus</DisplayName>
+    <PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource uap:Scale="@SCALE@"/>
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily
+     Name="Windows.Desktop" 
+     MinVersion="10.0.14316.0"
+     MaxVersionTested="10.0.22000.194"/>
+  </Dependencies>
+</Package>
diff --git a/res/appstore/appstore.sln b/res/appstore/appstore.sln
deleted file mode 100644
index 66648f178ef..00000000000
--- a/res/appstore/appstore.sln
+++ /dev/null
@@ -1,144 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", "..\..\.vs\rufus.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ms-sys", "..\..\.vs\ms-sys.vcxproj", "{2B1D078D-8EB4-4398-9CA4-23457265A7F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syslinux-libfat", "..\..\.vs\syslinux-libfat.vcxproj", "{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syslinux-libinstaller", "..\..\.vs\syslinux-libinstaller.vcxproj", "{266502AC-CD74-4581-B707-938A7D05AD7A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syslinux-win", "..\..\.vs\syslinux-win.vcxproj", "{7D2E9784-DDF7-4988-A887-CF099BC3B340}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcdio-iso9660", "..\..\.vs\libcdio-iso9660.vcxproj", "{D4E80F35-2604-40AC-B436-97B052ECB572}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcdio-udf", "..\..\.vs\libcdio-udf.vcxproj", "{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcdio-driver", "..\..\.vs\libcdio-driver.vcxproj", "{FA1B1093-BA86-410A-B7A0-7A54C605F812}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "..\..\.vs\getopt.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bled", "..\..\.vs\bled.vcxproj", "{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext2fs", "..\..\.vs\ext2fs.vcxproj", "{B01F5886-2B39-4B66-B65C-6427135B6A02}"
-EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "appstore", "appstore.wapproj", "{9440518F-38FE-43D9-9151-A26618E8C978}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|arm = Release|arm
-		Release|arm64 = Release|arm64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|arm.ActiveCfg = Release|ARM
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|arm.Build.0 = Release|ARM
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|arm64.ActiveCfg = Release|ARM64
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|arm64.Build.0 = Release|ARM64
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|x64.ActiveCfg = Release|x64
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|x64.Build.0 = Release|x64
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|x86.ActiveCfg = Release|Win32
-		{731858A7-0303-4988-877B-9C0DD6471864}.Release|x86.Build.0 = Release|Win32
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm.ActiveCfg = Release|ARM
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm.Build.0 = Release|ARM
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm64.ActiveCfg = Release|ARM64
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm64.Build.0 = Release|ARM64
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x64.ActiveCfg = Release|x64
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x64.Build.0 = Release|x64
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86.ActiveCfg = Release|Win32
-		{2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86.Build.0 = Release|Win32
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm.ActiveCfg = Release|ARM
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm.Build.0 = Release|ARM
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm64.ActiveCfg = Release|ARM64
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm64.Build.0 = Release|ARM64
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x64.ActiveCfg = Release|x64
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x64.Build.0 = Release|x64
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86.ActiveCfg = Release|Win32
-		{8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86.Build.0 = Release|Win32
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm.ActiveCfg = Release|ARM
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm.Build.0 = Release|ARM
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm64.ActiveCfg = Release|ARM64
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm64.Build.0 = Release|ARM64
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x64.ActiveCfg = Release|x64
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x64.Build.0 = Release|x64
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86.ActiveCfg = Release|Win32
-		{266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86.Build.0 = Release|Win32
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm.ActiveCfg = Release|ARM
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm.Build.0 = Release|ARM
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm64.ActiveCfg = Release|ARM64
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm64.Build.0 = Release|ARM64
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x64.ActiveCfg = Release|x64
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x64.Build.0 = Release|x64
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86.ActiveCfg = Release|Win32
-		{7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86.Build.0 = Release|Win32
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm.ActiveCfg = Release|ARM
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm.Build.0 = Release|ARM
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm64.ActiveCfg = Release|ARM64
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm64.Build.0 = Release|ARM64
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x64.ActiveCfg = Release|x64
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x64.Build.0 = Release|x64
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86.ActiveCfg = Release|Win32
-		{D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86.Build.0 = Release|Win32
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm.ActiveCfg = Release|ARM
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm.Build.0 = Release|ARM
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm64.ActiveCfg = Release|ARM64
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm64.Build.0 = Release|ARM64
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x64.ActiveCfg = Release|x64
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x64.Build.0 = Release|x64
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86.ActiveCfg = Release|Win32
-		{0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86.Build.0 = Release|Win32
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm.ActiveCfg = Release|ARM
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm.Build.0 = Release|ARM
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm64.ActiveCfg = Release|ARM64
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm64.Build.0 = Release|ARM64
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x64.ActiveCfg = Release|x64
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x64.Build.0 = Release|x64
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86.ActiveCfg = Release|Win32
-		{FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86.Build.0 = Release|Win32
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm.ActiveCfg = Release|ARM
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm.Build.0 = Release|ARM
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm64.ActiveCfg = Release|ARM64
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm64.Build.0 = Release|ARM64
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86.ActiveCfg = Release|Win32
-		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86.Build.0 = Release|Win32
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm.ActiveCfg = Release|ARM
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm.Build.0 = Release|ARM
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm64.ActiveCfg = Release|ARM64
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm64.Build.0 = Release|ARM64
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x64.ActiveCfg = Release|x64
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x64.Build.0 = Release|x64
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86.ActiveCfg = Release|Win32
-		{FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86.Build.0 = Release|Win32
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm.ActiveCfg = Release|ARM
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm.Build.0 = Release|ARM
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm64.ActiveCfg = Release|ARM64
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm64.Build.0 = Release|ARM64
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x64.ActiveCfg = Release|x64
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x64.Build.0 = Release|x64
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x86.ActiveCfg = Release|Win32
-		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x86.Build.0 = Release|Win32
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm.ActiveCfg = Release|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm.Build.0 = Release|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm.Deploy.0 = Release|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm64.ActiveCfg = Release|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm64.Build.0 = Release|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm64.Deploy.0 = Release|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x64.ActiveCfg = Release|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x64.Build.0 = Release|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x64.Deploy.0 = Release|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x86.ActiveCfg = Release|x86
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x86.Build.0 = Release|x86
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CCF051E2-A27D-48B0-94ED-ADC18A40E0DB}
-	EndGlobalSection
-EndGlobal
diff --git a/res/appstore/appstore.wapproj b/res/appstore/appstore.wapproj
deleted file mode 100644
index 6eb0a36b383..00000000000
--- a/res/appstore/appstore.wapproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</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>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</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>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PreBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp $(OutDir)rufus.exe</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>9440518f-38fe-43d9-9151-a26618e8c978</ProjectGuid>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>5B703405D71796B4F4D3217C39B48767DB855E9D</PackageCertificateThumbprint>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampServerUrl>http://sha256timestamp.ws.symantec.com/sha256/timestamp</AppxPackageSigningTimestampServerUrl>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>False</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <EntryPointProjectUniqueName>..\..\.vs\rufus.vcxproj</EntryPointProjectUniqueName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)arm\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)arm64\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)x86\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)x64\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)arm\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)arm64\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)x86\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-    <OutputPath>$(SolutionDir)x64\Release\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="listing\listing.csv" />
-    <Content Include="Images\LargeTile.scale-100.png" />
-    <Content Include="Images\LargeTile.scale-125.png" />
-    <Content Include="Images\LargeTile.scale-150.png" />
-    <Content Include="Images\LargeTile.scale-200.png" />
-    <Content Include="Images\LargeTile.scale-400.png" />
-    <Content Include="Images\SmallTile.scale-100.png" />
-    <Content Include="Images\SmallTile.scale-125.png" />
-    <Content Include="Images\SmallTile.scale-150.png" />
-    <Content Include="Images\SmallTile.scale-200.png" />
-    <Content Include="Images\SmallTile.scale-400.png" />
-    <Content Include="Images\Square150x150Logo.scale-100.png" />
-    <Content Include="Images\Square150x150Logo.scale-125.png" />
-    <Content Include="Images\Square150x150Logo.scale-150.png" />
-    <Content Include="Images\Square150x150Logo.scale-200.png" />
-    <Content Include="Images\Square150x150Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.scale-100.png" />
-    <Content Include="Images\Square44x44Logo.scale-125.png" />
-    <Content Include="Images\Square44x44Logo.scale-150.png" />
-    <Content Include="Images\Square44x44Logo.scale-200.png" />
-    <Content Include="Images\Square44x44Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Images\StoreLogo.scale-100.png" />
-    <Content Include="Images\StoreLogo.scale-125.png" />
-    <Content Include="Images\StoreLogo.scale-150.png" />
-    <Content Include="Images\StoreLogo.scale-200.png" />
-    <Content Include="Images\StoreLogo.scale-400.png" />
-    <Content Include="Images\Wide310x150Logo.scale-100.png" />
-    <Content Include="Images\Wide310x150Logo.scale-125.png" />
-    <Content Include="Images\Wide310x150Logo.scale-150.png" />
-    <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <Content Include="Images\Wide310x150Logo.scale-400.png" />
-    <Content Include="rufus\rufus.app" />
-    <None Include="Package.StoreAssociation.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\.vs\rufus.vcxproj" />
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-</Project>
\ No newline at end of file
diff --git a/res/appstore/appstore.wapproj.user b/res/appstore/appstore.wapproj.user
deleted file mode 100644
index bbaa8b618e2..00000000000
--- a/res/appstore/appstore.wapproj.user
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SmallTileSource>..\icons\rufus-512.png</SmallTileSource>
-    <AppIconSource>..\icons\rufus-512.png</AppIconSource>
-    <Source>..\icons\rufus-512.png</Source>
-    <MediumTileSource>..\icons\rufus-512.png</MediumTileSource>
-    <WideTileSource>..\icons\rufus-512.png</WideTileSource>
-    <LargeTileSource>..\icons\rufus-512.png</LargeTileSource>
-    <SplashScreenSource>..\icons\rufus-512.png</SplashScreenSource>
-    <PackageLogoSource>..\icons\rufus-512.png</PackageLogoSource>
-    <AppxShowAllApps>True</AppxShowAllApps>
-    <AppxBuildConfigurationSelection>x86|x64|arm|arm64</AppxBuildConfigurationSelection>
-    <PackageOptionalProjectsInIdeBuilds>True</PackageOptionalProjectsInIdeBuilds>
-    <UapAppxPackageBuildMode>StoreOnly</UapAppxPackageBuildMode>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-    <BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
-    <DebuggerType>NativeOnly</DebuggerType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-    <BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
-    <DebuggerType>NativeOnly</DebuggerType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-    <BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
-    <DebuggerType>NativeOnly</DebuggerType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-    <BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
-    <DebuggerType>NativeOnly</DebuggerType>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd
index 11aab5633be..7e23749e7f5 100644
--- a/res/appstore/packme.cmd
+++ b/res/appstore/packme.cmd
@@ -1,15 +1,52 @@
+@rem This script creates the Rufus appxupload for upload to the Windows Store.
+@rem It attemps to follow as closely as possible what Visual Studio does.
 @echo off
 setlocal EnableExtensions DisableDelayedExpansion
-set VERSION=3.17
 
+goto main
+
+:ReplaceTokenInFile
+setlocal EnableDelayedExpansion
+set FILE=%~1
+set TOKEN=%~2
+set VALUE=%~3
+for /f "delims=" %%i in ('type %FILE% ^& break ^> %FILE%') do (
+  set "line=%%i"
+  >>%FILE% echo(!line:%TOKEN%=%VALUE%!
+)
+endlocal
+exit /B 0
+
+:main
 del /q *.appx >NUL 2>&1
 del /q *.appxbundle >NUL 2>&1
 del /q *.map >NUL 2>&1
 
-set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64
+set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x64
+set ZIP_PATH=C:\Program Files\7-Zip
+set SIGNATURE_SHA1=9ce9a71ccab3b38a74781b975f1c228222cf7d3b
 set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin
 set MANIFEST=AppxManifest.xml
 set ARCHS=x86 x64 arm arm64
+set DEFAULT_SCALE=200
+set OTHER_SCALES=100 125 150 400
+set SCALED_IMAGES=LargeTile SmallTile Square44x44Logo Square150x150Logo StoreLogo Wide310x150Logo
+set PACKAGE_IMAGES=^
+ Square44x44Logo.altform-lightunplated_targetsize-16.png^
+ Square44x44Logo.altform-lightunplated_targetsize-24.png^
+ Square44x44Logo.altform-lightunplated_targetsize-256.png^
+ Square44x44Logo.altform-lightunplated_targetsize-32.png^
+ Square44x44Logo.altform-lightunplated_targetsize-48.png^
+ Square44x44Logo.altform-unplated_targetsize-16.png^
+ Square44x44Logo.altform-unplated_targetsize-256.png^
+ Square44x44Logo.altform-unplated_targetsize-32.png^
+ Square44x44Logo.altform-unplated_targetsize-48.png^
+ Square44x44Logo.targetsize-16.png^
+ Square44x44Logo.targetsize-24.png^
+ Square44x44Logo.targetsize-24_altform-unplated.png^
+ Square44x44Logo.targetsize-256.png^
+ Square44x44Logo.targetsize-32.png^
+ Square44x44Logo.targetsize-48.png
 
 rem if you don't set the temp/tmp you get:
 rem error MSB6001: Invalid command line switch for "CL.exe". System.ArgumentExcep Key being added: 'TEMP'
@@ -17,59 +54,99 @@ set temp=
 set tmp=
 
 cd /d "%~dp0"
-setlocal EnableDelayedExpansion
-set FILES_TO_SIGN=
+
 for %%a in (%ARCHS%) do (
-  echo [Building %%a]
-  "%MSBUILD_PATH%\MSBuild" ..\..\rufus.sln /m /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release,Platform=%%a
-  if ERRORLEVEL 1 goto out
-  echo.
-  set FILES_TO_SIGN=!FILES_TO_SIGN! "..\..\%%a\Release\rufus.exe"
+  if not exist rufus_%%a.exe (
+    echo rufus_%%a.exe is missing from the current directory
+    goto out
+  )
 )
-"%WDK_PATH%\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %FILES_TO_SIGN%
+
+rem Populate the version from the executable
+set target=%~dp0rufus_x64.exe
+set target=%target:\=\\%
+wmic datafile where "name='%target%'" get version | find /v "Version" > version.txt
+set /p VERSION=<version.txt
+set VERSION=%VERSION: =%
+del version.txt
+
+echo Will create %VERSION% AppStore Bundle
+pause
+
+"%WDK_PATH%\signtool" sign /v /sha1 %SIGNATURE_SHA1% /fd SHA256 /td SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp *.exe
 if ERRORLEVEL 1 goto out
-endlocal
 
 echo [Files]> bundle.map
 
 for %%a in (%ARCHS%) do (
-  echo Creating %%a appx...
+  echo.
+  echo Creating Rufus_%VERSION%_%%a.appx...
   cd /d "%~dp0"
-  echo "Rufus-%%a.appx" "Rufus-%%a.appx">> bundle.map
+  echo "Rufus_%VERSION%_%%a.appx" "Rufus_%VERSION%_%%a.appx">> bundle.map
   mkdir %%a >NUL 2>&1
-  copy %MANIFEST% %%a\%MANIFEST% >NUL 2>&1
   cd %%a
-  for /f "delims=" %%i in ('type %MANIFEST% ^& break ^> %MANIFEST%') do (
-    set "line=%%i"
-    setlocal EnableDelayedExpansion
-    >>%MANIFEST% echo(!line:@ARCH@=%%a!
-    endlocal
+  mkdir Images >NUL 2>&1
+  for %%i in (%PACKAGE_IMAGES%) do (
+    copy "..\Images\%%i" Images\ >NUL 2>&1
+  )
+  for %%i in (%SCALED_IMAGES%) do (
+    copy "..\Images\%%i.scale-%DEFAULT_SCALE%.png" Images\ >NUL 2>&1
   )
-  mkdir Assets >NUL 2>&1
-  copy "..\..\icons\rufus-44.png" "Assets\Square44x44Logo.png" >NUL 2>&1
-  copy "..\..\icons\rufus-48.png" "Assets\Square44x44Logo.targetsize-48.png" >NUL 2>&1
-  copy "..\..\icons\rufus-48.png" "Assets\Square44x44Logo.targetsize-48_altform-unplated.png" >NUL 2>&1
-  copy "..\..\icons\rufus-150.png" "Assets\Square150x150Logo.png" >NUL 2>&1
-  copy "..\..\..\%%a\Release\rufus.exe" "rufus.exe" >NUL 2>&1
-  "%WDK_PATH%\MakePri" createconfig /o /dq en-US /cf priconfig.xml
-  "%WDK_PATH%\MakePri" new /o /pr . /cf priconfig.xml
-  "%WDK_PATH%\MakeAppx" pack /o /d . /p ../Rufus-%%a.appx
+  mkdir rufus
+  copy "..\rufus_%%a.exe" "rufus\rufus.exe" >NUL 2>&1
+  copy /y NUL "rufus\rufus.app" >NUL 2>&1
+  rem When invoking MakePri, it is very important that you don't have files such as AppxManifest.xml or priconfig.xml
+  rem in the directory referenced by /pr or you may get ERROR_MRM_DUPLICATE_ENTRY when validating the submission as,
+  rem for instance, the 'AppxManifest.xml' from the 100% scale bundle will conflict the one from the x64 bundle.
+  "%WDK_PATH%\MakePri" createconfig /o /pv 10.0.0 /dq lang-en-US_scale-%DEFAULT_SCALE%_theme-light /cf ..\priconfig.xml
+  "%WDK_PATH%\MakePri" new /o /pr . /cf ..\priconfig.xml
+  del /q ..\priconfig.xml
+  copy ..\RufusAppxManifest.xml %MANIFEST% >NUL 2>&1
+  call:ReplaceTokenInFile %MANIFEST% @ARCH@ %%a
+  call:ReplaceTokenInFile %MANIFEST% @VERSION@ %VERSION%
+  "%WDK_PATH%\MakeAppx" pack /o /d . /p ..\Rufus_%VERSION%_%%a.appx
   if ERRORLEVEL 1 goto out
 )
 
+for %%a in (%OTHER_SCALES%) do (
+  echo.
+  echo Creating Rufus_%VERSION%_scale-%%a.appx...
+  cd /d "%~dp0"
+  echo "Rufus_%VERSION%_scale-%%a.appx" "Rufus_%VERSION%_scale-%%a.appx">> bundle.map
+  mkdir %%a >NUL 2>&1
+  cd %%a
+  mkdir Images >NUL 2>&1
+  for %%i in (%SCALED_IMAGES%) do (
+    copy "..\Images\%%i.scale-%%a.png" Images\ >NUL 2>&1
+  )
+  "%WDK_PATH%\MakePri" createconfig /o /pv 10.0.0 /dq lang-en-US_scale-%%a_theme-light /cf ..\priconfig.xml
+  "%WDK_PATH%\MakePri" new /o /pr . /cf ..\priconfig.xml
+  del /q ..\priconfig.xml
+  copy ..\ScaleAppxManifest.xml %MANIFEST% >NUL 2>&1
+  call:ReplaceTokenInFile %MANIFEST% @SCALE@ %%a
+  call:ReplaceTokenInFile %MANIFEST% @VERSION@ %VERSION%
+  "%WDK_PATH%\MakeAppx" pack /o /d . /p ..\Rufus_%VERSION%_scale-%%a.appx
+)
+
+setlocal EnableDelayedExpansion
+set ALL_ARCHS=
+for %%a in (%ARCHS%) do set ALL_ARCHS=!ALL_ARCHS!_%%a
 cd /d "%~dp0"
-"%WDK_PATH%\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp *.appx
-if ERRORLEVEL 1 goto out
-"%WDK_PATH%\MakeAppx" bundle /f bundle.map /p Rufus-%VERSION%.appxbundle
-"%WDK_PATH%\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp Rufus-%VERSION%.appxbundle
+"%WDK_PATH%\MakeAppx" bundle /f bundle.map /bv %VERSION% /p Rufus_%VERSION%%ALL_ARCHS%.appxbundle
+rem Visual Studio zips the appxbundle into an appxupload for store upload, so we do the same...
+"%ZIP_PATH%\7z" a -tzip Rufus_%VERSION%%ALL_ARCHS%_bundle.appxupload Rufus_%VERSION%%ALL_ARCHS%.appxbundle
+endlocal
 
 :out
 cd /d "%~dp0"
 for %%a in (%ARCHS%) do (
   rd /S /Q %%a >NUL 2>&1
 )
+for %%a in (%OTHER_SCALES%) do (
+  rd /S /Q %%a >NUL 2>&1
+)
 del /q *.map >NUL 2>&1
 del /q *.appx >NUL 2>&1
-rename *.appxbundle *.appx >NUL 2>&1
+del /q *.appxbundle >NUL 2>&1
 pause
 exit
diff --git a/res/appstore/rufus/rufus.app b/res/appstore/rufus/rufus.app
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/rufus.rc b/src/rufus.rc
index 385278a3dd0..15539cf9987 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.17.1846"
+CAPTION "Rufus 3.17.1847"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,17,1846,0
- PRODUCTVERSION 3,17,1846,0
+ FILEVERSION 3,17,1847,0
+ PRODUCTVERSION 3,17,1847,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.17.1846"
+            VALUE "FileVersion", "3.17.1847"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.17.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.17.1846"
+            VALUE "ProductVersion", "3.17.1847"
         END
     END
     BLOCK "VarFileInfo"