diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json
index e8c370c09e..ec613f1b8f 100644
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -17,7 +17,7 @@
                 "PowerToys.Interop.dll",
                 "BugReportTool\\PowerToys.BugReportTool.exe",
                 "WebcamReportTool\\PowerToys.WebcamReportTool.exe",
-                "WindowStylesReportTool\\PowerToys.WindowStylesReportTool.exe",
+                "StylesReportTool\\PowerToys.StylesReportTool.exe",
                 "Telemetry.dll",
                 "PowerToys.ManagedTelemetry.dll",
                 "PowerToys.ManagedCommon.dll",
diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml
index b54c7a9fd8..65e95bc587 100644
--- a/.pipelines/ci/templates/build-powertoys-steps.yml
+++ b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -77,18 +77,18 @@ steps:
     maximumCpuCount: true
 
 - task: NuGetCommand@2
-  displayName: Restore NuGet packages for WindowStylesReportTool.sln
+  displayName: Restore NuGet packages for StylesReportTool.sln
   inputs:
     command: restore
     feedsToUse: config
     configPath: NuGet.config
-    restoreSolution: tools\WindowStylesReportTool\WindowStylesReportTool.sln
-    restoreDirectory: '$(Build.SourcesDirectory)\tools\WindowStylesReportTool\packages'
+    restoreSolution: tools\StylesReportTool\StylesReportTool.sln
+    restoreDirectory: '$(Build.SourcesDirectory)\tools\StylesReportTool\packages'
 
 - task: VSBuild@1
-  displayName: 'Build WindowStylesReportTool.sln'
+  displayName: 'Build StylesReportTool.sln'
   inputs:
-    solution: '**\WindowStylesReportTool.sln'
+    solution: '**\StylesReportTool.sln'
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
diff --git a/.pipelines/release.yml b/.pipelines/release.yml
index 5e7d2d5bc5..3f44870bac 100644
--- a/.pipelines/release.yml
+++ b/.pipelines/release.yml
@@ -156,9 +156,9 @@ jobs:
       maximumCpuCount: true
 
   - task: VSBuild@1
-    displayName: Build WindowStylesReportTool
+    displayName: Build StylesReportTool
     inputs:
-      solution: '**/tools/WindowStylesReportTool/WindowStylesReportTool.sln'
+      solution: '**/tools/StylesReportTool/StylesReportTool.sln'
       vsVersion: 17.0
       msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
       platform: $(BuildPlatform)
diff --git a/doc/devdocs/readme.md b/doc/devdocs/readme.md
index c2f6459049..c3c2ff4dad 100644
--- a/doc/devdocs/readme.md
+++ b/doc/devdocs/readme.md
@@ -66,7 +66,7 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done
 1. Compile `PowerToys.sln`. Instructions are listed above.
 2. Compile `BugReportTool.sln` tool. Path from root: `tools\BugReportTool\BugReportTool.sln` (details listed below)
 3. Compile `WebcamReportTool.sln` tool. Path from root: `tools\WebcamReportTool\WebcamReportTool.sln` (details listed below)
-3. Compile `WindowStylesReportTool.sln` tool. Path from root: `tools\WindowStylesReportTool\WindowStylesReportTool.sln` (details listed below)
+3. Compile `StylesReportTool.sln` tool. Path from root: `tools\StylesReportTool\StylesReportTool.sln` (details listed below)
 4. Compile `PowerToysSetup.sln` Path from root: `installer\PowerToysSetup.sln` (details listed below)
 
 ### Prerequisites for building the MSI installer
@@ -88,7 +88,7 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done
 
 ### Locally compiling the Window styles reporting tool
 
-1. Open `tools\WindowStylesReportTool\WindowStylesReportTool.sln`
+1. Open `tools\StylesReportTool\StylesReportTool.sln`
 2. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 3. From the `Build` menu, choose `Build Solution`.
 
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index f52eb502fc..5037e10b65 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -616,8 +616,8 @@
             <Component Id="WebcamReportTool_exe" Win64="yes">
                 <File Source="$(var.BinDir)WebcamReportTool\PowerToys.WebcamReportTool.exe" Id="WebcamReportTool.exe" Checksum="yes" />
             </Component>
-			<Component Id="WindowStylesReportTool_exe" Win64="yes">
-				<File Source="$(var.BinDir)WindowStylesReportTool\PowerToys.WindowStylesReportTool.exe" Id="WindowStylesReportTool.exe" Checksum="yes" />
+			<Component Id="StylesReportTool_exe" Win64="yes">
+				<File Source="$(var.BinDir)StylesReportTool\PowerToys.StylesReportTool.exe" Id="StylesReportTool.exe" Checksum="yes" />
 			</Component>
         </DirectoryRef>
 
@@ -1052,7 +1052,7 @@
         <ComponentGroup Id="ToolComponents" Directory="ToolsFolder">
             <ComponentRef Id="BugReportTool_exe" />
             <ComponentRef Id="WebcamReportTool_exe" />
-			<ComponentRef Id="WindowStylesReportTool_exe" />
+			<ComponentRef Id="StylesReportTool_exe" />
         </ComponentGroup>
     </Fragment>
 
diff --git a/tools/WindowStylesReportTool/Resource.h b/tools/StylesReportTool/Resource.h
similarity index 93%
rename from tools/WindowStylesReportTool/Resource.h
rename to tools/StylesReportTool/Resource.h
index 3753dba0ce..6f73f04319 100644
--- a/tools/WindowStylesReportTool/Resource.h
+++ b/tools/StylesReportTool/Resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by WindowStylesReportTool.rc
+// Used by StylesReportTool.rc
 
 #define IDR_MAINFRAME			128
 #define IDD_ABOUTBOX			103
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.cpp b/tools/StylesReportTool/StylesReportTool.cpp
similarity index 98%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.cpp
rename to tools/StylesReportTool/StylesReportTool.cpp
index 3391567cbb..0047b289b6 100644
--- a/tools/WindowStylesReportTool/WindowStylesReportTool.cpp
+++ b/tools/StylesReportTool/StylesReportTool.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "WindowStylesReportTool.h"
+#include "StylesReportTool.h"
 
 #include <dwmapi.h>
 #include <shlobj.h>
@@ -344,7 +344,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
 
-    Logger::init("WindowStylesReportTool");
+    Logger::init("StylesReportTool");
 
     WNDCLASSEXW wcex;
     wcex.cbSize = sizeof(WNDCLASSEX);
@@ -357,7 +357,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
     wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
     wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wcex.lpszMenuName = L"";
-    wcex.lpszClassName = L"WindowStylesReportTool";
+    wcex.lpszClassName = L"StylesReportTool";
     wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALLICON));
 
     if (!RegisterClassExW(&wcex))
@@ -366,7 +366,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
         return FALSE;
     }
 
-    HWND hWnd = CreateWindowW(L"WindowStylesReportTool", L"Window Style Report Tool", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 600, 200, nullptr, nullptr, hInstance, nullptr);
+    HWND hWnd = CreateWindowW(L"StylesReportTool", L"Window Style Report Tool", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 600, 200, nullptr, nullptr, hInstance, nullptr);
     if (!hWnd)
     {
         Logger::log(L"Window creation error: {}", get_last_error_or_default(GetLastError()));
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.h b/tools/StylesReportTool/StylesReportTool.h
similarity index 100%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.h
rename to tools/StylesReportTool/StylesReportTool.h
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.ico b/tools/StylesReportTool/StylesReportTool.ico
similarity index 100%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.ico
rename to tools/StylesReportTool/StylesReportTool.ico
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.rc b/tools/StylesReportTool/StylesReportTool.rc
similarity index 98%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.rc
rename to tools/StylesReportTool/StylesReportTool.rc
index 83e42764bd..0f30913062 100644
Binary files a/tools/WindowStylesReportTool/WindowStylesReportTool.rc and b/tools/StylesReportTool/StylesReportTool.rc differ
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.sln b/tools/StylesReportTool/StylesReportTool.sln
similarity index 89%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.sln
rename to tools/StylesReportTool/StylesReportTool.sln
index f16f6fe905..039ba33433 100644
--- a/tools/WindowStylesReportTool/WindowStylesReportTool.sln
+++ b/tools/StylesReportTool/StylesReportTool.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowStylesReportTool", "WindowStylesReportTool.vcxproj", "{0FEBAFAF-CB77-41F0-8EF9-8E3AD4B4F842}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StylesReportTool", "StylesReportTool.vcxproj", "{0FEBAFAF-CB77-41F0-8EF9-8E3AD4B4F842}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj b/tools/StylesReportTool/StylesReportTool.vcxproj
similarity index 94%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj
rename to tools/StylesReportTool/StylesReportTool.vcxproj
index 6fb57d152e..3c9b90dd70 100644
--- a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj
+++ b/tools/StylesReportTool/StylesReportTool.vcxproj
@@ -14,7 +14,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{0febafaf-cb77-41f0-8ef9-8e3ad4b4f842}</ProjectGuid>
-    <RootNamespace>WindowStylesReportTool</RootNamespace>
+    <RootNamespace>StylesReportTool</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -87,22 +87,22 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="WindowStylesReportTool.h" />
+    <ClInclude Include="StylesReportTool.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="Resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="WindowStylesReportTool.cpp" />
+    <ClCompile Include="StylesReportTool.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="WindowStylesReportTool.rc" />
+    <ResourceCompile Include="StylesReportTool.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="WindowStylesReportTool.ico" />
+    <Image Include="StylesReportTool.ico" />
     <Image Include="small.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters b/tools/StylesReportTool/StylesReportTool.vcxproj.filters
similarity index 87%
rename from tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters
rename to tools/StylesReportTool/StylesReportTool.vcxproj.filters
index 2aff154c7a..efb0748518 100644
--- a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters
+++ b/tools/StylesReportTool/StylesReportTool.vcxproj.filters
@@ -18,7 +18,7 @@
     <ClInclude Include="Resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="WindowStylesReportTool.h">
+    <ClInclude Include="StylesReportTool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="pch.h">
@@ -26,7 +26,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="WindowStylesReportTool.cpp">
+    <ClCompile Include="StylesReportTool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="pch.cpp">
@@ -34,7 +34,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="WindowStylesReportTool.rc">
+    <ResourceCompile Include="StylesReportTool.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
@@ -42,7 +42,7 @@
     <Image Include="small.ico">
       <Filter>Resource Files</Filter>
     </Image>
-    <Image Include="WindowStylesReportTool.ico">
+    <Image Include="StylesReportTool.ico">
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
diff --git a/tools/WindowStylesReportTool/pch.cpp b/tools/StylesReportTool/pch.cpp
similarity index 100%
rename from tools/WindowStylesReportTool/pch.cpp
rename to tools/StylesReportTool/pch.cpp
diff --git a/tools/WindowStylesReportTool/pch.h b/tools/StylesReportTool/pch.h
similarity index 100%
rename from tools/WindowStylesReportTool/pch.h
rename to tools/StylesReportTool/pch.h
diff --git a/tools/WindowStylesReportTool/small.ico b/tools/StylesReportTool/small.ico
similarity index 100%
rename from tools/WindowStylesReportTool/small.ico
rename to tools/StylesReportTool/small.ico