diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt
index 4d434732be..e87774eab0 100644
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -37,8 +37,6 @@ ignore$
^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$
^src/modules/imageresizer/dll/ImageResizerExt\.rgs$
^src/modules/powerrename/testapp/PowerRenameTest\.vcxproj\.filters$
-^src/modules/powerrename/UWPui/pch\.h$
-^src/modules/powerrename/UWPui/PowerRenameUWPUI\.vcxproj\.filters$
^src/modules/previewpane/PreviewPaneUnitTests/HelperFiles/MarkdownWithHTMLImageTag\.txt$
^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag.txt$
^tools/CleanUp_tool/CleanUp_tool\.vcxproj\.filters$
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 8104477280..c155d971bf 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1418,6 +1418,7 @@ pch
PCIDLIST
PCWSTR
Pdb
+pdb
pdbonly
pdfpreviewhandler
pdo
@@ -1969,6 +1970,7 @@ Toolchain
toolkitcontrols
toolkitconverters
Toolset
+toolset
toolstrip
toolwindow
TOPDOWNDIB
@@ -2068,7 +2070,6 @@ utf
utils
uuidof
uwp
-UWPUI
uxtheme
UYVY
validmodulename
diff --git a/PowerToys.sln b/PowerToys.sln
index 8d103b64d3..5cd578d81d 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -9,7 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner
{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
{6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB} = {6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB}
{031AC72E-FA28-4AB7-B690-6F7B9C28AA73} = {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}
- {0485F45C-EA7A-4BB5-804B-3E8D14699387} = {0485F45C-EA7A-4BB5-804B-3E8D14699387}
{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D} = {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}
{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}
{BA58206B-1493-4C75-BFEA-A85768A1E156} = {BA58206B-1493-4C75-BFEA-A85768A1E156}
@@ -74,8 +73,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameUnitTests", "src
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModuleTemplateCompileTest", "tools\project_template\ModuleTemplate\ModuleTemplateCompileTest.vcxproj", "{64A80062-4D8B-4229-8A38-DFA1D7497749}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameUWPUI", "src\modules\powerrename\UWPui\PowerRenameUWPUI.vcxproj", "{0485F45C-EA7A-4BB5-804B-3E8D14699387}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager", "src\modules\keyboardmanager\dll\KeyboardManager.vcxproj", "{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "imageresizer", "imageresizer", "{6C7F47CC-2151-44A3-A546-41C70025132C}"
@@ -459,12 +456,6 @@ Global
{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.ActiveCfg = Release|x64
{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.Build.0 = Release|x64
{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x86.ActiveCfg = Release|x64
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x64.ActiveCfg = Debug|x64
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x64.Build.0 = Debug|x64
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x86.ActiveCfg = Debug|x64
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.ActiveCfg = Release|x64
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.Build.0 = Release|x64
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x86.ActiveCfg = Release|x64
{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.ActiveCfg = Debug|x64
{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.Build.0 = Debug|x64
{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x86.ActiveCfg = Debug|x64
@@ -1070,7 +1061,6 @@ Global
{51920F1F-C28C-4ADF-8660-4238766796C2} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
{A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
{2151F984-E006-4A9F-92EF-C6DDE3DC8413} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
- {0485F45C-EA7A-4BB5-804B-3E8D14699387} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
{89F34AF7-1C34-4A72-AA6E-534BCF972BD9} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
{6C7F47CC-2151-44A3-A546-41C70025132C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34} = {6C7F47CC-2151-44A3-A546-41C70025132C}
diff --git a/installer/MSIX/PackagingLayout.xml b/installer/MSIX/PackagingLayout.xml
index 396bc73d26..419b388f3c 100644
--- a/installer/MSIX/PackagingLayout.xml
+++ b/installer/MSIX/PackagingLayout.xml
@@ -16,7 +16,6 @@
-
diff --git a/installer/MSIX/appxmanifest.xml b/installer/MSIX/appxmanifest.xml
index 410a8ae303..fd1ea58156 100644
--- a/installer/MSIX/appxmanifest.xml
+++ b/installer/MSIX/appxmanifest.xml
@@ -42,9 +42,6 @@
-
-
-
diff --git a/installer/MSIX/reinstall_msix.ps1 b/installer/MSIX/reinstall_msix.ps1
index 3697ceec15..d836e85bd8 100644
--- a/installer/MSIX/reinstall_msix.ps1
+++ b/installer/MSIX/reinstall_msix.ps1
@@ -1,5 +1,3 @@
-taskkill /f /im PowerRenameUWPUI.exe
-
.\uninstall_msix.ps1
.\build_msix.ps1
.\sign_msix.ps1
diff --git a/src/modules/powerrename/UWPui/PowerRename.ico b/src/modules/powerrename/UWPui/PowerRename.ico
deleted file mode 100644
index 5070d82e29..0000000000
Binary files a/src/modules/powerrename/UWPui/PowerRename.ico and /dev/null differ
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp b/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp
deleted file mode 100644
index 838965c632..0000000000
--- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "pch.h"
-
-#include "resource.h"
-#include
-#include
-
-#include
-#include
-
-std::atomic g_dwModuleRefCount = 0;
-
-DWORD main_thread_id;
-
-void ModuleAddRef()
-{
- ++g_dwModuleRefCount;
-}
-
-void ModuleRelease()
-{
- if (--g_dwModuleRefCount == 0)
- {
- // Do nothing and keep the COM server in memory forever. We might want to introduce delayed shutdown and/or
- // periodic polling whether a user has disabled us in settings. Tracking this in #1217
- }
-}
-HINSTANCE g_hInst = 0;
-
-int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
- _In_opt_ HINSTANCE,
- _In_ LPWSTR lpCmdLine,
- _In_ int nCmdShow)
-{
- main_thread_id = GetCurrentThreadId();
- winrt::init_apartment();
- g_hInst = hInstance;
- com_object_factory factory;
- DWORD token;
- if (!SUCCEEDED(CoRegisterClassObject(CLSID_PowerRenameMenu, &factory, CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &token)))
- {
- return 1;
- }
-
- // Run msg loop for the local COM server
- run_message_loop();
-
- CoRevokeClassObject(token);
- winrt::uninit_apartment();
- return 0;
-}
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc b/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc
deleted file mode 100644
index cf8c5b565e..0000000000
--- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc
+++ /dev/null
@@ -1,93 +0,0 @@
-#include
-#include "resource.h"
-#include "../../../common/version/version.h"
-
-// We need both DLL and UI resource files for UWP UI.
-#include "../dll/Generated Files/PowerRenameExt.rc"
-#undef IDC_STATIC
-
-2 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
- BEGIN
- VALUE "CompanyName", COMPANY_NAME
- VALUE "FileDescription", FILE_DESCRIPTION
- VALUE "FileVersion", FILE_VERSION_STRING
- VALUE "InternalName", INTERNAL_NAME
- VALUE "LegalCopyright", COPYRIGHT_NOTE
- VALUE "OriginalFilename", ORIGINAL_FILENAME
- VALUE "ProductName", PRODUCT_NAME
- VALUE "ProductVersion", PRODUCT_VERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
- END
-END
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj
deleted file mode 100644
index aed1a9ea97..0000000000
--- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
- 16.0
- {0485F45C-EA7A-4BB5-804B-3E8D14699387}
- Win32Proj
- PowerRenameUWPUI
-
-
-
- Application
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\
-
-
-
- _WINDOWS;%(PreprocessorDefinitions)
- $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir)
-
-
- WindowsApp.lib;Comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shcore.lib;%(AdditionalDependencies)
-
-
- $(ProjectDir)..\ui;%(AdditionalIncludeDirectories)
-
-
-
-
-
-
-
-
-
-
-
- Create
-
-
-
-
- {caba8dfb-823b-4bf2-93ac-3f31984150d9}
-
-
- {6955446d-23f7-4023-9bb3-8657f904af99}
-
-
- {51920f1f-c28c-4adf-8660-4238766796c2}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters
deleted file mode 100644
index 04d311d56b..0000000000
--- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;ipp;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Resource Files
-
-
-
-
- Resource Files
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/powerrename/UWPui/packages.config b/src/modules/powerrename/UWPui/packages.config
deleted file mode 100644
index f93921797a..0000000000
--- a/src/modules/powerrename/UWPui/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/powerrename/UWPui/pch.cpp b/src/modules/powerrename/UWPui/pch.cpp
deleted file mode 100644
index 1d9f38c57d..0000000000
--- a/src/modules/powerrename/UWPui/pch.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "pch.h"
diff --git a/src/modules/powerrename/UWPui/pch.h b/src/modules/powerrename/UWPui/pch.h
deleted file mode 100644
index 50c1a6eb8f..0000000000
--- a/src/modules/powerrename/UWPui/pch.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "targetver.h"
-#include
-#include
-#include "winrt/base.h"
\ No newline at end of file
diff --git a/src/modules/powerrename/UWPui/resource.h b/src/modules/powerrename/UWPui/resource.h
deleted file mode 100644
index 5dc7fe4d52..0000000000
--- a/src/modules/powerrename/UWPui/resource.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by PowerRenameUWPUI.rc
-
diff --git a/src/modules/powerrename/UWPui/targetver.h b/src/modules/powerrename/UWPui/targetver.h
deleted file mode 100644
index bf75e0895e..0000000000
--- a/src/modules/powerrename/UWPui/targetver.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-// // Including SDKDDKVer.h defines the highest available Windows platform.
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-#include