diff --git a/.github/scripts/Configure-AppxManifest.ps1 b/.github/scripts/Configure-AppxManifest.ps1
index 3dc4c1fdc76e..42dab1161bbb 100644
--- a/.github/scripts/Configure-AppxManifest.ps1
+++ b/.github/scripts/Configure-AppxManifest.ps1
@@ -80,6 +80,12 @@ elseif ($Branch -eq "StorePreview")
         (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "Assets\\AppTiles\\Dev", "Assets\AppTiles\Preview" }) | `
         Set-Content $_ -NoNewline `
     }
+
+    Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
+    { `
+        (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files-preview" }) | `
+        Set-Content $_ -NoNewline `
+    }
 }
 elseif ($Branch -eq "SideloadStable")
 {
@@ -121,8 +127,8 @@ elseif ($Branch -eq "StoreStable")
     $xmlDoc.Package.Capabilities.RemoveChild($pm)
 
     # Update app protocol and execution alias
-    $ap.SetAttribute("Name", "files");
-    $aea.RemoveChild($aea.FirstChild); # Avoid duplication
+    $ap.SetAttribute("Name", "files-stable");
+    $ea.SetAttribute("Alias", "files-stable.exe");
 
     # Save modified Package.appxmanifest
     $xmlDoc.Save($PackageManifestPath)
@@ -135,7 +141,7 @@ elseif ($Branch -eq "StoreStable")
 
     Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
     { `
-        (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files" }) | `
+        (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files-stable" }) | `
         Set-Content $_ -NoNewline `
     }
 }
diff --git a/.github/workflows/cd-sideload-preview.yml b/.github/workflows/cd-sideload-preview.yml
index bc350f4c2860..2481f3b133dd 100644
--- a/.github/workflows/cd-sideload-preview.yml
+++ b/.github/workflows/cd-sideload-preview.yml
@@ -36,6 +36,7 @@ jobs:
       PACKAGE_PROJECT_DIR:        'src\Files.App (Package)'
       PACKAGE_PROJECT_PATH:       'src\Files.App (Package)\Files.Package.wapproj'
       PACKAGE_MANIFEST_PATH:      'src\Files.App (Package)\Package.appxmanifest'
+      LAUNCHER_PROJECT_PATH:      'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
       TEST_PROJECT_PATH:          'tests\Files.InteractionTests\Files.InteractionTests.csproj'
       APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/preview/'
 
@@ -86,6 +87,13 @@ jobs:
         -p:Configuration=$env:CONFIGURATION `
         -p:PublishReadyToRun=true
 
+    - name: Build launcher project
+      shell: pwsh
+      run: |
+        msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -p:Platform=$env:PLATFORM `
+        -p:Configuration=$env:CONFIGURATION
+
     - name: Build & package Files
       shell: pwsh
       run: |
diff --git a/.github/workflows/cd-sideload-stable.yml b/.github/workflows/cd-sideload-stable.yml
index bc72efca20ce..998aeaeae6e0 100644
--- a/.github/workflows/cd-sideload-stable.yml
+++ b/.github/workflows/cd-sideload-stable.yml
@@ -36,6 +36,7 @@ jobs:
       PACKAGE_PROJECT_DIR:        'src\Files.App (Package)'
       PACKAGE_PROJECT_PATH:       'src\Files.App (Package)\Files.Package.wapproj'
       PACKAGE_MANIFEST_PATH:      'src\Files.App (Package)\Package.appxmanifest'
+      LAUNCHER_PROJECT_PATH:      'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
       TEST_PROJECT_PATH:          'tests\Files.InteractionTests\Files.InteractionTests.csproj'
       APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/stable/'
 
@@ -85,6 +86,13 @@ jobs:
         -p:Platform=$env:PLATFORM `
         -p:Configuration=$env:CONFIGURATION `
         -p:PublishReadyToRun=true
+    
+    - name: Build launcher project
+      shell: pwsh
+      run: |
+        msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -p:Platform=$env:PLATFORM `
+        -p:Configuration=$env:CONFIGURATION
 
     - name: Build & package Files
       shell: pwsh
diff --git a/.github/workflows/cd-store-preview.yml b/.github/workflows/cd-store-preview.yml
index c3ec28e01326..e0ac1b35d599 100644
--- a/.github/workflows/cd-store-preview.yml
+++ b/.github/workflows/cd-store-preview.yml
@@ -35,6 +35,7 @@ jobs:
       PACKAGE_PROJECT_DIR:        '${{ github.workspace }}\src\Files.App (Package)'
       PACKAGE_PROJECT_PATH:       '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
       PACKAGE_MANIFEST_PATH:      '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest'
+      LAUNCHER_PROJECT_PATH:      'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
 
     steps:
     - name: Checkout the repository
@@ -83,6 +84,13 @@ jobs:
         -p:Configuration=$env:CONFIGURATION `
         -p:PublishReadyToRun=true
 
+    - name: Build launcher project
+      shell: pwsh
+      run: |
+        msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -p:Platform=$env:PLATFORM `
+        -p:Configuration=$env:CONFIGURATION
+
     - name: Build & package Files
       shell: pwsh
       run: |
diff --git a/.github/workflows/cd-store-stable.yml b/.github/workflows/cd-store-stable.yml
index 44b2088411d0..10607a430700 100644
--- a/.github/workflows/cd-store-stable.yml
+++ b/.github/workflows/cd-store-stable.yml
@@ -35,6 +35,7 @@ jobs:
       PACKAGE_PROJECT_DIR:        '${{ github.workspace }}\src\Files.App (Package)'
       PACKAGE_PROJECT_PATH:       '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
       PACKAGE_MANIFEST_PATH:      '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest'
+      LAUNCHER_PROJECT_PATH:      'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
 
     steps:
     - name: Checkout the repository
@@ -83,6 +84,13 @@ jobs:
         -p:Configuration=$env:CONFIGURATION `
         -p:PublishReadyToRun=true
 
+    - name: Build launcher project
+      shell: pwsh
+      run: |
+        msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -p:Platform=$env:PLATFORM `
+        -p:Configuration=$env:CONFIGURATION
+
     - name: Build & package Files
       shell: pwsh
       run: |
diff --git a/Files.sln b/Files.sln
index 002cf7910f3b..bac074bf0609 100644
--- a/Files.sln
+++ b/Files.sln
@@ -27,10 +27,11 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App", "src\Files.App\Files.App.csproj", "{6F431D82-A5FF-4833-B5E4-702E1E523126}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1EE996D6-885E-4403-A461-26C7A4E14D26} = {1EE996D6-885E-4403-A461-26C7A4E14D26}
-		{A2FF3F3B-8EBC-4108-B99D-1476B7876656} = {A2FF3F3B-8EBC-4108-B99D-1476B7876656}
-		{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6} = {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}
+		{25FD5045-6D4C-4DD0-B3AC-613AB59CBB07} = {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}
 		{7756A1A4-17B5-4E6B-9B12-F19AA868A225} = {7756A1A4-17B5-4E6B-9B12-F19AA868A225}
+		{A2FF3F3B-8EBC-4108-B99D-1476B7876656} = {A2FF3F3B-8EBC-4108-B99D-1476B7876656}
 		{B3FE3F3B-CECC-4918-B72B-5488C3774125} = {B3FE3F3B-CECC-4918-B72B-5488C3774125}
+		{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6} = {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}
 	EndProjectSection
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Files.Package", "src\Files.App (Package)\Files.Package.wapproj", "{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}"
diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest
index 987460ef918f..b55164fe7683 100644
--- a/src/Files.App (Package)/Package.appxmanifest	
+++ b/src/Files.App (Package)/Package.appxmanifest	
@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.8.2.0" />
+        Version="3.8.10.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>
@@ -118,16 +118,6 @@
                     </uap3:AppExtensionHost>
                 </uap3:Extension>
 
-                <uap:Extension Category="windows.protocol">
-                    <!--  This is kept for backward compatibility.  -->
-                    <uap:Protocol ReturnResults="none" Name="files-uwp" />
-                </uap:Extension>
-
-                <uap:Extension Category="windows.protocol">
-                    <!--  This is kept for backward compatibility.  -->
-                    <uap:Protocol ReturnResults="none" Name="files" />
-                </uap:Extension>
-
                 <uap:Extension Category="windows.protocol">
                     <!--  This value changes based on the build branch by CI (files-stable, files-preview, files-dev).  -->
                     <uap:Protocol ReturnResults="none" Name="files-dev" />
@@ -135,8 +125,6 @@
 
                 <uap5:Extension Category="windows.appExecutionAlias">
                     <uap5:AppExecutionAlias>
-                        <!--  This is kept for backward compatibility.  -->
-                        <uap5:ExecutionAlias Alias="files.exe" />
                         <!--  This value changes based on the build branch by CI (files-stable, files-preview, files-dev).  -->
                         <uap5:ExecutionAlias Alias="files-dev.exe" />
                     </uap5:AppExecutionAlias>
diff --git a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe
index ec75282a36ff..f64cd5fa0c42 100644
Binary files a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe and b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe differ
diff --git a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256 b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
index 56d0e6418766..61dd73294393 100644
--- a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
+++ b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
@@ -1 +1 @@
-c8f6e414f1a2dd954a24ccbe0fac1d167ffc2808c9c127b6c3d1811b53ffe457
+7219ea9bd5832c77f1d6c8e57f97e6504a33f07bdef61122a171061f0dcb3509