Add Version

2025-12-30 17:07:23 +01:00 · 2025-06-13 18:53:02 +08:00
349 changed files with 1661 additions and 10194 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -156,7 +156,6 @@ builttoroam
 BVal
 BValue
 byapp
-BYCOMMAND
 BYPOSITION
 CALCRECT
 CALG
@@ -192,7 +191,6 @@ CImage
 cla
 CLASSDC
 CLASSNOTAVAILABLE
-cleanmgr
 clickable
 clickonce
 CLIENTEDGE
@@ -204,7 +202,6 @@ CLIPSIBLINGS
 closesocket
 clp
 CLSCTX
-CLSCTXLOCALSERVER
 clsids
 Clusion
 cmder
@@ -278,7 +275,6 @@ currentculture
 CURRENTDIR
 CURSORINFO
 cursorpos
-CURSORSHOWING
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -346,9 +342,7 @@ DESELECTOTHERS
 DESIGNINFO
 DESKTOPABSOLUTEEDITING
 DESKTOPABSOLUTEPARSING
-DESKTOPHORZRES
 desktopshorcutinstalled
-DESKTOPVERTRES
 devblogs
 devdocs
 devmgmt
@@ -359,7 +353,6 @@ DFX
 DIALOGEX
 digicert
 dimm
-DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
 diskmgmt
@@ -403,7 +396,6 @@ DVASPECTINFO
 DVD
 dvr
 DVTARGETDEVICE
-dwflags
 dwl
 dwm
 dwmapi
@@ -492,7 +484,6 @@ FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 FARPROC
 fff
-FFFF
 FILEEXPLORER
 FILEFLAGS
 FILEFLAGSMASK
@@ -611,7 +602,6 @@ helptext
 HGFE
 hglobal
 hhk
-HHmmssfff
 hhx
 Hiber
 Hiberboot
@@ -620,7 +610,6 @@ hicon
 HIDEREADONLY
 HIDEWINDOW
 Hif
-hightlight
 HIMAGELIST
 himl
 hinst
@@ -755,7 +744,6 @@ isocpp
 iss
 issecret
 ISSEPARATOR
-istep
 ith
 ITHUMBNAIL
 IUI
@@ -827,7 +815,6 @@ LOCALDISPLAY
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKTYPE
 LOGFONT
 LOGFONTW
 logon
@@ -1287,7 +1274,6 @@ prvpane
 psapi
 pscid
 PSECURITY
-psexec
 psfgao
 psfi
 PSMODULEPATH
@@ -1545,7 +1531,6 @@ SLGP
 sln
 SMALLICON
 smartphone
-smileys
 SMTO
 SNAPPROCESS
 snk
@@ -1678,7 +1663,6 @@ TDefault
 TDevice
 telephon
 templatenamespace
-TESTONLY
 testprocess
 TEXCOORD
 TEXTBOXNEWLINE
@@ -1731,7 +1715,6 @@ trx
 tsa
 TSender
 TServer
-tskill
 tstoi
 TStr
 tweakme
@@ -1890,7 +1873,6 @@ WINDOWPOSCHANGING
 WINDOWSBUILDNUMBER
 windowssearch
 windowssettings
-windowsterminal
 WINDOWSTYLES
 WINDOWSTYLESICON
 winerror
@@ -1965,7 +1947,6 @@ Wwanpp
 XAxis
 xclip
 xcopy
-XDeployment
 XDocument
 XElement
 xfd
@@ -2001,7 +1982,6 @@ Zoneszonabletester
 Zoomin
 zoomit
 ZOOMITX
-Zorder
 ZXk
 ZXNs
 zzz
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -11,17 +11,17 @@
            "PowerToys.ActionRunner.exe",
            "PowerToys.Update.exe",
            "PowerToys.BackgroundActivatorDLL.dll",
-
+            "Notifications.dll",
+            "os-detection.dll",
            "PowerToys.exe",
            "PowerToys.FilePreviewCommon.dll",
            "PowerToys.Interop.dll",
            "Tools\\PowerToys.BugReportTool.exe",
            "StylesReportTool\\PowerToys.StylesReportTool.exe",
-
+            "Telemetry.dll",
            "CalculatorEngineCommon.dll",
            "PowerToys.ManagedTelemetry.dll",
            "PowerToys.ManagedCommon.dll",
-            "PowerToys.ManagedCsWin32.dll",
            "PowerToys.Common.UI.dll",
            "PowerToys.Settings.UI.Lib.dll",
            "PowerToys.GPOWrapper.dll",
@@ -32,7 +32,7 @@
            "PowerToys.AlwaysOnTopModuleInterface.dll",

            "PowerToys.CmdNotFoundModuleInterface.dll",
-
+            "PowerToys.CmdNotFound.dll",

            "PowerToys.ColorPicker.dll",
            "PowerToys.ColorPickerUI.dll",
@@ -53,7 +53,7 @@
            "PowerToys.Awake.exe",
            "PowerToys.Awake.dll",

-
+            "fancyzones.dll",
            "PowerToys.FancyZonesEditor.exe",
            "PowerToys.FancyZonesEditor.dll",
            "PowerToys.FancyZonesEditorCommon.dll",
@@ -135,7 +135,7 @@
            "PowerToys.PowerLauncher.dll",
            "PowerToys.PowerLauncher.exe",
            "PowerToys.PowerLauncher.Telemetry.dll",
-
+            "Wox.dll",
            "Wox.Infrastructure.dll",
            "Wox.Plugin.dll",
            "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
@@ -274,16 +274,16 @@
                "Mono.Cecil.Pdb.dll",
                "Mono.Cecil.Rocks.dll",
                "Newtonsoft.Json.dll",
-
+                "Newtonsoft.Json.Bson.dll",
                "NLog.dll",
                "HtmlAgilityPack.dll",
                "Markdig.Signed.dll",
                "HelixToolkit.dll",
                "HelixToolkit.Core.Wpf.dll",
                "Mages.Core.dll",
-
+                "JetBrains.Annotations.dll",
                "NLog.Extensions.Logging.dll",
-
+                "getfilesiginforedist.dll",
                "concrt140_app.dll",
                "msvcp140_1_app.dll",
                "msvcp140_2_app.dll",
@@ -293,8 +293,22 @@
                "vcomp140_app.dll",
                "vcruntime140_1_app.dll",
                "vcruntime140_app.dll",
-
+                "WinUI3Apps\\CommunityToolkit.Labs.WinUI.SettingsControls.dll",
                "UnicodeInformation.dll",
+                "Vanara.Core.dll",
+                "Vanara.PInvoke.ComCtl32.dll",
+                "Vanara.PInvoke.Cryptography.dll",
+                "Vanara.PInvoke.Gdi32.dll",
+                "Vanara.PInvoke.Kernel32.dll",
+                "Vanara.PInvoke.Ole.dll",
+                "Vanara.PInvoke.Rpc.dll",
+                "Vanara.PInvoke.Security.dll",
+                "Vanara.PInvoke.Shared.dll",
+                "Vanara.PInvoke.Shell32.dll",
+                "Vanara.PInvoke.ShlwApi.dll",
+                "Vanara.PInvoke.User32.dll",
+                "WinUI3Apps\\clrcompression.dll",
+                "WinUI3Apps\\Microsoft.Graphics.Canvas.Interop.dll",
                "Microsoft.Web.WebView2.Core.dll",
                "Microsoft.Web.WebView2.WinForms.dll",
                "Microsoft.Web.WebView2.Wpf.dll",
@@ -321,7 +335,7 @@
                "Testably.Abstractions.FileSystem.Interface.dll",
                "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                "ColorCode.Core.dll", 
-
+                "ColorCode.UWP.dll",
                "UnitsNet.dll",
                "UtfUnknown.dll",
                "Wpf.Ui.dll"
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -53,9 +53,6 @@ parameters:
  - name: runTests
    type: boolean
    default: true
-  - name: buildTests
-    type: boolean
-    default: true
  - name: useVSPreview
    type: boolean
    default: false
@@ -102,7 +99,7 @@ jobs:
            ${{ else }}:
              OutputBuildPlatform: ${{ platform }}
  variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
+    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
    # Azure DevOps abhors a vacuum
    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
    # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
@@ -113,7 +110,7 @@ jobs:
    JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
    NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
    NODE_OPTIONS: --max_old_space_size=16384
-    ${{ if or(eq(parameters.runTests, true), eq(parameters.buildTests, true)) }}:
+    ${{ if eq(parameters.runTests, true) }}:
      MSBuildMainBuildTargets: Build;Test
    ${{ else }}:
      MSBuildMainBuildTargets: Build
@@ -335,7 +332,6 @@ jobs:
          /p:VCRTForwarders-IncludeDebugCRT=false
          /p:PowerToysRoot=$(Build.SourcesDirectory)
          /p:PublishProfile=InstallationPublishProfile.pubxml
-          /p:TargetFramework=net9.0-windows10.0.26100.0
          /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
          $(RestoreAdditionalProjectSourcesArg)
        platform: $(BuildPlatform)
@@ -398,7 +394,10 @@ jobs:
        testAssemblyVer2: |
          **\KeyboardManagerEngineTest.dll
          **\KeyboardManagerEditorTest.dll
-          **\*UnitTest*.dll
+          **\UnitTests-CommonLib.dll
+          **\PowerRenameUnitTests.dll
+          **\UnitTests-FancyZones.dll
+          **\\WorkspacesLibUnitTests.dll
          !**\obj\**

  - pwsh: |-
@@ -532,7 +531,7 @@ jobs:
    displayName: Stage GPO files

  # Running the tests may result in future jobs consuming artifacts out of this build
-  - ${{ if or(eq(parameters.runTests, true), eq(parameters.buildTests, true)) }}:
+  - ${{ if eq(parameters.runTests, true) }}:
    - task: CopyFiles@2
      displayName: Stage entire build output
      inputs:
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -15,29 +15,20 @@ parameters:
 jobs:
 - job: Test${{ parameters.platform }}${{ parameters.configuration }}
  displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
-  timeoutInMinutes: 300
  variables:
-    ${{ if or(eq(parameters.platform, 'x64Win10'), eq(parameters.platform, 'x64Win11')) }}:
-      BuildPlatform: x64
-    ${{ else }}:
-      BuildPlatform: ${{ parameters.platform }}
-    TestPlatform: ${{ parameters.platform }}
+    BuildPlatform: ${{ parameters.platform }}
    BuildConfiguration: ${{ parameters.configuration }}
    SrcPath: $(Build.Repository.LocalPath)
-    TestArtifactsName: build-${{ variables.BuildPlatform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
+    TestArtifactsName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
  pool:
    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
      ${{ if ne(parameters.platform, 'ARM64') }}:
        name: SHINE-INT-Testing-x64
-        ${{ if eq(parameters.platform, 'x64Win11') }}:
-          demands: ImageOverride -equals SHINE-W11-Testing
      ${{ else }}:
        name: SHINE-INT-Testing-arm64
    ${{ else }}:
      ${{ if ne(parameters.platform, 'ARM64') }}:
        name: SHINE-OSS-Testing-x64
-        ${{ if eq(parameters.platform, 'x64Win11') }}:
-          demands: ImageOverride -equals SHINE-W11-Testing
      ${{ else }}:
        name: SHINE-OSS-Testing-arm64
  steps:
@@ -110,13 +101,8 @@ jobs:
      vsTestVersion: 'toolsInstaller'
      uiTests: true
      rerunFailedTests: true
-      # Since UITests-FancyZonesEditor.dll is generated in both UITests-FancyZonesEditor and UITests-FancyZones, removed one to avoid duplicate test runs
      testAssemblyVer2: |
-        **\*UITest*.dll
+        **\UITests-FancyZones.dll
+        **\UITests-FancyZonesEditor.dll
        !**\obj\**
-        !**\ref\**
-        !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
-
-
-    env:
-      platform: '$(TestPlatform)'
+        !**\ref\**
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -60,4 +60,16 @@ stages:
            useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
            ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
              winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
-              useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
+              useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
+
+    - ${{ if and(eq(parameters.runTests, true), not(and(eq(platform, 'arm64'), eq(variables['System.PullRequest.IsFork'], true)))) }}:
+      - stage: Test_${{ platform }}
+        displayName: Test ${{ platform }}
+        dependsOn:
+          - Build_${{platform}}
+        jobs:
+          - template: job-test-project.yml
+            parameters:
+              platform: ${{ platform }}
+              configuration: Release
+              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
--- a/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
@@ -1,84 +0,0 @@
-variables:
-  - name: runCodesignValidationInjectionBG
-    value: false
-  - name: EnablePipelineCache
-    value: true
-  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
-    - name: EnablePipelineCache
-      value: true
-
-parameters:
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - arm64
-  - name: enableMsBuildCaching
-    type: boolean
-    default: false
-  - name: useVSPreview
-    type: boolean
-    default: false
-  - name: useLatestWebView2
-    type: boolean
-    default: false
-
-stages:
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - stage: Build_${{ platform }}
-      displayName: Build ${{ platform }}
-      dependsOn: []
-      jobs:
-        - template: job-build-project.yml
-          parameters:
-            pool:
-              ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-                name: SHINE-INT-L
-              ${{ else }}:
-                name: SHINE-OSS-L
-              ${{ if eq(parameters.useVSPreview, true) }}:
-                demands: ImageOverride -equals SHINE-VS17-Preview
-            buildPlatforms:
-              - ${{ platform }}
-            buildConfigurations: [Release]
-            enablePackageCaching: true
-            enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-            runTests: false
-            buildTests: true
-            useVSPreview: ${{ parameters.useVSPreview }}
-
-    - ${{ if eq(platform, 'x64') }}:
-      - stage: Test_x64Win10
-        displayName: Test x64Win10
-        dependsOn:
-          - Build_${{platform}}
-        jobs:
-            - template: job-test-project.yml
-              parameters:
-                platform: x64Win10
-                configuration: Release
-                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-
-    - ${{ if eq(platform, 'x64') }}:
-      - stage: Test_x64Win11
-        displayName: Test x64Win11
-        dependsOn:
-          - Build_${{platform}}
-        jobs:
-            - template: job-test-project.yml
-              parameters:
-                platform: x64Win11
-                configuration: Release
-                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-
-    - ${{ if ne(platform, 'x64') }}:
-      - stage: Test_${{ platform }}
-        displayName: Test ${{ platform }}
-        dependsOn:
-          - Build_${{platform}}
-        jobs:
-          - template: job-test-project.yml
-            parameters:
-              platform: ${{ platform }}
-              configuration: Release
-              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
--- a/.pipelines/verifyDepsJsonLibraryVersions.ps1
+++ b/.pipelines/verifyDepsJsonLibraryVersions.ps1
@@ -92,3 +92,4 @@ if ($totalFailures -gt 0) {

 Write-Host -ForegroundColor Green "All " $referencedFileVersionsPerDll.keys.Count " libraries are mentioned with the same version across the dependencies.`r`n"
 exit 0
+
--- a/.pipelines/versionAndSignCheck.ps1
+++ b/.pipelines/versionAndSignCheck.ps1
@@ -9,7 +9,6 @@ Param(
 $DirPath = $targetDir; #this file is in pipeline, we need root.
 $items = Get-ChildItem -Path $DirPath -File -Include *.exe, *.dll, *.ttf, PTCustomActions -Recurse -Force -ErrorAction SilentlyContinue
 $versionExceptions = @(
-    "AdaptiveCards.Templating.dll",
    "Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll",
    "Microsoft.Windows.ApplicationModel.Resources.Projection.dll",
    "Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.dll",
@@ -29,8 +28,6 @@ $versionExceptions = @(
    "ObjectModelCsProjection.dll",
    "RendererCsProjection.dll") -join '|';
 $nullVersionExceptions = @(
-    "SkiaSharp.Views.WinUI.Native.dll",
-    "libSkiaSharp.dll",
    "codicon.ttf",
    "e_sqlite3.dll",
    "getfilesiginforedist.dll",
--- a/.vsconfig
+++ b/.vsconfig
@@ -9,7 +9,6 @@
    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
-    "Microsoft.VisualStudio.Component.Windows10SDK.26100",
    "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -181,6 +181,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 ## PowerToys core team

 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
+- [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
 - [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
@@ -212,7 +213,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@ethanfangg](https://github.com/ethanfangg) - Ethan Fang - Product Manager
 - [@plante-msft](https://github.com/plante-msft) - Connor Plante - Product Manager
 - [@joadoumie](https://github.com/joadoumie) - Jordi Adoumie - Product Manager
- [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@enricogior](https://github.com/enricogior) - Enrico Giordani - Dev Lead
 - [@bzoz](https://github.com/bzoz) - Bartosz Sosnowski - Dev
 - [@ivan100sic](https://github.com/ivan100sic) - Ivan Stošić - Dev
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -96,8 +96,8 @@

  <!-- Global props OverrideWindowsTargetPlatformVersion-->
  <PropertyGroup Label="Globals">
-    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,8 +5,7 @@
  <ItemGroup>
    <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
    <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
-    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
-    <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
+    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.2" />
    <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
@@ -48,14 +47,14 @@
    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.6" />
    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
    <!-- 
      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1493,7 +1493,7 @@ SOFTWARE.

 - AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
 - AdaptiveCards.Rendering.WinUI3 2.1.0-beta
- AdaptiveCards.Templating 2.0.5
+- AdaptiveCards.Templating 2.0.2
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.17
 - CommunityToolkit.Common 8.4.0
@@ -1518,7 +1518,6 @@ SOFTWARE.
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
 - Microsoft.Bcl.AsyncInterfaces 9.0.6
- Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
 - Microsoft.Data.Sqlite 9.0.6
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
@@ -1534,9 +1533,9 @@ SOFTWARE.
 - Microsoft.Web.WebView2 1.0.2903.40
 - Microsoft.Win32.SystemEvents 9.0.6
 - Microsoft.Windows.Compatibility 9.0.6
- Microsoft.Windows.CsWin32 0.3.183
+- Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
- Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
+- Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
 - Microsoft.WindowsAppSDK 1.7.250513003
 - Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -717,14 +717,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseUtils.UITests", "src\modules\MouseUtils\MouseUtils.UITests\MouseUtils.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesEditorUITest", "src\modules\Workspaces\WorkspacesEditorUITest\WorkspacesEditorUITest.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorEngineCommon", "src\common\CalculatorEngineCommon\CalculatorEngineCommon.vcxproj", "{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCsWin32", "src\common\ManagedCsWin32\ManagedCsWin32.csproj", "{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2605,22 +2599,6 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.ActiveCfg = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.Build.0 = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.Build.0 = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.ActiveCfg = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.Build.0 = Release|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.ActiveCfg = Debug|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.Build.0 = Debug|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.Build.0 = Release|ARM64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.ActiveCfg = Release|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.Build.0 = Release|x64
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
@@ -2651,14 +2629,6 @@ Global
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|ARM64.Build.0 = Release|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|x64.ActiveCfg = Release|x64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|x64.Build.0 = Release|x64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Debug|x64.ActiveCfg = Debug|x64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Debug|x64.Build.0 = Debug|x64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|ARM64.Build.0 = Release|ARM64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|x64.ActiveCfg = Release|x64
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2798,7 +2768,7 @@ Global
 		{25C91A4E-BA4E-467A-85CD-8B62545BF674} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
 		{6AB6A2D6-F859-4A82-9184-0BD29C9F07D1} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
 		{212AD910-8488-4036-BE20-326931B75FB2} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{7AC943C9-52E8-44CF-9083-744D8049667B} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{7AC943C9-52E8-44CF-9083-744D8049667B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{54A93AF7-60C7-4F6C-99D2-FBB1F75F853A} = {7AC943C9-52E8-44CF-9083-744D8049667B}
 		{92C39820-9F84-4529-BC7D-22AAE514D63B} = {7AC943C9-52E8-44CF-9083-744D8049667B}
 		{515554D1-D004-4F7F-A107-2211FC0F6B2C} = {7AC943C9-52E8-44CF-9083-744D8049667B}
@@ -2930,13 +2900,10 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {322566EF-20DC-43A6-B9F8-616AF942579A}
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/doc/devdocs/UITests.md
+++ b/doc/devdocs/UITests.md
@@ -21,74 +21,67 @@

 - Create a new project and add the following references to the project file. Change the OutputPath to your own module's path.
  ```
-    <Project Sdk="Microsoft.NET.Sdk">
-    <!-- Look at Directory.Build.props in root for common stuff as well -->
-    <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-
-    <PropertyGroup>
-        <ProjectGuid>{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}</ProjectGuid>
-        <RootNamespace>PowerToys.Hosts.UITests</RootNamespace>
-        <AssemblyName>PowerToys.Hosts.UITests</AssemblyName>
-        <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
-        <Nullable>enable</Nullable>
-        <OutputType>Library</OutputType>
-
-        <!-- This is a UI test, so don't run as part of MSBuild -->
-        <RunVSTest>false</RunVSTest>
-        </PropertyGroup>
-        <PropertyGroup>
-        <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\Hosts.UITests\</OutputPath>
-        </PropertyGroup>
-
-        <ItemGroup>
-        <PackageReference Include="MSTest" />
-        <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-        </ItemGroup>
-    </Project>
-
+  	<PropertyGroup>
+  		<OutputType>Library</OutputType>
+  		<!-- This is a UI test, so don't run as part of MSBuild -->
+  		<RunVSTest>false</RunVSTest>
+  	</PropertyGroup>
+  
+  	<PropertyGroup>
+  		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\KeyboardManagerUITests\</OutputPath>
+  	</PropertyGroup>
+  
+  	<ItemGroup>
+  	    <PackageReference Include="MSTest" />
+  	    <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+  	    <Folder Include="Properties\" />
+	</ItemGroup>
  ```
 - Inherit your test class from UITestBase.
  >Set Scope: The default scope starts from the PowerToys settings UI. If you want to start from your own module, set the constructor as shown below:
  
  >Specify Scope:
  ```
-    [TestClass]
-    public class HostModuleTests : UITestBase
-    {
-        public HostModuleTests()
-            : base(PowerToysModule.Hosts, WindowSize.Small_Vertical)
-        {
-        }
-    }
+  [TestClass]
+  public class RunFancyZonesTest : UITestBase
+  {
+      public RunFancyZonesTest()
+          : base(PowerToysModule.FancyZone)
+      {
+      }
+  }
  ```

- Then you can start performing the UI operations.
+- Then you can start using session to perform the UI operations.

 **Example**
 ```
-[TestMethod("Hosts.Basic.EmptyViewShouldWork")]
-[TestCategory("Hosts File Editor #4")]
-public void TestEmptyView()
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UITests_KeyboardManager
 {
-    this.CloseWarningDialog();
-    this.RemoveAllEntries();
+    [TestClass]
+    public class RunKeyboardManagerUITests : UITestBase
+    {
+        [TestMethod]
+        public void OpenKeyboardManagerEditor()
+        {
+            // Open KeyboardManagerEditor
+            this.Session.Find<Button>(By.Name("Remap a key")).Click();
+            this.Session.Attach("Remap keys");

-    // 'Add an entry' button (only show-up when list is empty) should be visible
-    Assert.IsTrue(this.HasOne<HyperlinkButton>("Add an entry"), "'Add an entry' button should be visible in the empty view");
+            // Maximize window
+            var window = Session.Find<Window>(By.Name("Remap keys")).Maximize();

-    VisualAssert.AreEqual(this.TestContext, this.Find("Entries"), "EmptyView");
+            // Add Key Remapping
+            this.Session.Find<Button>(By.Name("Add key remapping")).Click();
+            window.Close();

-    // Click 'Add an entry' from empty-view for adding Host override rule
-    this.Find<HyperlinkButton>("Add an entry").Click();
-
-    this.AddEntry("192.168.0.1", "localhost", false, false);
-
-    // Should have one row now and not more empty view
-    Assert.IsTrue(this.Has<Button>("Delete"), "Should have one row now");
-    Assert.IsFalse(this.Has<HyperlinkButton>("Add an entry"), "'Add an entry' button should be invisible if not empty view");
-
-    VisualAssert.AreEqual(this.TestContext, this.Find("Entries"), "NonEmptyView");
+            // Back to Settings
+            this.Session.Attach(PowerToysModule.PowerToysSettings);
+        }
+    }
 }
 ```

--- a/doc/devdocs/tools/bug-report-tool.md
+++ b/doc/devdocs/tools/bug-report-tool.md
@@ -17,7 +17,6 @@ The bug report includes the following files:
 * `context-menu-packages.txt` - Information about the packages that are registered for the new Windows 11 context menu.
 * `dotnet-installation-info.txt` - Information about the installed .NET versions.
 * `EventViewer-*.xml` - These files contain event logs from the Windows Event Viewer for the executable specified in the file name.
-* `EventViewer-Microsoft-Windows-AppXDeploymentServer/Operational.xml` - Contains event logs from the AppXDeployment-Server which are useful for diagnosing MSIX installation issues.
 * `gpo-configuration-info.txt` - Information about the configured [GPO](/doc/gpo/README.md).
 * `installationFolderStructure.txt` - Information about the folder structure of the installation. All lines with files have the following structure: `FileName Version MD5Hash`.
 * `last_version_run.json` - Information about the last version of PowerToys that was run.
--- a/installer/PowerToysSetup/publish.cmd
+++ b/installer/PowerToysSetup/publish.cmd
@@ -8,10 +8,10 @@ SET VCToolsVersion=!VCToolsVersion!
 SET ClearDevCommandPromptEnvVars=false

 rem In case of Release we should not use Debug CRT in VCRT forwarders
-msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

-msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

-msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

-msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -4,8 +4,8 @@
  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />

  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.rc
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.rc
@@ -1,36 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-#include "../version/version.h"
-
-1 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
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
@@ -98,11 +98,6 @@
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\version\version.vcxproj">
-      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
-    </ProjectReference>
-  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="ExprtkEvaluator.h" />
    <ClInclude Include="pch.h" />
@@ -110,7 +105,6 @@
    <ClInclude Include="Calculator.h">
      <DependentUpon>Calculator.idl</DependentUpon>
    </ClInclude>
-    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="ExprtkEvaluator.cpp">
@@ -134,14 +128,16 @@
  <ItemGroup>
    <None Include="PropertySheet.props" />
  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="CalculatorEngineCommon.rc" />
-  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <Import Project="..\..\..\deps\spdlog.props" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
  </ImportGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+    </ProjectReference>
+  </ItemGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>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}.</ErrorText>
--- a/src/common/CalculatorEngineCommon/resource.h
+++ b/src/common/CalculatorEngineCommon/resource.h
@@ -1,13 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by CalculatorEngineCommon.rc
-
-//////////////////////////////
-// Non-localizable
-
-#define FILE_DESCRIPTION "CalculatorEngineCommon"
-#define INTERNAL_NAME "CalculatorEngineCommon"
-#define ORIGINAL_FILENAME "CalculatorEngineCommon.dll"
-
-// Non-localizable
-//////////////////////////////
--- a/src/common/ManagedCsWin32/CLSID.cs
+++ b/src/common/ManagedCsWin32/CLSID.cs
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ManagedCsWin32;
-
-public static partial class CLSID
-{
-    public static readonly Guid SearchManager = new Guid("7D096C5F-AC08-4F1F-BEB7-5C22C517CE39");
-    public static readonly Guid CollatorDataSource = new Guid("9E175B8B-F52A-11D8-B9A5-505054503030");
-    public static readonly Guid ApplicationActivationManager = new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C");
-    public static readonly Guid VirtualDesktopManager = new("aa509086-5ca9-4c25-8f95-589d3c07b48a");
-}
--- a/src/common/ManagedCsWin32/ComHelper.cs
+++ b/src/common/ManagedCsWin32/ComHelper.cs
@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-
-namespace ManagedCsWin32;
-
-public static class ComHelper
-{
-    private static StrategyBasedComWrappers cw = new StrategyBasedComWrappers();
-
-    public static T CreateComInstance<T>(ref Guid rclsid, CLSCTX dwClsContext)
-    {
-        var riid = typeof(T).GUID;
-
-        var hr = Ole32.CoCreateInstance(ref rclsid, IntPtr.Zero, dwClsContext, ref riid, out IntPtr comPtr);
-        if (hr != 0)
-        {
-            throw new ArgumentException($"Failed to create {typeof(T).Name} instance. HR: {hr}");
-        }
-
-        if (comPtr == IntPtr.Zero)
-        {
-            throw new ArgumentException($"Failed to create {typeof(T).Name} instance. CoCreateInstance return null ptr.");
-        }
-
-        try
-        {
-            var comObject = cw.GetOrCreateObjectForComInstance(comPtr, CreateObjectFlags.None);
-            if (comObject == null)
-            {
-                throw new ArgumentException($"Failed to create {typeof(T).Name} instance. Cast error.");
-            }
-
-            return (T)comObject;
-        }
-        finally
-        {
-            Marshal.Release(comPtr);
-        }
-    }
-}
--- a/src/common/ManagedCsWin32/IID.cs
+++ b/src/common/ManagedCsWin32/IID.cs
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ManagedCsWin32;
-
-public static partial class IID
-{
-    public static readonly Guid ISearchManager = new Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69");
-    public static readonly Guid IPropertyStore = new Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99");
-    public static readonly Guid IApplicationActivationManager = new Guid("2e941141-7f97-4756-ba1d-9decde894a3d");
-    public static readonly Guid IVirtualDesktopManager = new("a5cd92ff-29be-454c-8d04-d82879fb3f1b");
-}
--- a/src/common/ManagedCsWin32/Kernel32.cs
+++ b/src/common/ManagedCsWin32/Kernel32.cs
@@ -1,145 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace ManagedCsWin32;
-
-public static partial class Kernel32
-{
-    [LibraryImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static partial bool DeviceIoControl(
-        IntPtr hDevice,
-        uint dwIoControlCode,
-        IntPtr inBuffer,
-        int nInBufferSize,
-        IntPtr outBuffer,
-        int nOutBufferSize,
-        out int pBytesReturned,
-        IntPtr lpOverlapped);
-
-    [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-    public static partial int CreateFile(
-        string lpFileName,
-        FileAccessType dwDesiredAccess,
-        FileShareType dwShareMode,
-        IntPtr lpSecurityAttributes,
-        CreationDisposition dwCreationDisposition,
-        FileAttributes dwFlagsAndAttributes,
-        IntPtr hTemplateFile);
-}
-
-[Flags]
-public enum FileAccessType : uint
-{
-    DELETE = 0x00010000,
-    READ_CONTROL = 0x00020000,
-    WRITE_DAC = 0x00040000,
-    WRITE_OWNER = 0x00080000,
-    SYNCHRONIZE = 0x00100000,
-
-    STANDARD_RIGHTS_REQUIRED = 0x000F0000,
-
-    STANDARD_RIGHTS_READ = READ_CONTROL,
-    STANDARD_RIGHTS_WRITE = READ_CONTROL,
-    STANDARD_RIGHTS_EXECUTE = READ_CONTROL,
-
-    STANDARD_RIGHTS_ALL = 0x001F0000,
-
-    SPECIFIC_RIGHTS_ALL = 0x0000FFFF,
-
-    ACCESS_SYSTEM_SECURITY = 0x01000000,
-
-    MAXIMUM_ALLOWED = 0x02000000,
-
-    GENERIC_READ = 0x80000000,
-    GENERIC_WRITE = 0x40000000,
-    GENERIC_EXECUTE = 0x20000000,
-    GENERIC_ALL = 0x10000000,
-
-    FILE_READ_DATA = 0x0001,
-    FILE_WRITE_DATA = 0x0002,
-    FILE_APPEND_DATA = 0x0004,
-    FILE_READ_EA = 0x0008,
-    FILE_WRITE_EA = 0x0010,
-    FILE_EXECUTE = 0x0020,
-    FILE_READ_ATTRIBUTES = 0x0080,
-    FILE_WRITE_ATTRIBUTES = 0x0100,
-
-    FILE_ALL_ACCESS =
-        STANDARD_RIGHTS_REQUIRED |
-        SYNCHRONIZE
-        | 0x1FF,
-
-    FILE_GENERIC_READ =
-        STANDARD_RIGHTS_READ |
-        FILE_READ_DATA |
-        FILE_READ_ATTRIBUTES |
-        FILE_READ_EA |
-        SYNCHRONIZE,
-
-    FILE_GENERIC_WRITE =
-        STANDARD_RIGHTS_WRITE |
-        FILE_WRITE_DATA |
-        FILE_WRITE_ATTRIBUTES |
-        FILE_WRITE_EA |
-        FILE_APPEND_DATA |
-        SYNCHRONIZE,
-
-    FILE_GENERIC_EXECUTE =
-        STANDARD_RIGHTS_EXECUTE |
-        FILE_READ_ATTRIBUTES |
-        FILE_EXECUTE |
-        SYNCHRONIZE,
-}
-
-[Flags]
-public enum FileShareType : uint
-{
-    None = 0x00000000,
-    Read = 0x00000001,
-    Write = 0x00000002,
-    Delete = 0x00000004,
-}
-
-public enum CreationDisposition : uint
-{
-    New = 1,
-    CreateAlways = 2,
-    OpenExisting = 3,
-    OpenAlways = 4,
-    TruncateExisting = 5,
-}
-
-[Flags]
-public enum FileAttributes : uint
-{
-    Readonly = 0x00000001,
-    Hidden = 0x00000002,
-    System = 0x00000004,
-    Directory = 0x00000010,
-    Archive = 0x00000020,
-    Device = 0x00000040,
-    Normal = 0x00000080,
-    Temporary = 0x00000100,
-    SparseFile = 0x00000200,
-    ReparsePoint = 0x00000400,
-    Compressed = 0x00000800,
-    Offline = 0x00001000,
-    NotContentIndexed = 0x00002000,
-    Encrypted = 0x00004000,
-    Write_Through = 0x80000000,
-    Overlapped = 0x40000000,
-    NoBuffering = 0x20000000,
-    RandomAccess = 0x10000000,
-    SequentialScan = 0x08000000,
-    DeleteOnClose = 0x04000000,
-    BackupSemantics = 0x02000000,
-    PosixSemantics = 0x01000000,
-    OpenReparsePoint = 0x00200000,
-    OpenNoRecall = 0x00100000,
-    FirstPipeInstance = 0x00080000,
-}
--- a/src/common/ManagedCsWin32/ManagedCsWin32.csproj
+++ b/src/common/ManagedCsWin32/ManagedCsWin32.csproj
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\.\Common.Dotnet.CsWinRT.props" />
-
-	<PropertyGroup>
-		<Description>PowerToys ManagedCsWin32</Description>
-		<AssemblyName>PowerToys.ManagedCsWin32</AssemblyName>
-	</PropertyGroup>
-</Project>
--- a/src/common/ManagedCsWin32/Ole32.cs
+++ b/src/common/ManagedCsWin32/Ole32.cs
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace ManagedCsWin32;
-
-public static partial class Ole32
-{
-    [LibraryImport("ole32.dll")]
-    public static partial int CoCreateInstance(
-        ref Guid rclsid,
-        IntPtr pUnkOuter,
-        CLSCTX dwClsContext,
-        ref Guid riid,
-        out IntPtr rReturnedComObject);
-}
-
-[Flags]
-public enum CLSCTX : uint
-{
-    InProcServer = 0x1,
-    InProcHandler = 0x2,
-    LocalServer = 0x4,
-    InProcServer16 = 0x8,
-    RemoteServer = 0x10,
-    InProcHandler16 = 0x20,
-    Reserved1 = 0x40,
-    Reserved2 = 0x80,
-    Reserved3 = 0x100,
-    Reserved4 = 0x200,
-    NoCodeDownload = 0x400,
-    Reserved5 = 0x800,
-    NoCustomMarshal = 0x1000,
-    EnableCodeDownload = 0x2000,
-    NoFailureLog = 0x4000,
-    DisableAAA = 0x8000,
-    EnableAAA = 0x10000,
-    FromDefaultContext = 0x20000,
-    ActivateX86Server = 0x40000,
-#pragma warning disable CA1069 // Keep the original defines for compatibility
-    Activate32BitServer = 0x40000, // Same as ActivateX86Server
-#pragma warning restore CA1069 // Keep the original defines for compatibility
-    Activate64BitServer = 0x80000,
-    EnableCloaking = 0x100000,
-    AppContainer = 0x400000,
-    ActivateAAAAsIU = 0x800000,
-    Reserved6 = 0x1000000,
-    ActivateARM32Server = 0x2000000,
-    AllowLowerTrustRegistration = 0x4000000,
-    PSDll = 0x80000000,
-
-    INPROC = InProcServer | InProcHandler,
-    SERVER = InProcServer | LocalServer | RemoteServer,
-    ALL = InProcHandler | SERVER,
-}
--- a/src/common/ManagedCsWin32/Shell32.cs
+++ b/src/common/ManagedCsWin32/Shell32.cs
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace ManagedCsWin32;
-
-public static partial class Shell32
-{
-    [LibraryImport("SHELL32.dll", EntryPoint = "ShellExecuteExW", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static partial bool ShellExecuteEx(ref SHELLEXECUTEINFOW lpExecInfo);
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    public struct SHELLEXECUTEINFOW
-    {
-        public uint CbSize;
-        public uint FMask;
-        public IntPtr Hwnd;
-
-        public IntPtr LpVerb;
-        public IntPtr LpFile;
-        public IntPtr LpParameters;
-        public IntPtr LpDirectory;
-        public int Show;
-        public IntPtr HInstApp;
-        public IntPtr LpIDList;
-        public IntPtr LpClass;
-        public IntPtr HkeyClass;
-        public uint DwHotKey;
-        public IntPtr HIconOrMonitor;
-        public IntPtr Process;
-    }
-}
--- a/src/common/ManagedTelemetry/Telemetry/Events/DebugEvent.cs
+++ b/src/common/ManagedTelemetry/Telemetry/Events/DebugEvent.cs
@@ -2,13 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;

 namespace Microsoft.PowerToys.Telemetry.Events
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class DebugEvent : EventBase, IEvent
    {
        public string Message { get; set; }
--- a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry.Events;

 namespace Microsoft.PowerToys.Telemetry
@@ -34,8 +34,7 @@ namespace Microsoft.PowerToys.Telemetry
        /// <summary>
        /// Publishes ETW event when an action is triggered on
        /// </summary>
-        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "We will ensure the public properties won't be trimmed by ourself.")]
-        public void WriteEvent<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T>(T telemetryEvent)
+        public void WriteEvent<T>(T telemetryEvent)
            where T : EventBase, IEvent
        {
            if (DataDiagnosticsSettings.GetEnabledValue())
--- a/src/common/UITestAutomation/Element/CheckBox.cs
+++ b/src/common/UITestAutomation/Element/CheckBox.cs
@@ -1,53 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class CheckBox : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.CheckBox";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CheckBox"/> class.
-        /// </summary>
-        public CheckBox()
-        {
-            this.TargetControlType = CheckBox.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Select the item of the ComboBox.
-        /// </summary>
-        /// <param name="value">The text to select from the list view.</param>
-        public void Select(string value)
-        {
-            this.Find<NavigationViewItem>(value).Click();
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the CheckBox is checked.
-        /// </summary>
-        public bool IsChecked => this.Selected;
-
-        public CheckBox SetCheck(bool value = true, int msPreAction = 500, int msPostAction = 500)
-        {
-            if (this.IsChecked != value)
-            {
-                if (msPreAction > 0)
-                {
-                    Task.Delay(msPreAction).Wait();
-                }
-
-                // Toggle the switch
-                this.Click();
-                if (msPostAction > 0)
-                {
-                    Task.Delay(msPostAction).Wait();
-                }
-            }
-
-            return this;
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/ComboBox.cs
+++ b/src/common/UITestAutomation/Element/ComboBox.cs
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class ComboBox : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.ComboBox";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ComboBox"/> class.
-        /// </summary>
-        public ComboBox()
-        {
-            this.TargetControlType = ComboBox.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Select the item of the ComboBox.
-        /// </summary>
-        /// <param name="value">The text to select from the list view.</param>
-        public void Select(string value)
-        {
-            this.Find<NavigationViewItem>(value).Click();
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/Custom.cs
+++ b/src/common/UITestAutomation/Element/Custom.cs
@@ -1,74 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class Custom : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Custom";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Custom"/> class.
-        /// </summary>
-        public Custom()
-        {
-            this.TargetControlType = Custom.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Sends a combination of keys.
-        /// </summary>
-        /// <param name="keys">The keys to send.</param>
-        public void SendKeys(params Key[] keys)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                KeyboardHelper.SendKeys(keys);
-            });
-        }
-
-        /// <summary>
-        /// Drag element move offset.
-        /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void Drag(int offsetX, int offsetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Drag element move to other element.
-        /// </summary>
-        /// <param name="element">Move to this element.</param>
-        public void Drag(Element element)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).ClickAndHold();
-                Assert.IsNotNull(element.WindowsElement, "element is null");
-                int dx = (element.WindowsElement.Rect.X - windowElement.Rect.X) / 10;
-                int dy = (element.WindowsElement.Rect.Y - windowElement.Rect.Y) / 10;
-                for (int i = 0; i < 10; i++)
-                {
-                    actions.MoveByOffset(dx, dy);
-                }
-
-                actions.Release();
-                actions.Build().Perform();
-            });
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/Element.cs
+++ b/src/common/UITestAutomation/Element/Element.cs
@@ -7,7 +7,6 @@ using System.Drawing;
 using System.Runtime.CompilerServices;
 using System.Xml.Linq;
 using ABI.Windows.Foundation;
-using Microsoft.PowerToys.UITest;
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
@@ -26,20 +25,8 @@ namespace Microsoft.PowerToys.UITest
    {
        private WindowsElement? windowsElement;

-        protected internal WindowsElement? WindowsElement
-        {
-            get => windowsElement;
-            set => windowsElement = value;
-        }
-
        private WindowsDriver<WindowsElement>? driver;

-        protected internal WindowsDriver<WindowsElement>? Driver
-        {
-            get => driver;
-            set => driver = value;
-        }
-
        protected string? TargetControlType { get; set; }

        internal bool IsMatchingTarget()
@@ -125,12 +112,9 @@ namespace Microsoft.PowerToys.UITest
        /// Click the UI element.
        /// </summary>
        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click. Default value is false</param>
-        /// <param name="msPreAction">Delay in milliseconds before performing the click action. Default is 500 ms.</param>
-        /// <param name="msPostAction">Delay in milliseconds after performing the click action. Default is 500 ms.</param>
-        public virtual void Click(bool rightClick = false, int msPreAction = 500, int msPostAction = 500)
+        public virtual void Click(bool rightClick = false)
        {
-            PerformAction(
-                (actions, windowElement) =>
+            PerformAction((actions, windowElement) =>
            {
                actions.MoveToElement(windowElement);

@@ -147,9 +131,7 @@ namespace Microsoft.PowerToys.UITest
                }

                actions.Build().Perform();
-            },
-                msPreAction,
-                msPostAction);
+            });
        }

        /// <summary>
@@ -170,20 +152,51 @@ namespace Microsoft.PowerToys.UITest
        }

        /// <summary>
-        /// Release action
+        /// Drag element move offset.
        /// </summary>
-        public void ReleaseAction()
+        /// <param name="offsetX">The offsetX to move.</param>
+        /// <param name="offsetY">The offsetY to move.</param>
+        public void Drag(int offsetX, int offsetY)
        {
-            var releaseAction = new Actions(driver);
-            releaseAction.Release().Perform();
+            PerformAction((actions, windowElement) =>
+            {
+                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
+                actions.Build().Perform();
+            });
        }

        /// <summary>
-        /// Release key
+        /// Drag element move to other element.
        /// </summary>
-        public void ReleaseKey(Key key)
+        /// <param name="element">Move to this element.</param>
+        public void Drag(Element element)
        {
-            KeyboardHelper.ReleaseKey(key);
+            PerformAction((actions, windowElement) =>
+            {
+                actions.MoveToElement(windowElement).ClickAndHold();
+                Assert.IsNotNull(element.windowsElement, "element is null");
+                int dx = (element.windowsElement.Rect.X - windowElement.Rect.X) / 10;
+                int dy = (element.windowsElement.Rect.Y - windowElement.Rect.Y) / 10;
+                for (int i = 0; i < 10; i++)
+                {
+                    actions.MoveByOffset(dx, dy);
+                }
+
+                actions.Release();
+                actions.Build().Perform();
+            });
+        }
+
+        /// <summary>
+        /// Send Key of the element.
+        /// </summary>
+        /// <param name="key">The Key to Send.</param>
+        public void SendKeys(string key)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                windowElement.SendKeys(key);
+            });
        }

        /// <summary>
@@ -205,7 +218,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="by">The selector to use for finding the element.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>The found element.</returns>
-        public T Find<T>(By by, int timeoutMS = 5000)
+        public T Find<T>(By by, int timeoutMS = 3000)
            where T : Element, new()
        {
            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
@@ -213,7 +226,7 @@ namespace Microsoft.PowerToys.UITest
            // leverage findAll to filter out mismatched elements
            var collection = this.FindAll<T>(by, timeoutMS);

-            Assert.IsTrue(collection.Count > 0, $"UI-Element({typeof(T).Name}) not found using selector: {by}");
+            Assert.IsTrue(collection.Count > 0, $"Element not found using selector: {by}");

            return collection[0];
        }
@@ -226,7 +239,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="name">The name for finding the element.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 5000)
+        public T Find<T>(string name, int timeoutMS = 3000)
            where T : Element, new()
        {
            return this.Find<T>(By.Name(name), timeoutMS);
@@ -239,7 +252,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="by">The selector to use for finding the element.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 5000)
+        public Element Find(By by, int timeoutMS = 3000)
        {
            return this.Find<Element>(by, timeoutMS);
        }
@@ -251,7 +264,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="name">The name for finding the element.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 5000)
+        public Element Find(string name, int timeoutMS = 3000)
        {
            return this.Find<Element>(By.Name(name), timeoutMS);
        }
@@ -263,7 +276,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="by">The selector to use for finding the elements.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000)
+        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
            where T : Element, new()
        {
            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
@@ -295,7 +308,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="name">The name for finding the element.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000)
+        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
            where T : Element, new()
        {
            return this.FindAll<T>(By.Name(name), timeoutMS);
@@ -308,7 +321,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="by">The selector to use for finding the elements.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000)
+        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
        {
            return this.FindAll<Element>(by, timeoutMS);
        }
@@ -320,23 +333,11 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="name">The name for finding the element.</param>
        /// <param name="timeoutMS">The timeout in milliseconds.</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000)
+        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
        {
            return this.FindAll<Element>(By.Name(name), timeoutMS);
        }

-        /// <summary>
-        /// Send Key of the element.
-        /// </summary>
-        /// <param name="key">The Key to Send.</param>
-        protected void SendKeys(string key)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                windowElement.SendKeys(key);
-            });
-        }
-
        /// <summary>
        /// Simulates a manual operation on the element.
        /// </summary>
@@ -359,15 +360,5 @@ namespace Microsoft.PowerToys.UITest
                Task.Delay(msPostAction).Wait();
            }
        }
-
-        /// <summary>
-        /// Save UI Element to a PNG file.
-        /// </summary>
-        /// <param name="path">the full path</param>
-        internal void SaveToPngFile(string path)
-        {
-            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method SaveToPngFile with parameter: path = {path}");
-            this.windowsElement.GetScreenshot().SaveAsFile(path);
-        }
    }
 }
--- a/src/common/UITestAutomation/Element/Group.cs
+++ b/src/common/UITestAutomation/Element/Group.cs
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class Group : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Group";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Group"/> class.
-        /// </summary>
-        public Group()
-        {
-            this.TargetControlType = Group.ExpectedControlType;
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/NavigationViewItem.cs
+++ b/src/common/UITestAutomation/Element/NavigationViewItem.cs
@@ -24,12 +24,9 @@ namespace Microsoft.PowerToys.UITest
        /// Click the ListItem element.
        /// </summary>
        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click. Default value is false</param>
-        /// <param name="msPreAction">Pre action delay in milliseconds. Default value is 500</param>
-        /// <param name="msPostAction">Post action delay in milliseconds. Default value is 500</param>
-        public override void Click(bool rightClick = false, int msPreAction = 500, int msPostAction = 500)
+        public override void Click(bool rightClick = false)
        {
-            PerformAction(
-                (actions, windowElement) =>
+            PerformAction((actions, windowElement) =>
            {
                actions.MoveToElement(windowElement, 10, 10);

@@ -43,36 +40,7 @@ namespace Microsoft.PowerToys.UITest
                }

                actions.Build().Perform();
-            },
-                msPreAction,
-                msPostAction);
-        }
-
-        /// <summary>
-        /// Click the center of the ListItem element.
-        /// </summary>
-        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click. Default value is false</param>
-        /// <param name="msPreAction">Pre action delay in milliseconds. Default value is 500</param>
-        /// <param name="msPostAction">Post action delay in milliseconds. Default value is 500</param>
-        public void ClickCenter(bool rightClick = false, int msPreAction = 500, int msPostAction = 500)
-        {
-            PerformAction(
-                (actions, windowElement) =>
-                {
-                    actions.MoveToElement(windowElement);
-                    if (rightClick)
-                    {
-                        actions.ContextClick();
-                    }
-                    else
-                    {
-                        actions.Click();
-                    }
-
-                    actions.Build().Perform();
-                },
-                msPreAction,
-                msPostAction);
+            });
        }

        /// <summary>
--- a/src/common/UITestAutomation/Element/Pane.cs
+++ b/src/common/UITestAutomation/Element/Pane.cs
@@ -1,101 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium.Appium.Windows;
-using OpenQA.Selenium.Interactions;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class Pane : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Pane";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pane"/> class.
-        /// </summary>
-        public Pane()
-        {
-            this.TargetControlType = Pane.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Drag element move offset.
-        /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void Drag(int offsetX, int offsetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Simulates holding when dragging to target position.
-        /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void DragAndHold(int offsetX, int offsetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY);
-                actions.Build().Perform();
-            });
-        }
-
-        public void ReleaseDrag()
-        {
-            var releaseAction = new Actions(this.Driver);
-            releaseAction.Release().Perform();
-        }
-
-        /// <summary>
-        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
-        /// </summary>
-        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
-        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
-        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
-        public void KeyDownAndDrag(Key key, int targetX, int targetY)
-        {
-            HoldShiftToDrag(key, targetX, targetY);
-            ReleaseAction();
-            ReleaseKey(key);
-        }
-
-        /// <summary>
-        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
-        /// </summary>
-        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
-        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
-        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
-        public void HoldShiftToDrag(Key key, int targetX, int targetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                KeyboardHelper.PressKey(key);
-
-                actions.MoveToElement(WindowsElement)
-                .ClickAndHold()
-                .Perform();
-
-                int dx = targetX - windowElement.Rect.X;
-                int dy = targetY - windowElement.Rect.Y;
-
-                int stepCount = 10;
-                int stepX = dx / stepCount;
-                int stepY = dy / stepCount;
-
-                for (int i = 0; i < stepCount; i++)
-                {
-                    var stepAction = new Actions(Driver);
-                    stepAction.MoveByOffset(stepX, stepY).Perform();
-                }
-            });
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/Slider.cs
+++ b/src/common/UITestAutomation/Element/Slider.cs
@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium.Appium.Windows;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class Slider : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Slider";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Slider"/> class.
-        /// </summary>
-        public Slider()
-        {
-            this.TargetControlType = Slider.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Gets the value of a Slider (WindowsElement)
-        /// </summary>
-        /// <returns>The integer value of the slider</returns>
-        public int GetValue()
-        {
-            return this.Text == string.Empty ? 0 : int.Parse(this.Text);
-        }
-
-        /// <summary>
-        /// Sends a combination of keys.
-        /// </summary>
-        /// <param name="keys">The keys to send.</param>
-        public void SendKeys(params Key[] keys)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                KeyboardHelper.SendKeys(keys);
-            });
-        }
-
-        /// <summary>
-        /// Sets the value of a Slider (WindowsElement) to the specified integer value.
-        /// Throws an exception if the value is out of the slider's valid range.
-        /// </summary>
-        /// <param name="targetValue">The target integer value to set</param>
-        public void SetValue(int targetValue)
-        {
-            // Read range and current value
-            int min = int.Parse(this.GetAttribute("RangeValue.Minimum"));
-            int max = int.Parse(this.GetAttribute("RangeValue.Maximum"));
-            int current = int.Parse(this.Text);
-
-            // Use Assert to check if the target value is within the valid range
-            Assert.IsTrue(
-                targetValue >= min && targetValue <= max,
-                $"Target value {targetValue} is out of range (min: {min}, max: {max}).");
-
-            // Compute difference
-            int diff = targetValue - current;
-            if (diff == 0)
-            {
-                return;
-            }
-
-            string key = diff > 0 ? OpenQA.Selenium.Keys.Right : OpenQA.Selenium.Keys.Left;
-            int steps = Math.Abs(diff);
-
-            for (int i = 0; i < steps; i++)
-            {
-                this.SendKeys(key);
-
-                // Thread.Sleep(2);
-            }
-
-            // Final check
-            int finalValue = int.Parse(this.Text);
-            Assert.AreEqual(
-                targetValue, finalValue, $"Slider value mismatch: expected {targetValue}, but got {finalValue}.");
-        }
-
-        /// <summary>
-        /// Sets the value of a Slider (WindowsElement) to the specified integer value.
-        /// Throws an exception if the value is out of the slider's valid range.
-        /// </summary>
-        /// <param name="targetValue">The target integer value to set</param>
-        public void QuickSetValue(int targetValue)
-        {
-            // Read range and current value
-            int min = int.Parse(this.GetAttribute("RangeValue.Minimum"));
-            int max = int.Parse(this.GetAttribute("RangeValue.Maximum"));
-            int current = int.Parse(this.Text);
-
-            // Use Assert to check if the target value is within the valid range
-            Assert.IsTrue(
-                targetValue >= min && targetValue <= max,
-                $"Target value {targetValue} is out of range (min: {min}, max: {max}).");
-
-            // Compute difference
-            int diff = targetValue - current;
-            if (diff == 0)
-            {
-                return;
-            }
-
-            string key = diff > 0 ? OpenQA.Selenium.Keys.Right : OpenQA.Selenium.Keys.Left;
-            int steps = Math.Abs(diff);
-
-            int maxKeysPerSend = 50;
-            int fullChunks = steps / maxKeysPerSend;
-            int remainder = steps % maxKeysPerSend;
-            for (int i = 0; i < fullChunks; i++)
-            {
-                SendKeys(new string(key[0], maxKeysPerSend));
-                Thread.Sleep(2);
-            }
-
-            if (remainder > 0)
-            {
-                SendKeys(new string(key[0], remainder));
-                Thread.Sleep(2);
-            }
-
-            // Final check
-            int finalValue = int.Parse(this.Text);
-            Assert.AreEqual(
-                targetValue, finalValue, $"Slider value mismatch: expected {targetValue}, but got {finalValue}.");
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/Tab.cs
+++ b/src/common/UITestAutomation/Element/Tab.cs
@@ -1,67 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium.Appium.Windows;
-using OpenQA.Selenium.Interactions;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class Tab : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Tab";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Tab"/> class.
-        /// </summary>
-        public Tab()
-        {
-            this.TargetControlType = Tab.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
-        /// </summary>
-        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
-        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
-        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
-        public void KeyDownAndDrag(Key key, int targetX, int targetY)
-        {
-            HoldShiftToDrag(key, targetX, targetY);
-            ReleaseAction();
-            ReleaseKey(key);
-        }
-
-        /// <summary>
-        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
-        /// </summary>
-        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
-        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
-        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
-        public void HoldShiftToDrag(Key key, int targetX, int targetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                KeyboardHelper.PressKey(key);
-
-                actions.MoveToElement(WindowsElement)
-                .ClickAndHold()
-                .Perform();
-
-                int dx = targetX - windowElement.Rect.X;
-                int dy = targetY - windowElement.Rect.Y;
-
-                int stepCount = 10;
-                int stepX = dx / stepCount;
-                int stepY = dy / stepCount;
-
-                for (int i = 0; i < stepCount; i++)
-                {
-                    var stepAction = new Actions(Driver);
-                    stepAction.MoveByOffset(stepX, stepY).Perform();
-                }
-            });
-        }
-    }
-}
--- a/src/common/UITestAutomation/Element/TextBox.cs
+++ b/src/common/UITestAutomation/Element/TextBox.cs
@@ -2,6 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using OpenQA.Selenium;
+
 namespace Microsoft.PowerToys.UITest
 {
    /// <summary>
@@ -33,10 +35,9 @@ namespace Microsoft.PowerToys.UITest
                PerformAction((actions, windowElement) =>
                {
                    // select all text and delete it
-                    windowElement.SendKeys(OpenQA.Selenium.Keys.Control + "a");
-                    windowElement.SendKeys(OpenQA.Selenium.Keys.Delete);
+                    windowElement.SendKeys(Keys.Control + "a");
+                    windowElement.SendKeys(Keys.Delete);
                });
-                Task.Delay(500).Wait();
            }

            PerformAction((actions, windowElement) =>
--- a/src/common/UITestAutomation/Element/Thumb.cs
+++ b/src/common/UITestAutomation/Element/Thumb.cs
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium.Appium.Windows;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class Thumb : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Thumb";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Thumb"/> class.
-        /// </summary>
-        public Thumb()
-        {
-            this.TargetControlType = Thumb.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Drag element move offset.
-        /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void Drag(int offsetX, int offsetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
-                actions.Build().Perform();
-            });
-        }
-    }
-}
--- a/src/common/UITestAutomation/FindHelper.cs
+++ b/src/common/UITestAutomation/FindHelper.cs
@@ -20,7 +20,7 @@ namespace Microsoft.PowerToys.UITest
        public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<IReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
            where T : Element, new()
        {
-            var items = FindElementsWithRetry(findElementsFunc, timeoutMS);
+            var items = findElementsFunc();
            var res = items.Select(item =>
            {
                var element = item as WindowsElement;
@@ -30,30 +30,17 @@ namespace Microsoft.PowerToys.UITest
            return new ReadOnlyCollection<T>(res);
        }

-        private static ReadOnlyCollection<TW> FindElementsWithRetry<TW>(Func<IReadOnlyCollection<TW>> findElementsFunc, int timeoutMS)
+        public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<ReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
+            where T : Element, new()
        {
-            var timeout = TimeSpan.FromMilliseconds(timeoutMS);
-            var retryIntervalMS = TimeSpan.FromMilliseconds(500);
-            DateTime startTime = DateTime.Now;
-
-            while (DateTime.Now - startTime < timeout)
+            var items = findElementsFunc();
+            var res = items.Select(item =>
            {
-                try
-                {
-                    var items = findElementsFunc();
-                    if (items.Count > 0)
-                    {
-                        return new ReadOnlyCollection<TW>((IList<TW>)items);
-                    }
+                var element = item as WindowsElement;
+                return NewElement<T>(element, driver, timeoutMS);
+            }).Where(item => item.IsMatchingTarget()).ToList();

-                    Task.Delay(retryIntervalMS).Wait();
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            return new ReadOnlyCollection<TW>(new List<TW>());
+            return new ReadOnlyCollection<T>(res);
        }

        public static T NewElement<T>(WindowsElement? element, WindowsDriver<WindowsElement>? driver, int timeoutMS)
@@ -63,6 +50,11 @@ namespace Microsoft.PowerToys.UITest
            Assert.IsNotNull(element, $"New Element {typeof(T).Name} error: element is null.");

            T newElement = new T();
+            if (timeoutMS > 0)
+            {
+                // Only set timeout if it is positive value
+                driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(timeoutMS);
+            }

            newElement.SetSession(driver);
            newElement.SetWindowsElement(element);
--- a/src/common/UITestAutomation/KeyboardHelper.cs
+++ b/src/common/UITestAutomation/KeyboardHelper.cs
@@ -1,475 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents keyboard keys.
-    /// </summary>
-    public enum Key
-    {
-        Ctrl,
-        LCtrl,
-        RCtrl,
-        Alt,
-        Shift,
-        Tab,
-        Esc,
-        Enter,
-        Win,
-        A,
-        B,
-        C,
-        D,
-        E,
-        F,
-        G,
-        H,
-        I,
-        J,
-        K,
-        L,
-        M,
-        N,
-        O,
-        P,
-        Q,
-        R,
-        S,
-        T,
-        U,
-        V,
-        W,
-        X,
-        Y,
-        Z,
-        Num0,
-        Num1,
-        Num2,
-        Num3,
-        Num4,
-        Num5,
-        Num6,
-        Num7,
-        Num8,
-        Num9,
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-        Space,
-        Backspace,
-        Delete,
-        Insert,
-        Home,
-        End,
-        PageUp,
-        PageDown,
-        Up,
-        Down,
-        Left,
-        Right,
-        Other,
-    }
-
-    /// <summary>
-    /// Provides methods for simulating keyboard input.
-    /// </summary>
-    internal static class KeyboardHelper
-    {
-        [DllImport("user32.dll")]
-#pragma warning disable SA1300 // Element should begin with upper-case letter
-        private static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
-#pragma warning restore SA1300 // Element should begin with upper-case letter
-
-#pragma warning disable SA1310 // Field names should not contain underscore
-        private const byte VK_LWIN = 0x5B;
-        private const uint KEYEVENTF_KEYDOWN = 0x0000;
-        private const uint KEYEVENTF_KEYUP = 0x0002;
-#pragma warning restore SA1310 // Field names should not contain underscore
-
-        /// <summary>
-        /// Sends a combination of keys.
-        /// </summary>
-        /// <param name="keys">The keys to send.</param>
-        public static void SendKeys(params Key[] keys)
-        {
-            string keysToSend = string.Join(string.Empty, keys.Select(TranslateKey));
-            SendWinKeyCombination(keysToSend);
-        }
-
-        public static void PressKey(Key key)
-        {
-            PressVirtualKey(TranslateKeyHex(key));
-        }
-
-        public static void ReleaseKey(Key key)
-        {
-            ReleaseVirtualKey(TranslateKeyHex(key));
-        }
-
-        public static void SendKey(Key key)
-        {
-            PressVirtualKey(TranslateKeyHex(key));
-            ReleaseVirtualKey(TranslateKeyHex(key));
-        }
-
-        /// <summary>
-        /// Translates a key to its corresponding SendKeys representation.
-        /// </summary>
-        /// <param name="key">The key to translate.</param>
-        /// <returns>The SendKeys representation of the key.</returns>
-        private static string TranslateKey(Key key)
-        {
-            switch (key)
-            {
-                case Key.Ctrl:
-                    return "^";
-                case Key.LCtrl:
-                    return "^";
-                case Key.RCtrl:
-                    return "^";
-                case Key.Alt:
-                    return "%";
-                case Key.Shift:
-                    return "+";
-                case Key.Tab:
-                    return "{TAB}";
-                case Key.Esc:
-                    return "{ESC}";
-                case Key.Enter:
-                    return "{ENTER}";
-                case Key.Win:
-                    return "{WIN}";
-                case Key.Space:
-                    return " ";
-                case Key.Backspace:
-                    return "{BACKSPACE}";
-                case Key.Delete:
-                    return "{DELETE}";
-                case Key.Insert:
-                    return "{INSERT}";
-                case Key.Home:
-                    return "{HOME}";
-                case Key.End:
-                    return "{END}";
-                case Key.PageUp:
-                    return "{PGUP}";
-                case Key.PageDown:
-                    return "{PGDN}";
-                case Key.Up:
-                    return "{UP}";
-                case Key.Down:
-                    return "{DOWN}";
-                case Key.Left:
-                    return "{LEFT}";
-                case Key.Right:
-                    return "{RIGHT}";
-                case Key.F1:
-                    return "{F1}";
-                case Key.F2:
-                    return "{F2}";
-                case Key.F3:
-                    return "{F3}";
-                case Key.F4:
-                    return "{F4}";
-                case Key.F5:
-                    return "{F5}";
-                case Key.F6:
-                    return "{F6}";
-                case Key.F7:
-                    return "{F7}";
-                case Key.F8:
-                    return "{F8}";
-                case Key.F9:
-                    return "{F9}";
-                case Key.F10:
-                    return "{F10}";
-                case Key.F11:
-                    return "{F11}";
-                case Key.F12:
-                    return "{F12}";
-                case Key.A:
-                    return "a";
-                case Key.B:
-                    return "b";
-                case Key.C:
-                    return "c";
-                case Key.D:
-                    return "d";
-                case Key.E:
-                    return "e";
-                case Key.F:
-                    return "f";
-                case Key.G:
-                    return "g";
-                case Key.H:
-                    return "h";
-                case Key.I:
-                    return "i";
-                case Key.J:
-                    return "j";
-                case Key.K:
-                    return "k";
-                case Key.L:
-                    return "l";
-                case Key.M:
-                    return "m";
-                case Key.N:
-                    return "n";
-                case Key.O:
-                    return "o";
-                case Key.P:
-                    return "p";
-                case Key.Q:
-                    return "q";
-                case Key.R:
-                    return "r";
-                case Key.S:
-                    return "s";
-                case Key.T:
-                    return "t";
-                case Key.U:
-                    return "u";
-                case Key.V:
-                    return "v";
-                case Key.W:
-                    return "w";
-                case Key.X:
-                    return "x";
-                case Key.Y:
-                    return "y";
-                case Key.Z:
-                    return "z";
-                case Key.Num0:
-                    return "0";
-                case Key.Num1:
-                    return "1";
-                case Key.Num2:
-                    return "2";
-                case Key.Num3:
-                    return "3";
-                case Key.Num4:
-                    return "4";
-                case Key.Num5:
-                    return "5";
-                case Key.Num6:
-                    return "6";
-                case Key.Num7:
-                    return "7";
-                case Key.Num8:
-                    return "8";
-                case Key.Num9:
-                    return "9";
-                default:
-                    return string.Empty;
-            }
-        }
-
-        /// <summary>
-        /// map the virtual key codes to the corresponding keys.
-        /// </summary>
-        private static byte TranslateKeyHex(Key key)
-        {
-            switch (key)
-            {
-                case Key.Win:
-                    return 0x5B;  // Windows Key - 0x5B in hex
-                case Key.Ctrl:
-                    return 0x11;  // Ctrl Key - 0x11 in hex
-                case Key.Alt:
-                    return 0x12;  // Alt Key - 0x12 in hex
-                case Key.Shift:
-                    return 0x10;  // Shift Key - 0x10 in hex
-                case Key.LCtrl:
-                    return 0xA2;  // Left Ctrl Key - 0xA2 in hex
-                case Key.RCtrl:
-                    return 0xA3;  // Right Ctrl Key - 0xA3 in hex
-                case Key.A:
-                    return 0x41;  // A Key - 0x41 in hex
-                case Key.B:
-                    return 0x42;  // B Key - 0x42 in hex
-                case Key.C:
-                    return 0x43;  // C Key - 0x43 in hex
-                case Key.D:
-                    return 0x44;  // D Key - 0x44 in hex
-                case Key.E:
-                    return 0x45;  // E Key - 0x45 in hex
-                case Key.F:
-                    return 0x46;  // F Key - 0x46 in hex
-                case Key.G:
-                    return 0x47;  // G Key - 0x47 in hex
-                case Key.H:
-                    return 0x48;  // H Key - 0x48 in hex
-                case Key.I:
-                    return 0x49;  // I Key - 0x49 in hex
-                case Key.J:
-                    return 0x4A;  // J Key - 0x4A in hex
-                case Key.K:
-                    return 0x4B;  // K Key - 0x4B in hex
-                case Key.L:
-                    return 0x4C;  // L Key - 0x4C in hex
-                case Key.M:
-                    return 0x4D;  // M Key - 0x4D in hex
-                case Key.N:
-                    return 0x4E;  // N Key - 0x4E in hex
-                case Key.O:
-                    return 0x4F;  // O Key - 0x4F in hex
-                case Key.P:
-                    return 0x50;  // P Key - 0x50 in hex
-                case Key.Q:
-                    return 0x51;  // Q Key - 0x51 in hex
-                case Key.R:
-                    return 0x52;  // R Key - 0x52 in hex
-                case Key.S:
-                    return 0x53;  // S Key - 0x53 in hex
-                case Key.T:
-                    return 0x54;  // T Key - 0x54 in hex
-                case Key.U:
-                    return 0x55;  // U Key - 0x55 in hex
-                case Key.V:
-                    return 0x56;  // V Key - 0x56 in hex
-                case Key.W:
-                    return 0x57;  // W Key - 0x57 in hex
-                case Key.X:
-                    return 0x58;  // X Key - 0x58 in hex
-                case Key.Y:
-                    return 0x59;  // Y Key - 0x59 in hex
-                case Key.Z:
-                    return 0x5A;  // Z Key - 0x5A in hex
-                case Key.Num0:
-                    return 0x30;  // 0 Key - 0x30 in hex
-                case Key.Num1:
-                    return 0x31;  // 1 Key - 0x31 in hex
-                case Key.Num2:
-                    return 0x32;  // 2 Key - 0x32 in hex
-                case Key.Num3:
-                    return 0x33;  // 3 Key - 0x33 in hex
-                case Key.Num4:
-                    return 0x34;  // 4 Key - 0x34 in hex
-                case Key.Num5:
-                    return 0x35;  // 5 Key - 0x35 in hex
-                case Key.Num6:
-                    return 0x36;  // 6 Key - 0x36 in hex
-                case Key.Num7:
-                    return 0x37;  // 7 Key - 0x37 in hex
-                case Key.Num8:
-                    return 0x38;  // 8 Key - 0x38 in hex
-                case Key.Num9:
-                    return 0x39;  // 9 Key - 0x39 in hex
-                case Key.F1:
-                    return 0x70;  // F1 Key - 0x70 in hex
-                case Key.F2:
-                    return 0x71;  // F2 Key - 0x71 in hex
-                case Key.F3:
-                    return 0x72;  // F3 Key - 0x72 in hex
-                case Key.F4:
-                    return 0x73;  // F4 Key - 0x73 in hex
-                case Key.F5:
-                    return 0x74;  // F5 Key - 0x74 in hex
-                case Key.F6:
-                    return 0x75;  // F6 Key - 0x75 in hex
-                case Key.F7:
-                    return 0x76;  // F7 Key - 0x76 in hex
-                case Key.F8:
-                    return 0x77;  // F8 Key - 0x77 in hex
-                case Key.F9:
-                    return 0x78;  // F9 Key - 0x78 in hex
-                case Key.F10:
-                    return 0x79;  // F10 Key - 0x79 in hex
-                case Key.F11:
-                    return 0x7A;  // F11 Key - 0x7A in hex
-                case Key.F12:
-                    return 0x7B;  // F12 Key - 0x7B in hex
-                case Key.Up:
-                    return 0x26;  // Up Arrow Key - 0x26 in hex
-                case Key.Down:
-                    return 0x28;  // Down Arrow Key - 0x28 in hex
-                case Key.Left:
-                    return 0x25;  // Left Arrow Key - 0x25 in hex
-                case Key.Right:
-                    return 0x27;  // Right Arrow Key - 0x27 in hex
-                case Key.Home:
-                    return 0x24;  // Home Key - 0x24 in hex
-                case Key.End:
-                    return 0x23;  // End Key - 0x23 in hex
-                case Key.PageUp:
-                    return 0x21;  // Page Up Key - 0x21 in hex
-                case Key.PageDown:
-                    return 0x22;  // Page Down Key - 0x22 in hex
-                case Key.Space:
-                    return 0x20;  // Space Key - 0x20 in hex
-                case Key.Enter:
-                    return 0x0D;  // Enter Key - 0x0D in hex
-                case Key.Backspace:
-                    return 0x08;  // Backspace Key - 0x08 in hex
-                case Key.Tab:
-                    return 0x09;  // Tab Key - 0x09 in hex
-                case Key.Esc:
-                    return 0x1B;  // Escape Key - 0x1B in hex
-                case Key.Insert:
-                    return 0x2D;  // Insert Key - 0x2D in hex
-                case Key.Delete:
-                    return 0x2E;  // Delete Key - 0x2E in hex
-                default:
-                    throw new ArgumentException($"Key {key} is not supported, Please add your key at TranslateKeyHex for translation to hex.");
-            }
-        }
-
-        /// <summary>
-        /// Sends a combination of keys, including the Windows key, to the system.
-        /// </summary>
-        /// <param name="keys">The keys to send.</param>
-        private static void SendWinKeyCombination(string keys)
-        {
-            bool winKeyDown = false;
-
-            if (keys.Contains("{WIN}"))
-            {
-                keybd_event(VK_LWIN, 0, KEYEVENTF_KEYDOWN, UIntPtr.Zero);
-                winKeyDown = true;
-                keys = keys.Replace("{WIN}", string.Empty); // Remove {WIN} from the string
-            }
-
-            System.Windows.Forms.SendKeys.SendWait(keys);
-
-            // Release Windows key
-            if (winKeyDown)
-            {
-                keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, UIntPtr.Zero);
-            }
-        }
-
-        /// <summary>
-        /// Just press the key.(no release)
-        /// </summary>
-        private static void PressVirtualKey(byte key)
-        {
-            keybd_event(key, 0, KEYEVENTF_KEYDOWN, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Release only the button (if pressed first)
-        /// </summary>
-        private static void ReleaseVirtualKey(byte key)
-        {
-            keybd_event(key, 0, KEYEVENTF_KEYUP, UIntPtr.Zero);
-        }
-    }
-}
--- a/src/common/UITestAutomation/ModuleConfigData.cs
+++ b/src/common/UITestAutomation/ModuleConfigData.cs
@@ -29,49 +29,6 @@ namespace Microsoft.PowerToys.UITest
        PowerToysSettings,
        FancyZone,
        Hosts,
-        Runner,
-        Workspaces,
-    }
-
-    /// <summary>
-    /// Represents the window size for the UI test.
-    /// </summary>
-    public enum WindowSize
-    {
-        /// <summary>
-        /// Unspecified window size, won't make any size change
-        /// </summary>
-        UnSpecified,
-
-        /// <summary>
-        /// Small window size, 640 * 480
-        /// </summary>
-        Small,
-
-        /// <summary>
-        /// Small window size, 480 * 640
-        /// </summary>
-        Small_Vertical,
-
-        /// <summary>
-        /// Medium window size, 1024 * 768
-        /// </summary>
-        Medium,
-
-        /// <summary>
-        /// Medium window size, 768 * 1024
-        /// </summary>
-        Medium_Vertical,
-
-        /// <summary>
-        /// Large window size, 1920 * 1080
-        /// </summary>
-        Large,
-
-        /// <summary>
-        /// Large window size, 1080 * 1920
-        /// </summary>
-        Large_Vertical,
    }

    internal class ModuleConfigData
@@ -95,8 +52,6 @@ namespace Microsoft.PowerToys.UITest
                [PowerToysModule.PowerToysSettings] = "PowerToys Settings",
                [PowerToysModule.FancyZone] = "FancyZones Layout",
                [PowerToysModule.Hosts] = "Hosts File Editor",
-                [PowerToysModule.Runner] = "PowerToys",
-                [PowerToysModule.Workspaces] = "Workspaces Editor",
            };

            // Exe start path for the module if it exists.
@@ -105,8 +60,6 @@ namespace Microsoft.PowerToys.UITest
                [PowerToysModule.PowerToysSettings] = @"\..\..\..\WinUI3Apps\PowerToys.Settings.exe",
                [PowerToysModule.FancyZone] = @"\..\..\..\PowerToys.FancyZonesEditor.exe",
                [PowerToysModule.Hosts] = @"\..\..\..\WinUI3Apps\PowerToys.Hosts.exe",
-                [PowerToysModule.Runner] = @"\..\..\..\PowerToys.exe",
-                [PowerToysModule.Workspaces] = @"\..\..\..\PowerToys.WorkspacesEditor.exe",
            };
        }

--- a/src/common/UITestAutomation/MonitorInfoData.cs
+++ b/src/common/UITestAutomation/MonitorInfoData.cs
@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public class MonitorInfoData
-    {
-        public MonitorInfoData()
-        {
-        }
-
-        public struct MonitorInfoDataWrapper
-        {
-            public string DeviceName { get; set; }
-
-            public string DeviceString { get; set; }
-
-            public string DeviceID { get; set; }
-
-            public string DeviceKey { get; set; }
-
-            public int PelsWidth { get; set; }
-
-            public int PelsHeight { get; set; }
-
-            public int DisplayFrequency { get; set; }
-        }
-
-        public struct ParamsWrapper
-        {
-            public List<MonitorInfoDataWrapper> Monitors { get; set; }
-        }
-    }
-}
--- a/src/common/UITestAutomation/MouseHelper.cs
+++ b/src/common/UITestAutomation/MouseHelper.cs
@@ -1,217 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public enum MouseActionType
-    {
-        LeftClick,
-        RightClick,
-        MiddleClick,
-        LeftDoubleClick,
-        RightDoubleClick,
-        LeftDown,
-        LeftUp,
-        RightDown,
-        RightUp,
-        MiddleDown,
-        MiddleUp,
-        ScrollUp,
-        ScrollDown,
-    }
-
-    internal static class MouseHelper
-    {
-        [StructLayout(LayoutKind.Sequential)]
-        public struct POINT
-        {
-            public int X;
-            public int Y;
-        }
-
-        [Flags]
-        internal enum MouseEvent
-        {
-            LeftDown = 0x0002,
-            LeftUp = 0x0004,
-            RightDown = 0x0008,
-            RightUp = 0x0010,
-            MiddleDown = 0x0020,
-            MiddleUp = 0x0040,
-            Wheel = 0x0800,
-        }
-
-        [DllImport("user32.dll")]
-        public static extern bool GetCursorPos(out POINT lpPoint);
-
-        [DllImport("user32.dll")]
-        public static extern bool SetCursorPos(int x, int y);
-
-        [DllImport("user32.dll")]
-#pragma warning disable SA1300 // Element should begin with upper-case letter
-        private static extern void mouse_event(uint dwFlags, uint dx, uint dy, uint dwData, UIntPtr dwExtraInfo);
-#pragma warning restore SA1300 // Element should begin with upper-case letter
-
-        /// <summary>
-        /// Gets the current position of the mouse cursor as a tuple.
-        /// </summary>
-        /// <returns>A tuple containing the X and Y coordinates of the cursor.</returns>
-        public static Tuple<int, int> GetMousePosition()
-        {
-            GetCursorPos(out POINT point);
-            return Tuple.Create(point.X, point.Y);
-        }
-
-        /// <summary>
-        /// Moves the mouse cursor to the specified screen coordinates.
-        /// </summary>
-        /// <param name="x">The new x-coordinate of the cursor.</param>
-        /// <param name="y">The new y-coordinate of the cursor.</param
-        public static void MoveMouseTo(int x, int y)
-        {
-            SetCursorPos(x, y);
-        }
-
-        /// <summary>
-        /// The delay in milliseconds between mouse down and up events to simulate a click.
-        /// </summary>
-        private const int ClickDelay = 100;
-
-        /// <summary>
-        /// The amount of scroll units to simulate a single mouse wheel tick.
-        /// </summary>
-        private const int ScrollAmount = 120;
-
-        /// <summary>
-        /// Simulates a left mouse click (press and release).
-        /// </summary>
-        public static void LeftClick()
-        {
-            LeftDown();
-            Thread.Sleep(ClickDelay);
-            LeftUp();
-        }
-
-        /// <summary>
-        /// Simulates a right mouse click (press and release).
-        /// </summary>
-        public static void RightClick()
-        {
-            RightDown();
-            Thread.Sleep(ClickDelay);
-            RightUp();
-        }
-
-        /// <summary>
-        /// Simulates a middle mouse click (press and release).
-        /// </summary>
-        public static void MiddleClick()
-        {
-            MiddleDown();
-            Thread.Sleep(ClickDelay);
-            MiddleUp();
-        }
-
-        /// <summary>
-        /// Simulates a left mouse double-click.
-        /// </summary>
-        public static void LeftDoubleClick()
-        {
-            LeftClick();
-            Thread.Sleep(ClickDelay);
-            LeftClick();
-        }
-
-        /// <summary>
-        /// Simulates a right mouse double-click.
-        /// </summary>
-        public static void RightDoubleClick()
-        {
-            RightClick();
-            Thread.Sleep(ClickDelay);
-            RightClick();
-        }
-
-        /// <summary>
-        /// Simulates pressing the left mouse button down.
-        /// </summary>
-        public static void LeftDown()
-        {
-            mouse_event((uint)MouseEvent.LeftDown, 0, 0, 0, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates pressing the right mouse button down.
-        /// </summary>
-        public static void RightDown()
-        {
-            mouse_event((uint)MouseEvent.RightDown, 0, 0, 0, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates pressing the middle mouse button down.
-        /// </summary>
-        public static void MiddleDown()
-        {
-            mouse_event((uint)MouseEvent.MiddleDown, 0, 0, 0, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates releasing the left mouse button.
-        /// </summary>
-        public static void LeftUp()
-        {
-            mouse_event((uint)MouseEvent.LeftUp, 0, 0, 0, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates releasing the right mouse button.
-        /// </summary>
-        public static void RightUp()
-        {
-            mouse_event((uint)MouseEvent.RightUp, 0, 0, 0, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates releasing the middle mouse button.
-        /// </summary>
-        public static void MiddleUp()
-        {
-            mouse_event((uint)MouseEvent.MiddleUp, 0, 0, 0, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates a mouse scroll wheel action by a specified amount.
-        /// Positive values scroll up, negative values scroll down.
-        /// </summary>
-        /// <param name="amount">The scroll amount. Typically 120 or -120 per tick.</param>
-        public static void ScrollWheel(int amount)
-        {
-            mouse_event((uint)MouseEvent.Wheel, 0, 0, (uint)amount, UIntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Simulates scrolling the mouse wheel up by one tick.
-        /// </summary>
-        public static void ScrollUp()
-        {
-            ScrollWheel(ScrollAmount);
-        }
-
-        /// <summary>
-        /// Simulates scrolling the mouse wheel down by one tick.
-        /// </summary>
-        public static void ScrollDown()
-        {
-            ScrollWheel(-ScrollAmount);
-        }
-    }
-}
--- a/src/common/UITestAutomation/ScreenCapture.cs
+++ b/src/common/UITestAutomation/ScreenCapture.cs
@@ -1,133 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Drawing.Imaging;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Provides methods for capturing the screen with the mouse cursor.
-    /// </summary>
-    internal static class ScreenCapture
-    {
-        [DllImport("user32.dll")]
-        private static extern IntPtr GetDC(IntPtr hWnd);
-
-        [DllImport("gdi32.dll")]
-        private static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-        [DllImport("user32.dll")]
-        private static extern bool GetCursorInfo(out CURSORINFO pci);
-
-        [DllImport("user32.dll")]
-        private static extern bool DrawIconEx(IntPtr hdc, int x, int y, IntPtr hIcon, int cx, int cy, int istepIfAniCur, IntPtr hbrFlickerFreeDraw, int diFlags);
-
-        /// <summary>
-        /// Represents a point with X and Y coordinates.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct POINT
-        {
-            public int X;
-            public int Y;
-        }
-
-        /// <summary>
-        /// Contains information about the cursor.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct CURSORINFO
-        {
-            /// <summary>
-            /// Gets or sets the size of the structure.
-            /// </summary>
-            public int CbSize;
-
-            /// <summary>
-            /// Gets or sets the cursor state.
-            /// </summary>
-            public int Flags;
-
-            /// <summary>
-            /// Gets or sets the handle to the cursor.
-            /// </summary>
-            public IntPtr HCursor;
-
-            /// <summary>
-            /// Gets or sets the screen position of the cursor.
-            /// </summary>
-            public POINT PTScreenPos;
-        }
-
-        private const int CURSORSHOWING = 0x00000001;
-        private const int DESKTOPHORZRES = 118;
-        private const int DESKTOPVERTRES = 117;
-        private const int DINORMAL = 0x0003;
-
-        /// <summary>
-        /// Captures the screen with the mouse cursor and saves it to the specified file path.
-        /// </summary>
-        /// <param name="filePath">The file path to save the captured image.</param>
-        private static void CaptureScreenWithMouse(string filePath)
-        {
-            IntPtr hdc = GetDC(IntPtr.Zero);
-            int screenWidth = GetDeviceCaps(hdc, DESKTOPHORZRES);
-            int screenHeight = GetDeviceCaps(hdc, DESKTOPVERTRES);
-            ReleaseDC(IntPtr.Zero, hdc);
-
-            Rectangle bounds = new Rectangle(0, 0, screenWidth, screenHeight);
-            using (Bitmap bitmap = new Bitmap(bounds.Width, bounds.Height))
-            {
-                using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap))
-                {
-                    g.CopyFromScreen(bounds.Location, Point.Empty, bounds.Size);
-
-                    CURSORINFO cursorInfo;
-                    cursorInfo.CbSize = Marshal.SizeOf<CURSORINFO>();
-                    if (GetCursorInfo(out cursorInfo) && cursorInfo.Flags == CURSORSHOWING)
-                    {
-                        using (System.Drawing.Graphics gIcon = System.Drawing.Graphics.FromImage(bitmap))
-                        {
-                            IntPtr hdcDest = gIcon.GetHdc();
-                            DrawIconEx(hdcDest, cursorInfo.PTScreenPos.X, cursorInfo.PTScreenPos.Y, cursorInfo.HCursor, 0, 0, 0, IntPtr.Zero, DINORMAL);
-                            gIcon.ReleaseHdc(hdcDest);
-                        }
-                    }
-                }
-
-                bitmap.Save(filePath, ImageFormat.Png);
-            }
-        }
-
-        /// <summary>
-        /// Captures a screenshot and saves it to the specified directory.
-        /// </summary>
-        /// <param name="directory">The directory to save the screenshot.</param>
-        private static void CaptureScreenshot(string directory)
-        {
-            string filePath = Path.Combine(directory, $"screenshot_{DateTime.Now:yyyyMMdd_HHmmssfff}.png");
-            CaptureScreenWithMouse(filePath);
-        }
-
-        /// <summary>
-        /// Timer callback method to capture a screenshot.
-        /// </summary>
-        /// <param name="state">The state object passed to the callback method.</param>
-        public static void TimerCallback(object? state)
-        {
-            string directory = (string)state!;
-            CaptureScreenshot(directory);
-        }
-    }
-}
--- a/src/common/UITestAutomation/Session.cs
+++ b/src/common/UITestAutomation/Session.cs
@@ -1,17 +1,14 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

 using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
+using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 using OpenQA.Selenium.Interactions;
-using static Microsoft.PowerToys.UITest.WindowHelper;

 namespace Microsoft.PowerToys.UITest
 {
@@ -20,70 +17,35 @@ namespace Microsoft.PowerToys.UITest
    /// </summary>
    public class Session
    {
-        public WindowsDriver<WindowsElement> Root { get; set; }
+        private WindowsDriver<WindowsElement> Root { get; set; }

        private WindowsDriver<WindowsElement> WindowsDriver { get; set; }

-        private List<IntPtr> windowHandlers = new List<IntPtr>();
+        [DllImport("user32.dll")]
+        private static extern bool SetForegroundWindow(nint hWnd);

-        private Window? MainWindow { get; set; }
-
-        /// <summary>
-        /// Gets Main Window Handler
-        /// </summary>
-        public IntPtr MainWindowHandler { get; private set; }
-
-        /// <summary>
-        /// Gets Init Scope
-        /// </summary>
-        public PowerToysModule InitScope { get; private set; }
-
-        /// <summary>
-        /// Gets the RunAsAdmin flag.
-        /// If true, the session is running as admin.
-        /// If false, the session is not running as admin.
-        /// If null, no information is available.
-        /// </summary>
-        public bool? IsElevated { get; private set; }
-
-        public Session(WindowsDriver<WindowsElement> pRoot, WindowsDriver<WindowsElement> pDriver, PowerToysModule scope, WindowSize size)
+        public Session(WindowsDriver<WindowsElement> root, WindowsDriver<WindowsElement> windowsDriver)
        {
-            this.MainWindowHandler = IntPtr.Zero;
-            this.Root = pRoot;
-            this.WindowsDriver = pDriver;
-            this.InitScope = scope;
-
-            if (size != WindowSize.UnSpecified)
-            {
-                // Attach to the scope & reset MainWindowHandler
-                this.Attach(scope, size);
-            }
+            this.Root = root;
+            this.WindowsDriver = windowsDriver;
        }

        /// <summary>
-        /// Cleans up the Session Exe.
-        /// </summary>
-        public void Cleanup()
-        {
-            windowHandlers.Clear();
-        }
-
-        /// <summary>
-        /// Finds an Element or its derived class by selector.
+        /// Finds an element by selector.
        /// </summary>
        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        public T Find<T>(By by, int timeoutMS = 5000, bool global = false)
+        public T Find<T>(By by, int timeoutMS = 3000)
            where T : Element, new()
        {
            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");

            // leverage findAll to filter out mismatched elements
-            var collection = this.FindAll<T>(by, timeoutMS, global);
+            var collection = this.FindAll<T>(by, timeoutMS);

-            Assert.IsTrue(collection.Count > 0, $"UI-Element({typeof(T).Name}) not found using selector: {by}");
+            Assert.IsTrue(collection.Count > 0, $"Element not found using selector: {by}");

            return collection[0];
        }
@@ -93,159 +55,62 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 5000, bool global = false)
+        public T Find<T>(string name, int timeoutMS = 3000)
            where T : Element, new()
        {
-            return this.Find<T>(By.Name(name), timeoutMS, global);
+            return this.Find<T>(By.Name(name), timeoutMS);
        }

        /// <summary>
        /// Shortcut for this.Find<Element>(by, timeoutMS)
        /// </summary>
        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 5000, bool global = false)
+        public Element Find(By by, int timeoutMS = 3000)
        {
-            return this.Find<Element>(by, timeoutMS, global);
+            return this.Find<Element>(by, timeoutMS);
        }

        /// <summary>
        /// Shortcut for this.Find<Element>(By.Name(name), timeoutMS)
        /// </summary>
        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 5000, bool global = false)
+        public Element Find(string name, int timeoutMS = 3000)
        {
-            return this.Find<Element>(By.Name(name), timeoutMS, global);
+            return this.Find<Element>(By.Name(name), timeoutMS);
        }

        /// <summary>
-        /// Has only one Element or its derived class by selector.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(By by, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.FindAll<T>(by, timeoutMS, global).Count == 1;
-        }
-
-        /// <summary>
-        /// Shortcut for this.HasOne<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(By by, int timeoutMS = 5000, bool global = false)
-        {
-            return this.HasOne<Element>(by, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.HasOne<T>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(string name, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.HasOne<T>(By.Name(name), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.HasOne<Element>(name, timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(string name, int timeoutMS = 5000, bool global = false)
-        {
-            return this.HasOne<Element>(By.Name(name), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Has one or more Element or its derived class by selector.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(By by, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.FindAll<T>(by, timeoutMS, global).Count >= 1;
-        }
-
-        /// <summary>
-        /// Shortcut for this.Has<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(By by, int timeoutMS = 5000, bool global = false)
-        {
-            return this.Has<Element>(by, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Has<T>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(string name, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.Has<T>(By.Name(name), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Has<Element>(name, timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(string name, int timeoutMS = 5000, bool global = false)
-        {
-            return this.Has<Element>(name, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds all Element or its derived class by selector.
+        /// Finds all elements by selector.
        /// </summary>
        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000, bool global = false)
+        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
            where T : Element, new()
        {
-            var driver = global ? this.Root : this.WindowsDriver;
-            Assert.IsNotNull(driver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
+            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
            var foundElements = FindHelper.FindAll<T, WindowsElement>(
                () =>
                {
                    if (by.GetIsAccessibilityId())
                    {
-                        var elements = driver.FindElementsByAccessibilityId(by.GetAccessibilityId());
+                        var elements = this.WindowsDriver.FindElementsByAccessibilityId(by.GetAccessibilityId());
                        return elements;
                    }
                    else
                    {
-                        var elements = driver.FindElements(by.ToSeleniumBy());
+                        var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
                        return elements;
                    }
                },
-                driver,
+                this.WindowsDriver,
                timeoutMS);

            return foundElements ?? new ReadOnlyCollection<T>([]);
@@ -257,12 +122,12 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
        /// <param name="name">The name to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000, bool global = false)
+        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
            where T : Element, new()
        {
-            return this.FindAll<T>(By.Name(name), timeoutMS, global);
+            return this.FindAll<T>(By.Name(name), timeoutMS);
        }

        /// <summary>
@@ -270,11 +135,11 @@ namespace Microsoft.PowerToys.UITest
        /// Shortcut for this.FindAll<Element>(by, timeoutMS)
        /// </summary>
        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000, bool global = false)
+        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
        {
-            return this.FindAll<Element>(by, timeoutMS, global);
+            return this.FindAll<Element>(by, timeoutMS);
        }

        /// <summary>
@@ -282,186 +147,55 @@ namespace Microsoft.PowerToys.UITest
        /// Shortcut for this.FindAll<Element>(By.Name(name), timeoutMS)
        /// </summary>
        /// <param name="name">The name to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000, bool global = false)
+        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
        {
-            return this.FindAll<Element>(By.Name(name), timeoutMS, global);
+            return this.FindAll<Element>(By.Name(name), timeoutMS);
        }

        /// <summary>
-        /// Close the main window.
+        /// Keyboard Action key.
        /// </summary>
-        public void CloseMainWindow()
+        /// <param name="key1">The Keys1 to click.</param>
+        /// <param name="key2">The Keys2 to click.</param>
+        /// <param name="key3">The Keys3 to click.</param>
+        /// <param name="key4">The Keys4 to click.</param>
+        public void KeyboardAction(string key1, string key2 = "", string key3 = "", string key4 = "")
        {
-            if (MainWindow != null)
+            PerformAction((actions, windowElement) =>
            {
-                MainWindow.Close();
-                MainWindow = null;
-            }
-        }
-
-        /// <summary>
-        /// Sends a combination of keys.
-        /// </summary>
-        /// <param name="keys">The keys to send.</param>
-        public void SendKeys(params Key[] keys)
-        {
-            PerformAction(() =>
-            {
-                KeyboardHelper.SendKeys(keys);
-            });
-        }
-
-        /// <summary>
-        /// release the key (after the hold key and drag is completed.)
-        /// </summary>
-        /// <param name="key">The key release.</param>
-        public void PressKey(Key key)
-        {
-            PerformAction(() =>
-            {
-                KeyboardHelper.PressKey(key);
-            });
-        }
-
-        /// <summary>
-        /// press and hold the specified key.
-        /// </summary>
-        /// <param name="key">The key to press and hold .</param>
-        public void ReleaseKey(Key key)
-        {
-            PerformAction(() =>
-            {
-                KeyboardHelper.ReleaseKey(key);
-            });
-        }
-
-        /// <summary>
-        /// press and hold the specified key.
-        /// </summary>
-        /// <param name="key">The key to press and release .</param>
-        public void SendKey(Key key, int msPreAction = 500, int msPostAction = 500)
-        {
-            PerformAction(
-                () =>
+                if (string.IsNullOrEmpty(key2))
                {
-                    KeyboardHelper.SendKey(key);
-                },
-                msPreAction,
-                msPostAction);
-        }
-
-        /// <summary>
-        /// Sends a sequence of keys.
-        /// </summary>
-        /// <param name="keys">An array of keys to send.</param>
-        public void SendKeySequence(params Key[] keys)
-        {
-            PerformAction(() =>
-            {
-                foreach (var key in keys)
-                {
-                    KeyboardHelper.SendKeys(key);
+                    actions.SendKeys(key1);
                }
+                else if (string.IsNullOrEmpty(key3))
+                {
+                    actions.SendKeys(key1).SendKeys(key2);
+                }
+                else if (string.IsNullOrEmpty(key4))
+                {
+                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3);
+                }
+                else
+                {
+                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3).SendKeys(key4);
+                }
+
+                actions.Release();
+                actions.Build().Perform();
            });
        }

-        /// <summary>
-        /// Gets the current position of the mouse cursor as a tuple.
-        /// </summary>
-        /// <returns>A tuple containing the X and Y coordinates of the cursor.</returns>
-        public Tuple<int, int> GetMousePosition()
-        {
-            return MouseHelper.GetMousePosition();
-        }
-
-        /// <summary>
-        /// Moves the mouse cursor to the specified screen coordinates.
-        /// </summary>
-        /// <param name="x">The new x-coordinate of the cursor.</param>
-        /// <param name="y">The new y-coordinate of the cursor.</param
-        public void MoveMouseTo(int x, int y, int msPreAction = 500, int msPostAction = 500)
-        {
-            PerformAction(
-                () =>
-                {
-                    MouseHelper.MoveMouseTo(x, y);
-                },
-                msPreAction,
-                msPostAction);
-        }
-
-        /// <summary>
-        /// Performs a mouse action based on the specified action type.
-        /// </summary>
-        /// <param name="action">The mouse action to perform.</param>
-        /// <param name="msPreAction">Pre-action delay in milliseconds.</param>
-        /// <param name="msPostAction">Post-action delay in milliseconds.</param>
-        public void PerformMouseAction(MouseActionType action, int msPreAction = 500, int msPostAction = 500)
-        {
-            PerformAction(
-                () =>
-                {
-                    switch (action)
-                    {
-                        case MouseActionType.LeftClick:
-                            MouseHelper.LeftClick();
-                            break;
-                        case MouseActionType.RightClick:
-                            MouseHelper.RightClick();
-                            break;
-                        case MouseActionType.MiddleClick:
-                            MouseHelper.MiddleClick();
-                            break;
-                        case MouseActionType.LeftDoubleClick:
-                            MouseHelper.LeftDoubleClick();
-                            break;
-                        case MouseActionType.RightDoubleClick:
-                            MouseHelper.RightDoubleClick();
-                            break;
-                        case MouseActionType.LeftDown:
-                            MouseHelper.LeftDown();
-                            break;
-                        case MouseActionType.LeftUp:
-                            MouseHelper.LeftUp();
-                            break;
-                        case MouseActionType.RightDown:
-                            MouseHelper.RightDown();
-                            break;
-                        case MouseActionType.RightUp:
-                            MouseHelper.RightUp();
-                            break;
-                        case MouseActionType.MiddleDown:
-                            MouseHelper.MiddleDown();
-                            break;
-                        case MouseActionType.MiddleUp:
-                            MouseHelper.MiddleUp();
-                            break;
-                        case MouseActionType.ScrollUp:
-                            MouseHelper.ScrollUp();
-                            break;
-                        case MouseActionType.ScrollDown:
-                            MouseHelper.ScrollDown();
-                            break;
-                        default:
-                            throw new ArgumentException("Unsupported mouse action.", nameof(action));
-                    }
-                },
-                msPreAction,
-                msPostAction);
-        }
-
        /// <summary>
        /// Attaches to an existing PowerToys module.
        /// </summary>
        /// <param name="module">The PowerToys module to attach to.</param>
-        /// <param name="size">The window size to set. Default is no change to window size</param>
        /// <returns>The attached session.</returns>
-        public Session Attach(PowerToysModule module, WindowSize size = WindowSize.UnSpecified)
+        public Session Attach(PowerToysModule module)
        {
            string windowName = ModuleConfigData.Instance.GetModuleWindowName(module);
-            return this.Attach(windowName, size);
+            return this.Attach(windowName);
        }

        /// <summary>
@@ -469,148 +203,35 @@ namespace Microsoft.PowerToys.UITest
        /// The session should be attached when a new app is started.
        /// </summary>
        /// <param name="windowName">The window name to attach to.</param>
-        /// <param name="size">The window size to set. Default is no change to window size</param>
        /// <returns>The attached session.</returns>
-        public Session Attach(string windowName, WindowSize size = WindowSize.UnSpecified)
+        public Session Attach(string windowName)
        {
-            this.IsElevated = null;
-            this.MainWindowHandler = IntPtr.Zero;
-
            if (this.Root != null)
            {
-                // search window handler by window title (admin and non-admin titles)
-                var timeout = TimeSpan.FromMinutes(2);
-                var retryInterval = TimeSpan.FromSeconds(5);
-                DateTime startTime = DateTime.Now;
-
-                List<(IntPtr HWnd, string Title)>? matchingWindows = null;
-
-                while (DateTime.Now - startTime < timeout)
-                {
-                    matchingWindows = WindowHelper.ApiHelper.FindDesktopWindowHandler(
-                    new[] { windowName, WindowHelper.AdministratorPrefix + windowName });
-
-                    if (matchingWindows.Count > 0 && matchingWindows[0].HWnd != IntPtr.Zero)
-                    {
-                        break;
-                    }
-
-                    Task.Delay(retryInterval).Wait();
-                }
-
-                if (matchingWindows == null || matchingWindows.Count == 0 || matchingWindows[0].HWnd == IntPtr.Zero)
-                {
-                    Assert.Fail($"Failed to attach. Window '{windowName}' not found after {timeout.TotalSeconds} seconds.");
-                }
-
-                // pick one from matching windows
-                this.MainWindowHandler = matchingWindows[0].HWnd;
-                this.IsElevated = matchingWindows[0].Title.StartsWith(WindowHelper.AdministratorPrefix);
-
-                ApiHelper.SetForegroundWindow(this.MainWindowHandler);
-
-                var hexWindowHandle = this.MainWindowHandler.ToInt64().ToString("x");
+                var window = this.Root.FindElementByName(windowName);
+                Assert.IsNotNull(window, $"Failed to attach. Window '{windowName}' not found");

+                var windowHandle = new nint(int.Parse(window.GetAttribute("NativeWindowHandle")));
+                SetForegroundWindow(windowHandle);
+                var hexWindowHandle = windowHandle.ToString("x");
                var appCapabilities = new AppiumOptions();
+
                appCapabilities.AddAdditionalCapability("appTopLevelWindow", hexWindowHandle);
                appCapabilities.AddAdditionalCapability("deviceName", "WindowsPC");
                this.WindowsDriver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), appCapabilities);
+                Assert.IsNotNull(this.WindowsDriver, "Attach WindowsDriver is null");

-                this.windowHandlers.Add(this.MainWindowHandler);
-
-                if (size != WindowSize.UnSpecified)
-                {
-                    WindowHelper.SetWindowSize(this.MainWindowHandler, size);
-                }
-
-                // Set MainWindow
-                MainWindow = Find<Window>(matchingWindows[0].Title);
+                // Set implicit timeout to make element search retry every 500 ms
+                this.WindowsDriver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(3);
            }
            else
            {
                Assert.IsNotNull(this.Root, $"Failed to attach to the window '{windowName}'. Root driver is null");
            }

-            Task.Delay(3000).Wait();
            return this;
        }

-        /// <summary>
-        /// Sets the main window size.
-        /// </summary>
-        /// <param name="size">WindowSize enum</param>
-        public void SetMainWindowSize(WindowSize size)
-        {
-            if (this.MainWindowHandler == IntPtr.Zero)
-            {
-                // Attach to the scope & reset MainWindowHandler
-                this.Attach(this.InitScope);
-            }
-
-            WindowHelper.SetWindowSize(this.MainWindowHandler, size);
-        }
-
-        /// <summary>
-        /// Gets the main window center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public (int CenterX, int CenterY) GetMainWindowCenter()
-        {
-            return WindowHelper.GetWindowCenter(this.MainWindowHandler);
-        }
-
-        /// <summary>
-        /// Gets the main window center coordinates.
-        /// </summary>
-        /// <returns>(int Left, int Top, int Right, int Bottom)</returns>
-        public (int Left, int Top, int Right, int Bottom) GetMainWindowRect()
-        {
-            return WindowHelper.GetWindowRect(this.MainWindowHandler);
-        }
-
-        /// <summary>
-        /// Launches the specified executable with optional arguments and simulates a delay before and after execution.
-        /// </summary>
-        /// <param name="executablePath">The full path to the executable to launch.</param>
-        /// <param name="arguments">Optional command-line arguments to pass to the executable.</param>
-        /// <param name="msPreAction">The number of milliseconds to wait before launching the executable. Default is 0 ms.</param>
-        /// <param name="msPostAction">The number of milliseconds to wait after launching the executable. Default is 2000 ms.</param>
-        public void StartExe(string executablePath, string arguments = "", int msPreAction = 0, int msPostAction = 2000)
-        {
-            PerformAction(
-                () =>
-                {
-                    StartExeInternal(executablePath, arguments);
-                },
-                msPreAction,
-                msPostAction);
-        }
-
-        private void StartExeInternal(string executablePath, string arguments = "")
-        {
-            var processInfo = new ProcessStartInfo
-            {
-                FileName = executablePath,
-                Arguments = arguments,
-                UseShellExecute = true,
-            };
-            Process.Start(processInfo);
-        }
-
-        /// <summary>
-        /// Terminates all running processes that match the specified process name.
-        /// Waits for each process to exit after sending the kill signal.
-        /// </summary>
-        /// <param name="processName">The name of the process to terminate (without extension, e.g., "notepad").</param>
-        public void KillAllProcessesByName(string processName)
-        {
-            foreach (var process in Process.GetProcessesByName(processName))
-            {
-                process.Kill();
-                process.WaitForExit();
-            }
-        }
-
        /// <summary>
        /// Simulates a manual operation on the element.
        /// </summary>
@@ -633,26 +254,5 @@ namespace Microsoft.PowerToys.UITest
                Task.Delay(msPostAction).Wait();
            }
        }
-
-        /// <summary>
-        /// Simulates a manual operation on the element.
-        /// </summary>
-        /// <param name="action">The action to perform on the element.</param>
-        /// <param name="msPreAction">The number of milliseconds to wait before the action. Default value is 500 ms</param>
-        /// <param name="msPostAction">The number of milliseconds to wait after the action. Default value is 500 ms</param>
-        protected void PerformAction(Action action, int msPreAction = 500, int msPostAction = 500)
-        {
-            if (msPreAction > 0)
-            {
-                Task.Delay(msPreAction).Wait();
-            }
-
-            action();
-
-            if (msPostAction > 0)
-            {
-                Task.Delay(msPostAction).Wait();
-            }
-        }
    }
 }
--- a/src/common/UITestAutomation/SessionHelper.cs
+++ b/src/common/UITestAutomation/SessionHelper.cs
@@ -15,58 +15,39 @@ namespace Microsoft.PowerToys.UITest
    /// <summary>
    /// Nested class for test initialization.
    /// </summary>
-    public class SessionHelper
+    internal class SessionHelper
    {
        // Default session path is PowerToys settings dashboard
        private readonly string sessionPath = ModuleConfigData.Instance.GetModulePath(PowerToysModule.PowerToysSettings);

-        private readonly string runnerPath = ModuleConfigData.Instance.GetModulePath(PowerToysModule.Runner);
-
        private string? locationPath;

-        private static WindowsDriver<WindowsElement>? root;
+        private WindowsDriver<WindowsElement> Root { get; set; }

        private WindowsDriver<WindowsElement>? Driver { get; set; }

-        private static Process? appDriver;
-        private Process? runner;
-
-        private PowerToysModule scope;
+        private Process? appDriver;

        [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
        public SessionHelper(PowerToysModule scope)
        {
-            this.scope = scope;
            this.sessionPath = ModuleConfigData.Instance.GetModulePath(scope);
            this.locationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

-            CheckWinAppDriverAndRoot();
-
-            var runnerProcessInfo = new ProcessStartInfo
+            var winAppDriverProcessInfo = new ProcessStartInfo
            {
-                FileName = locationPath + this.runnerPath,
+                FileName = "C:\\Program Files (x86)\\Windows Application Driver\\WinAppDriver.exe",
                Verb = "runas",
            };

-            if (scope == PowerToysModule.PowerToysSettings)
-            {
-                this.ExitExe(runnerProcessInfo.FileName);
-                this.runner = Process.Start(runnerProcessInfo);
-            }
-        }
+            this.appDriver = Process.Start(winAppDriverProcessInfo);

-        /// <summary>
-        /// Initializes WinAppDriver And Root.
-        /// </summary>
-        public void CheckWinAppDriverAndRoot()
-        {
-            if (SessionHelper.root == null || SessionHelper.appDriver?.SessionId == null || SessionHelper.appDriver == null || SessionHelper.appDriver.HasExited)
-            {
-                this.StartWindowsAppDriverApp();
-                var desktopCapabilities = new AppiumOptions();
-                desktopCapabilities.AddAdditionalCapability("app", "Root");
-                SessionHelper.root = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), desktopCapabilities);
-            }
+            var desktopCapabilities = new AppiumOptions();
+            desktopCapabilities.AddAdditionalCapability("app", "Root");
+            this.Root = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), desktopCapabilities);
+
+            // Set default timeout to 5 seconds
+            this.Root.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
        }

        /// <summary>
@@ -75,8 +56,7 @@ namespace Microsoft.PowerToys.UITest
        /// <param name="scope">The PowerToys module to start.</param>
        public SessionHelper Init()
        {
-            this.ExitExe(this.locationPath + this.sessionPath);
-            this.StartExe(this.locationPath + this.sessionPath);
+            this.StartExe(locationPath + this.sessionPath);

            Assert.IsNotNull(this.Driver, $"Failed to initialize the test environment. Driver is null.");

@@ -91,11 +71,8 @@ namespace Microsoft.PowerToys.UITest
            ExitScopeExe();
            try
            {
-                if (this.scope == PowerToysModule.PowerToysSettings)
-                {
-                    runner?.Kill();
-                    runner?.WaitForExit(); // Optional: Wait for the process to exit
-                }
+                appDriver?.Kill();
+                appDriver?.WaitForExit(); // Optional: Wait for the process to exit
            }
            catch (Exception ex)
            {
@@ -104,30 +81,6 @@ namespace Microsoft.PowerToys.UITest
            }
        }

-        /// <summary>
-        /// Exit a exe.
-        /// </summary>
-        /// <param name="appPath">The path to the application executable.</param>
-        public void ExitExe(string appPath)
-        {
-            // Exit Exe
-            string exeName = Path.GetFileNameWithoutExtension(appPath);
-
-            Process[] processes = Process.GetProcessesByName(exeName);
-            foreach (Process process in processes)
-            {
-                try
-                {
-                    process.Kill();
-                    process.WaitForExit(); // Optional: Wait for the process to exit
-                }
-                catch (Exception ex)
-                {
-                    Assert.Fail($"Failed to terminate process {process.ProcessName} (ID: {process.Id}): {ex.Message}");
-                }
-            }
-        }
-
        /// <summary>
        /// Starts a new exe and takes control of it.
        /// </summary>
@@ -136,36 +89,34 @@ namespace Microsoft.PowerToys.UITest
        {
            var opts = new AppiumOptions();
            opts.AddAdditionalCapability("app", appPath);
-            this.Driver = NewWindowsDriver(opts);
+            Console.WriteLine($"appPath: {appPath}");
+            this.Driver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), opts);
+
+            // Set default timeout to 5 seconds
+            this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
        }

        /// <summary>
-        /// Starts a new exe and takes control of it.
+        /// Exit a exe.
        /// </summary>
-        /// <param name="info">The path to the application executable.</param>
-        private WindowsDriver<WindowsElement> NewWindowsDriver(AppiumOptions info)
+        /// <param name="path">The path to the application executable.</param>
+        public void ExitExe(string path)
        {
-            // Create driver with retry
-            var timeout = TimeSpan.FromMinutes(2);
-            var retryInterval = TimeSpan.FromSeconds(5);
-            DateTime startTime = DateTime.Now;
+            // Exit Exe
+            string exeName = Path.GetFileNameWithoutExtension(path);

-            while (true)
+            // PowerToys.FancyZonesEditor
+            Process[] processes = Process.GetProcessesByName(exeName);
+            foreach (Process process in processes)
            {
                try
                {
-                    var res = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), info);
-                    return res;
+                    process.Kill();
+                    process.WaitForExit(); // Optional: Wait for the process to exit
                }
-                catch (Exception)
+                catch (Exception ex)
                {
-                    if (DateTime.Now - startTime > timeout)
-                    {
-                        throw;
-                    }
-
-                    Task.Delay(retryInterval).Wait();
-                    CheckWinAppDriverAndRoot();
+                    Assert.Fail($"Failed to terminate process {process.ProcessName} (ID: {process.Id}): {ex.Message}");
                }
            }
        }
@@ -183,31 +134,16 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        public void RestartScopeExe()
        {
-            ExitScopeExe();
+            ExitExe(sessionPath);
            StartExe(locationPath + sessionPath);
        }

-        public WindowsDriver<WindowsElement> GetRoot()
-        {
-            return SessionHelper.root!;
-        }
+        public WindowsDriver<WindowsElement> GetRoot() => this.Root;

        public WindowsDriver<WindowsElement> GetDriver()
        {
            Assert.IsNotNull(this.Driver, $"Failed to get driver. Driver is null.");
            return this.Driver;
        }
-
-        private void StartWindowsAppDriverApp()
-        {
-            var winAppDriverProcessInfo = new ProcessStartInfo
-            {
-                FileName = "C:\\Program Files (x86)\\Windows Application Driver\\WinAppDriver.exe",
-                Verb = "runas",
-            };
-
-            this.ExitExe(winAppDriverProcessInfo.FileName);
-            SessionHelper.appDriver = Process.Start(winAppDriverProcessInfo);
-        }
    }
 }
--- a/src/common/UITestAutomation/UITestAutomation.csproj
+++ b/src/common/UITestAutomation/UITestAutomation.csproj
@@ -8,9 +8,6 @@
    <Nullable>enable</Nullable>
    <PublishAot>true</PublishAot>
    <InvariantGlobalization>true</InvariantGlobalization>
-    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <PublishTrimmed>false</PublishTrimmed>
  </PropertyGroup>

  <ItemGroup>
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -6,16 +6,10 @@ using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
-using Windows.Devices.Display.Core;
-using Windows.Foundation.Metadata;
-using static Microsoft.PowerToys.UITest.UITestBase.NativeMethods;
-using static Microsoft.PowerToys.UITest.WindowHelper;

 namespace Microsoft.PowerToys.UITest
 {
@@ -23,37 +17,19 @@ namespace Microsoft.PowerToys.UITest
    /// Base class that should be inherited by all Test Classes.
    /// </summary>
    [TestClass]
-    public class UITestBase : IDisposable
+    public class UITestBase
    {
-        public required TestContext TestContext { get; set; }
+        public Session Session { get; set; }

-        public required Session Session { get; set; }
-
-        public bool IsInPipeline { get; }
-
-        public static MonitorInfoData.ParamsWrapper MonitorInfoData { get; set; } = new MonitorInfoData.ParamsWrapper() { Monitors = new List<MonitorInfoData.MonitorInfoDataWrapper>() };
+        private readonly SessionHelper sessionHelper;

        private readonly PowerToysModule scope;
-        private readonly WindowSize size;
-        private SessionHelper? sessionHelper;
-        private System.Threading.Timer? screenshotTimer;
-        private string? screenshotDirectory;

-        public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings, WindowSize size = WindowSize.UnSpecified)
+        public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings)
        {
-            this.IsInPipeline = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("platform"));
-            Console.WriteLine($"Running tests on platform: {Environment.GetEnvironmentVariable("platform")}");
-            if (IsInPipeline)
-            {
-                NativeMethods.ChangeDisplayResolution(1920, 1080);
-                NativeMethods.GetMonitorInfo();
-
-                // Escape Popups before starting
-                System.Windows.Forms.SendKeys.SendWait("{ESC}");
-            }
-
            this.scope = scope;
-            this.size = size;
+            this.sessionHelper = new SessionHelper(scope).Init();
+            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
        }

        /// <summary>
@@ -62,22 +38,6 @@ namespace Microsoft.PowerToys.UITest
        [TestInitialize]
        public void TestInit()
        {
-            CloseOtherApplications();
-            if (IsInPipeline)
-            {
-                screenshotDirectory = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "UITestScreenshots_" + Guid.NewGuid().ToString());
-                Directory.CreateDirectory(screenshotDirectory);
-
-                // Take screenshot every 1 second
-                screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, screenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
-
-                // Escape Popups before starting
-                System.Windows.Forms.SendKeys.SendWait("{ESC}");
-            }
-
-            this.sessionHelper = new SessionHelper(scope).Init();
-            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver(), scope, size);
-
            if (this.scope == PowerToysModule.PowerToysSettings)
            {
                // close Debug warning dialog if any
@@ -90,32 +50,12 @@ namespace Microsoft.PowerToys.UITest
        }

        /// <summary>
-        /// Cleanups the test.
+        /// UnInitializes the test.
        /// </summary>
        [TestCleanup]
-        public void TestCleanup()
+        public void TestClean()
        {
-            if (IsInPipeline)
-            {
-                screenshotTimer?.Change(Timeout.Infinite, Timeout.Infinite);
-                Dispose();
-                if (TestContext.CurrentTestOutcome is UnitTestOutcome.Failed
-                    or UnitTestOutcome.Error
-                    or UnitTestOutcome.Unknown)
-                {
-                    Task.Delay(1000).Wait();
-                    AddScreenShotsToTestResultsDirectory();
-                }
-            }
-
-            this.Session.Cleanup();
-            this.sessionHelper!.Cleanup();
-        }
-
-        public void Dispose()
-        {
-            screenshotTimer?.Dispose();
-            GC.SuppressFinalize(this);
+            this.sessionHelper.Cleanup();
        }

        /// <summary>
@@ -124,143 +64,47 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        protected T Find<T>(By by, int timeoutMS = 5000, bool global = false)
+        protected T Find<T>(By by, int timeoutMS = 3000)
            where T : Element, new()
        {
-            return this.Session.Find<T>(by, timeoutMS, global);
+            return this.Session.Find<T>(by, timeoutMS);
        }

        /// <summary>
-        /// Shortcut for this.Session.Find<Element>(name, timeoutMS)
+        /// Shortcut for this.Session.Find<Element>(By.Name(name), timeoutMS)
        /// </summary>
        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        protected T Find<T>(string name, int timeoutMS = 5000, bool global = false)
+        protected T Find<T>(string name, int timeoutMS = 3000)
            where T : Element, new()
        {
-            return this.Session.Find<T>(By.Name(name), timeoutMS, global);
+            return this.Session.Find<T>(By.Name(name), timeoutMS);
        }

        /// <summary>
        /// Shortcut for this.Session.Find<Element>(by, timeoutMS)
        /// </summary>
        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        protected Element Find(By by, int timeoutMS = 5000, bool global = false)
+        protected Element Find(By by, int timeoutMS = 3000)
        {
-            return this.Session.Find(by, timeoutMS, global);
+            return this.Session.Find(by, timeoutMS);
        }

        /// <summary>
-        /// Shortcut for this.Session.Find<Element>(name, timeoutMS)
+        /// Shortcut for this.Session.Find<Element>(By.Name(name), timeoutMS)
        /// </summary>
        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>The found element.</returns>
-        protected Element Find(string name, int timeoutMS = 5000, bool global = false)
+        protected Element Find(string name, int timeoutMS = 3000)
        {
-            return this.Session.Find(name, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Has only one Element or its derived class by selector.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(By by, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.FindAll<T>(by, timeoutMS, global).Count == 1;
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.HasOne<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(By by, int timeoutMS = 5000, bool global = false)
-        {
-            return this.Session.HasOne<Element>(by, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.HasOne<T>(name, timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(string name, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.Session.HasOne<T>(By.Name(name), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.HasOne<Element>(name, timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(string name, int timeoutMS = 5000, bool global = false)
-        {
-            return this.Session.HasOne<Element>(name, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.Has<T>(by, timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(By by, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.Session.FindAll<T>(by, timeoutMS, global).Count >= 1;
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.Has<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(By by, int timeoutMS = 5000, bool global = false)
-        {
-            return this.Session.Has<Element>(by, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.Has<T>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(string name, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return this.Session.Has<T>(By.Name(name), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.Has<Element>(name, timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(string name, int timeoutMS = 5000, bool global = false)
-        {
-            return this.Session.Has<Element>(name, timeoutMS, global);
+            return this.Session.Find(name, timeoutMS);
        }

        /// <summary>
@@ -269,12 +113,12 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000, bool global = false)
+        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
            where T : Element, new()
        {
-            return this.Session.FindAll<T>(by, timeoutMS, global);
+            return this.Session.FindAll<T>(by, timeoutMS);
        }

        /// <summary>
@@ -283,12 +127,12 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
        /// <param name="name">The name of the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000, bool global = false)
+        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
            where T : Element, new()
        {
-            return this.Session.FindAll<T>(By.Name(name), timeoutMS, global);
+            return this.Session.FindAll<T>(By.Name(name), timeoutMS);
        }

        /// <summary>
@@ -296,11 +140,11 @@ namespace Microsoft.PowerToys.UITest
        /// Shortcut for this.Session.FindAll<Element>(by, timeoutMS)
        /// </summary>
        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000, bool global = false)
+        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
        {
-            return this.Session.FindAll<Element>(by, timeoutMS, global);
+            return this.Session.FindAll<Element>(by, timeoutMS);
        }

        /// <summary>
@@ -308,137 +152,11 @@ namespace Microsoft.PowerToys.UITest
        /// Shortcut for this.Session.FindAll<Element>(By.Name(name), timeoutMS)
        /// </summary>
        /// <param name="name">The name of the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
+        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000, bool global = false)
+        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
        {
-            return this.Session.FindAll<Element>(By.Name(name), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Scrolls the page
-        /// </summary>
-        /// <param name="scrollCount">The number of scroll attempts.</param>
-        /// <param name="direction">The direction to scroll.</param>
-        /// <param name="msPreAction">Pre-action delay in milliseconds.</param>
-        /// <param name="msPostAction">Post-action delay in milliseconds.</param>
-        public void Scroll(int scrollCount = 5, string direction = "Up", int msPreAction = 500, int msPostAction = 500)
-        {
-            MouseActionType mouseAction = direction == "Up" ? MouseActionType.ScrollUp : MouseActionType.ScrollDown;
-            for (int i = 0; i < scrollCount; i++)
-            {
-                Session.PerformMouseAction(mouseAction, msPreAction, msPostAction); // Ensure settings are visible
-            }
-        }
-
-        /// <summary>
-        /// Captures the last screenshot when the test fails.
-        /// </summary>
-        protected void CaptureLastScreenshot()
-        {
-            // Implement your screenshot capture logic here
-            // For example, save a screenshot to a file and return the file path
-            string screenshotPath = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "last_screenshot.png");
-
-            this.Session.Root.GetScreenshot().SaveAsFile(screenshotPath, ScreenshotImageFormat.Png);
-
-            // Save screenshot to screenshotPath & upload to test attachment
-            this.TestContext.AddResultFile(screenshotPath);
-        }
-
-        /// <summary>
-        /// Retrieves the color of the pixel at the specified screen coordinates.
-        /// </summary>
-        /// <param name="x">The X coordinate on the screen.</param>
-        /// <param name="y">The Y coordinate on the screen.</param>
-        /// <returns>The color of the pixel at the specified coordinates.</returns>
-        public Color GetPixelColor(int x, int y)
-        {
-            return WindowHelper.GetPixelColor(x, y);
-        }
-
-        /// <summary>
-        /// Retrieves the color of the pixel at the specified screen coordinates as a string.
-        /// </summary>
-        /// <param name="x">The X coordinate on the screen.</param>
-        /// <param name="y">The Y coordinate on the screen.</param>
-        /// <returns>The color of the pixel at the specified coordinates.</returns>
-        public string GetPixelColorString(int x, int y)
-        {
-            return WindowHelper.GetPixelColorString(x, y);
-        }
-
-        /// <summary>
-        /// Gets the size of the display.
-        /// </summary>
-        /// <returns>
-        /// A tuple containing the width and height of the display.
-        /// </returns
-        public Tuple<int, int> GetDisplaySize()
-        {
-            return WindowHelper.GetDisplaySize();
-        }
-
-        /// <summary>
-        /// Sends a combination of keys.
-        /// </summary>
-        /// <param name="keys">The keys to send.</param>
-        public void SendKeys(params Key[] keys)
-        {
-            this.Session.SendKeys(keys);
-        }
-
-        /// <summary>
-        /// Sends a sequence of keys.
-        /// </summary>
-        /// <param name="keys">An array of keys to send.</param>
-        public void SendKeySequence(params Key[] keys)
-        {
-            this.Session.SendKeySequence(keys);
-        }
-
-        /// <summary>
-        /// Gets the current position of the mouse cursor as a tuple.
-        /// </summary>
-        /// <returns>A tuple containing the X and Y coordinates of the cursor.</returns>
-        public Tuple<int, int> GetMousePosition()
-        {
-            return this.Session.GetMousePosition();
-        }
-
-        /// <summary>
-        /// Gets the screen center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public (int CenterX, int CenterY) GetScreenCenter()
-        {
-            return WindowHelper.GetScreenCenter();
-        }
-
-        public bool IsWindowOpen(string windowName)
-        {
-            return WindowHelper.IsWindowOpen(windowName);
-        }
-
-        /// <summary>
-        /// Moves the mouse cursor to the specified screen coordinates.
-        /// </summary>
-        /// <param name="x">The new x-coordinate of the cursor.</param>
-        /// <param name="y">The new y-coordinate of the cursor.</param
-        public void MoveMouseTo(int x, int y)
-        {
-            this.Session.MoveMouseTo(x, y);
-        }
-
-        protected void AddScreenShotsToTestResultsDirectory()
-        {
-            if (screenshotDirectory != null)
-            {
-                foreach (string file in Directory.GetFiles(screenshotDirectory))
-                {
-                    this.TestContext.AddResultFile(file);
-                }
-            }
+            return this.Session.FindAll<Element>(By.Name(name), timeoutMS);
        }

        /// <summary>
@@ -446,8 +164,8 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        public void RestartScopeExe()
        {
-            this.sessionHelper!.RestartScopeExe();
-            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver(), this.scope, this.size);
+            this.sessionHelper.RestartScopeExe();
+            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
            return;
        }

@@ -456,194 +174,8 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        public void ExitScopeExe()
        {
-            this.sessionHelper!.ExitScopeExe();
+            this.sessionHelper.ExitScopeExe();
            return;
        }
-
-        private void CloseOtherApplications()
-        {
-            // Close other applications
-            var processNamesToClose = new List<string>
-            {
-                "PowerToys",
-                "PowerToys.Settings",
-                "PowerToys.FancyZonesEditor",
-            };
-            foreach (var processName in processNamesToClose)
-            {
-                foreach (var process in Process.GetProcessesByName(processName))
-                {
-                    process.Kill();
-                    process.WaitForExit();
-                }
-            }
-        }
-
-        public class NativeMethods
-        {
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-            public struct DISPLAY_DEVICE
-            {
-                public int cb;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-                public string DeviceName;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-                public string DeviceString;
-                public int StateFlags;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-                public string DeviceID;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-                public string DeviceKey;
-            }
-
-            [DllImport("user32.dll")]
-            private static extern int EnumDisplaySettings(IntPtr deviceName, int modeNum, ref DEVMODE devMode);
-
-            [DllImport("user32.dll")]
-            private static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
-
-            [DllImport("user32.dll", CharSet = CharSet.Ansi)]
-            private static extern bool EnumDisplayDevices(IntPtr lpDevice, int iDevNum, ref DISPLAY_DEVICE lpDisplayDevice, int dwFlags);
-
-            [DllImport("user32.dll")]
-            private static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
-
-            [DllImport("user32.dll", CharSet = CharSet.Ansi)]
-            private static extern int ChangeDisplaySettingsEx(IntPtr lpszDeviceName, ref DEVMODE lpDevMode, IntPtr hwnd, uint dwflags, IntPtr lParam);
-
-            private const int DM_PELSWIDTH = 0x80000;
-            private const int DM_PELSHEIGHT = 0x100000;
-
-            public const int ENUM_CURRENT_SETTINGS = -1;
-            public const int CDS_TEST = 0x00000002;
-            public const int CDS_UPDATEREGISTRY = 0x01;
-            public const int DISP_CHANGE_SUCCESSFUL = 0;
-            public const int DISP_CHANGE_RESTART = 1;
-            public const int DISP_CHANGE_FAILED = -1;
-
-            [StructLayout(LayoutKind.Sequential)]
-            public struct DEVMODE
-            {
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-                public string DmDeviceName;
-                public short DmSpecVersion;
-                public short DmDriverVersion;
-                public short DmSize;
-                public short DmDriverExtra;
-                public int DmFields;
-                public int DmPositionX;
-                public int DmPositionY;
-                public int DmDisplayOrientation;
-                public int DmDisplayFixedOutput;
-                public short DmColor;
-                public short DmDuplex;
-                public short DmYResolution;
-                public short DmTTOption;
-                public short DmCollate;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-                public string DmFormName;
-                public short DmLogPixels;
-                public int DmBitsPerPel;
-                public int DmPelsWidth;
-                public int DmPelsHeight;
-                public int DmDisplayFlags;
-                public int DmDisplayFrequency;
-                public int DmICMMethod;
-                public int DmICMIntent;
-                public int DmMediaType;
-                public int DmDitherType;
-                public int DmReserved1;
-                public int DmReserved2;
-                public int DmPanningWidth;
-                public int DmPanningHeight;
-            }
-
-            public static void GetMonitorInfo()
-            {
-                int deviceIndex = 0;
-                DISPLAY_DEVICE d = default(DISPLAY_DEVICE);
-                d.cb = Marshal.SizeOf(d);
-
-                Console.WriteLine("monitor list :");
-                while (EnumDisplayDevices(IntPtr.Zero, deviceIndex, ref d, 0))
-                {
-                    Console.WriteLine($"monitor {deviceIndex + 1}:");
-                    Console.WriteLine($"  name: {d.DeviceName}");
-                    Console.WriteLine($"  string: {d.DeviceString}");
-                    Console.WriteLine($"  ID: {d.DeviceID}");
-                    Console.WriteLine($"  key: {d.DeviceKey}");
-                    Console.WriteLine();
-
-                    DEVMODE dm = default(DEVMODE);
-                    dm.DmSize = (short)Marshal.SizeOf<DEVMODE>();
-                    int modeNum = 0;
-                    while (EnumDisplaySettings(d.DeviceName, modeNum, ref dm) > 0)
-                    {
-                        MonitorInfoData.Monitors.Add(new MonitorInfoData.MonitorInfoDataWrapper()
-                        {
-                            DeviceName = d.DeviceName,
-                            DeviceString = d.DeviceString,
-                            DeviceID = d.DeviceID,
-                            DeviceKey = d.DeviceKey,
-                            PelsWidth = dm.DmPelsWidth,
-                            PelsHeight = dm.DmPelsHeight,
-                            DisplayFrequency = dm.DmDisplayFrequency,
-                        });
-                        Console.WriteLine($"  mode {modeNum}: {dm.DmPelsWidth}x{dm.DmPelsHeight} @ {dm.DmDisplayFrequency}Hz");
-                        modeNum++;
-                    }
-
-                    deviceIndex++;
-                    d.cb = Marshal.SizeOf(d); // Reset the size for the next device
-                }
-            }
-
-            public static void ChangeDisplayResolution(int PelsWidth, int PelsHeight)
-            {
-                Screen screen = Screen.PrimaryScreen!;
-                if (screen.Bounds.Width == PelsWidth && screen.Bounds.Height == PelsHeight)
-                {
-                    return;
-                }
-
-                DEVMODE devMode = default(DEVMODE);
-                devMode.DmDeviceName = new string(new char[32]);
-                devMode.DmFormName = new string(new char[32]);
-                devMode.DmSize = (short)Marshal.SizeOf<DEVMODE>();
-
-                int modeNum = 0;
-                while (EnumDisplaySettings(IntPtr.Zero, modeNum, ref devMode) > 0)
-                {
-                    Console.WriteLine($"Mode {modeNum}: {devMode.DmPelsWidth}x{devMode.DmPelsHeight} @ {devMode.DmDisplayFrequency}Hz");
-                    modeNum++;
-                }
-
-                devMode.DmPelsWidth = PelsWidth;
-                devMode.DmPelsHeight = PelsHeight;
-
-                int result = NativeMethods.ChangeDisplaySettings(ref devMode, NativeMethods.CDS_TEST);
-
-                if (result == DISP_CHANGE_SUCCESSFUL)
-                {
-                    result = ChangeDisplaySettings(ref devMode, CDS_UPDATEREGISTRY);
-                    if (result == DISP_CHANGE_SUCCESSFUL)
-                    {
-                        Console.WriteLine($"Changing display resolution to {devMode.DmPelsWidth}x{devMode.DmPelsHeight}");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Failed to change display resolution. Error code: {result}");
-                    }
-                }
-                else if (result == DISP_CHANGE_RESTART)
-                {
-                    Console.WriteLine($"Changing display resolution to {devMode.DmPelsWidth}x{devMode.DmPelsHeight} requires a restart");
-                }
-                else
-                {
-                    Console.WriteLine($"Failed to change display resolution. Error code: {result}");
-                }
-            }
-        }
    }
 }
--- a/src/common/UITestAutomation/VisualAssert.cs
+++ b/src/common/UITestAutomation/VisualAssert.cs
@@ -1,160 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.PowerToys.UITest
-{
-    public static class VisualAssert
-    {
-        /// <summary>
-        /// Asserts current visual state of the element is equal with base line image.
-        /// To use this VisualAssert, you need to set Window Theme to Light-Mode to avoid Theme color difference in baseline image.
-        /// Such limitation could be removed either Auto-generate baseline image for both Light & Dark mode
-        /// </summary>
-        /// <param name="testContext">TestContext object</param>
-        /// <param name="element">Element object</param>
-        /// <param name="scenarioSubname">additional scenario name if two or more scenarios in one test</param>
-        [RequiresUnreferencedCode("This method uses reflection which may not be compatible with trimming.")]
-        public static void AreEqual(TestContext? testContext, Element element, string scenarioSubname = "")
-        {
-            var pipelinePlatform = Environment.GetEnvironmentVariable("platform");
-
-            // Perform visual validation only in the pipeline
-            if (string.IsNullOrEmpty(pipelinePlatform))
-            {
-                Console.WriteLine("Skip visual validation in the local run.");
-                return;
-            }
-
-            if (element == null)
-            {
-                Assert.Fail("Element object is null or invalid");
-            }
-
-            var stackTrace = new StackTrace();
-            var callerFrame = stackTrace.GetFrame(1);
-            var callerMethod = callerFrame?.GetMethod();
-
-            var callerName = callerMethod?.Name;
-            var callerClassName = callerMethod?.DeclaringType?.Name;
-
-            if (string.IsNullOrEmpty(callerName) || string.IsNullOrEmpty(callerClassName))
-            {
-                Assert.Fail("Unable to determine the caller method and class name.");
-            }
-
-            if (string.IsNullOrWhiteSpace(scenarioSubname))
-            {
-                scenarioSubname = string.Join("_", callerClassName, callerName, pipelinePlatform);
-            }
-            else
-            {
-                scenarioSubname = string.Join("_", callerClassName, callerName, scenarioSubname.Trim(), pipelinePlatform);
-            }
-
-            var baselineImageResourceName = callerMethod!.DeclaringType!.Assembly.GetManifestResourceNames().Where(name => name.Contains(scenarioSubname)).FirstOrDefault();
-
-            var tempTestImagePath = GetTempFilePath(scenarioSubname, "test", ".png");
-
-            element.SaveToPngFile(tempTestImagePath);
-
-            if (string.IsNullOrEmpty(baselineImageResourceName)
-                || !Path.GetFileNameWithoutExtension(baselineImageResourceName).EndsWith(scenarioSubname))
-            {
-                testContext?.AddResultFile(tempTestImagePath);
-                Assert.Fail($"Baseline image for scenario {scenarioSubname} can't be found, test image saved in file://{tempTestImagePath.Replace('\\', '/')}");
-            }
-
-            var tempBaselineImagePath = GetTempFilePath(scenarioSubname, "baseline", Path.GetExtension(baselineImageResourceName));
-
-            bool isSame = false;
-
-            using (var stream = callerMethod!.DeclaringType!.Assembly.GetManifestResourceStream(baselineImageResourceName))
-            {
-                if (stream == null)
-                {
-                    Assert.Fail($"Resource stream '{baselineImageResourceName}' is null.");
-                }
-
-                using (var baselineImage = new Bitmap(stream))
-                {
-                    using (var testImage = new Bitmap(tempTestImagePath))
-                    {
-                        isSame = VisualAssert.AreEqual(baselineImage, testImage);
-
-                        if (!isSame)
-                        {
-                            // Copy baseline image to temp folder as well
-                            baselineImage.Save(tempBaselineImagePath);
-                        }
-                    }
-                }
-            }
-
-            if (!isSame)
-            {
-                if (testContext != null)
-                {
-                    testContext.AddResultFile(tempBaselineImagePath);
-                    testContext.AddResultFile(tempTestImagePath);
-                }
-
-                Assert.Fail($"Fail to validate visual result for scenario {scenarioSubname}, baseline image can be found file://{tempBaselineImagePath.Replace('\\', '/')}, and test image can be found file://{tempTestImagePath.Replace('\\', '/')}");
-            }
-        }
-
-        /// <summary>
-        /// Get temp file path
-        /// </summary>
-        /// <param name="scenario">scenario name</param>
-        /// <param name="imageType">baseline or test image</param>
-        /// <param name="extension">image file extension</param>
-        /// <returns>full temp file path</returns>
-        private static string GetTempFilePath(string scenario, string imageType, string extension)
-        {
-            var tempFileFullName = $"{scenario}_{imageType}{extension}";
-
-            // Remove invalid filename character if any
-            Path.GetInvalidFileNameChars().ToList().ForEach(c => tempFileFullName = tempFileFullName.Replace(c, '-'));
-
-            return Path.Combine(Path.GetTempPath(), tempFileFullName);
-        }
-
-        /// <summary>
-        /// Test if two images are equal bit-by-bit
-        /// </summary>
-        /// <param name="baselineImage">baseline image</param>
-        /// <param name="testImage">test image</param>
-        /// <returns>true if are equal,otherwise false</returns>
-        private static bool AreEqual(Bitmap baselineImage, Bitmap testImage)
-        {
-            if (baselineImage.Width != testImage.Width || baselineImage.Height != testImage.Height)
-            {
-                return false;
-            }
-
-            // WinAppDriver sometimes adds a border to the screenshot (around 2 pix width), and it is not always consistent.
-            // So we exclude the border when comparing the images, and usually it is the edge of the windows, won't affect the comparison.
-            int excludeBorderWidth = 5, excludeBorderHeight = 5;
-
-            for (int x = excludeBorderWidth; x < baselineImage.Width - excludeBorderWidth; x++)
-            {
-                for (int y = excludeBorderHeight; y < baselineImage.Height - excludeBorderHeight; y++)
-                {
-                    if (!VisualHelper.PixIsSame(baselineImage.GetPixel(x, y), testImage.GetPixel(x, y)))
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-    }
-}
--- a/src/common/UITestAutomation/VisualHelper.cs
+++ b/src/common/UITestAutomation/VisualHelper.cs
@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.PowerToys.UITest
-{
-    internal static class VisualHelper
-    {
-        /// <summary>
-        /// Compare two pixels with a fuzz factor
-        /// </summary>
-        /// <param name="c1">base color</param>
-        /// <param name="c2">test color</param>
-        /// <param name="fuzz">fuzz factor, default is 10</param>
-        /// <returns>true if same, otherwise is false</returns>
-        public static bool PixIsSame(Color c1, Color c2, int fuzz = 10)
-        {
-            return Math.Abs(c1.A - c2.A) <= fuzz && Math.Abs(c1.R - c2.R) <= fuzz && Math.Abs(c1.G - c2.G) <= fuzz && Math.Abs(c1.B - c2.B) <= fuzz;
-        }
-    }
-}
--- a/src/common/UITestAutomation/WindowHelper.cs
+++ b/src/common/UITestAutomation/WindowHelper.cs
@@ -1,331 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.PowerToys.UITest
-{
-    internal static class WindowHelper
-    {
-        internal const string AdministratorPrefix = "Administrator: ";
-
-        /// <summary>
-        /// Sets the main window size.
-        /// </summary>
-        /// <param name="size">WindowSize enum</param>
-        public static void SetWindowSize(IntPtr windowHandler, WindowSize size)
-        {
-            if (size == WindowSize.UnSpecified)
-            {
-                return;
-            }
-
-            int width = 0, height = 0;
-
-            switch (size)
-            {
-                case WindowSize.Small:
-                    width = 640;
-                    height = 480;
-                    break;
-                case WindowSize.Small_Vertical:
-                    width = 480;
-                    height = 640;
-                    break;
-                case WindowSize.Medium:
-                    width = 1024;
-                    height = 768;
-                    break;
-                case WindowSize.Medium_Vertical:
-                    width = 768;
-                    height = 1024;
-                    break;
-                case WindowSize.Large:
-                    width = 1920;
-                    height = 1080;
-                    break;
-                case WindowSize.Large_Vertical:
-                    width = 1080;
-                    height = 1920;
-                    break;
-            }
-
-            if (width > 0 && height > 0)
-            {
-                WindowHelper.SetMainWindowSize(windowHandler, width, height);
-            }
-        }
-
-        /// <summary>
-        /// Gets the main window center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public static (int CenterX, int CenterY) GetWindowCenter(IntPtr windowHandler)
-        {
-            if (windowHandler == IntPtr.Zero)
-            {
-                return (0, 0);
-            }
-            else
-            {
-                var rect = ApiHelper.GetWindowCenter(windowHandler);
-                return (rect.CenterX, rect.CenterY);
-            }
-        }
-
-        /// <summary>
-        /// Gets the main window center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public static (int Left, int Top, int Right, int Bottom) GetWindowRect(IntPtr windowHandler)
-        {
-            if (windowHandler == IntPtr.Zero)
-            {
-                return (0, 0, 0, 0);
-            }
-            else
-            {
-                var rect = ApiHelper.GetWindowRect(windowHandler);
-                return (rect.Left, rect.Top, rect.Right, rect.Bottom);
-            }
-        }
-
-        /// <summary>
-        /// Gets the screen center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public static (int CenterX, int CenterY) GetScreenCenter()
-        {
-            return ApiHelper.GetScreenCenter();
-        }
-
-        /// <summary>
-        /// Sets the main window size based on Width and Height.
-        /// </summary>
-        /// <param name="width">the width in pixel</param>
-        /// <param name="height">the height in pixel</param>
-        public static void SetMainWindowSize(IntPtr windowHandler, int width, int height)
-        {
-            if (windowHandler == IntPtr.Zero
-                || width <= 0
-                || height <= 0)
-            {
-                return;
-            }
-
-            ApiHelper.SetWindowPos(windowHandler, IntPtr.Zero, 0, 0, width, height, ApiHelper.SetWindowPosNoZorder | ApiHelper.SetWindowPosShowWindow);
-
-            // Wait for 1000ms after resize
-            Task.Delay(1000).Wait();
-        }
-
-        /// <summary>
-        /// Retrieves the color of the pixel at the specified screen coordinates.
-        /// </summary>
-        /// <param name="x">The X coordinate on the screen.</param>
-        /// <param name="y">The Y coordinate on the screen.</param>
-        /// <returns>The color of the pixel at the specified coordinates.</returns>
-        public static Color GetPixelColor(int x, int y)
-        {
-            IntPtr hdc = ApiHelper.GetDC(IntPtr.Zero);
-            uint pixel = ApiHelper.GetPixel(hdc, x, y);
-            _ = ApiHelper.ReleaseDC(IntPtr.Zero, hdc);
-
-            int r = (int)(pixel & 0x000000FF);
-            int g = (int)((pixel & 0x0000FF00) >> 8);
-            int b = (int)((pixel & 0x00FF0000) >> 16);
-
-            return Color.FromArgb(r, g, b);
-        }
-
-        /// <summary>
-        /// Retrieves the color of the pixel at the specified screen coordinates as a string.
-        /// </summary>
-        /// <param name="x">The X coordinate on the screen.</param>
-        /// <param name="y">The Y coordinate on the screen.</param>
-        /// <returns>The color of the pixel at the specified coordinates.</returns>
-        public static string GetPixelColorString(int x, int y)
-        {
-            Color color = WindowHelper.GetPixelColor(x, y);
-            return $"#{color.R:X2}{color.G:X2}{color.B:X2}";
-        }
-
-        /// <summary>
-        /// Gets the size of the display.
-        /// </summary>
-        /// <returns>
-        /// A tuple containing the width and height of the display.
-        /// </returns
-        public static Tuple<int, int> GetDisplaySize()
-        {
-            IntPtr hdc = ApiHelper.GetDC(IntPtr.Zero);
-            int screenWidth = ApiHelper.GetDeviceCaps(hdc, ApiHelper.DESKTOPHORZRES);
-            int screenHeight = ApiHelper.GetDeviceCaps(hdc, ApiHelper.DESKTOPVERTRES);
-            _ = ApiHelper.ReleaseDC(IntPtr.Zero, hdc);
-
-            return Tuple.Create(screenWidth, screenHeight);
-        }
-
-        public static bool IsWindowOpen(string windowName)
-        {
-            var matchingWindows = ApiHelper.FindDesktopWindowHandler([windowName, AdministratorPrefix + windowName]);
-            return matchingWindows.Count > 0;
-        }
-
-        internal static class ApiHelper
-        {
-            [DllImport("user32.dll")]
-            public static extern bool SetForegroundWindow(IntPtr hWnd);
-
-            public const uint SetWindowPosNoMove = 0x0002;
-            public const uint SetWindowPosNoZorder = 0x0004;
-            public const uint SetWindowPosShowWindow = 0x0040;
-
-            [DllImport("user32.dll", SetLastError = true)]
-            public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags);
-
-            // Delegate for the EnumWindows callback function
-            private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
-
-            // P/Invoke declaration for EnumWindows
-            [DllImport("user32.dll")]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
-
-            // P/Invoke declaration for GetWindowTextLength
-            [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-            private static extern int GetWindowTextLength(IntPtr hWnd);
-
-            // P/Invoke declaration for GetWindowText
-            [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-            private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-
-            [DllImport("user32.dll")]
-            public static extern IntPtr GetDC(IntPtr hWnd);
-
-            [DllImport("gdi32.dll")]
-            public static extern uint GetPixel(IntPtr hdc, int x, int y);
-
-            [DllImport("gdi32.dll")]
-            public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
-
-            public const int DESKTOPHORZRES = 118;
-            public const int DESKTOPVERTRES = 117;
-
-            [DllImport("user32.dll")]
-            public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-            // Define the Win32 RECT structure
-            [StructLayout(LayoutKind.Sequential)]
-            public struct RECT
-            {
-                public int Left;    // X coordinate of the left edge of the window
-                public int Top;     // Y coordinate of the top edge of the window
-                public int Right;   // X coordinate of the right edge of the window
-                public int Bottom;  // Y coordinate of the bottom edge of the window
-            }
-
-            // Import GetWindowRect API to retrieve window's screen coordinates
-            [DllImport("user32.dll")]
-            public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-            public static List<(IntPtr HWnd, string Title)> FindDesktopWindowHandler(string[] matchingWindowsTitles)
-            {
-                var windows = new List<(IntPtr HWnd, string Title)>();
-
-                _ = EnumWindows(
-                    (hWnd, lParam) =>
-                    {
-                        int length = GetWindowTextLength(hWnd);
-                        if (length > 0)
-                        {
-                            var builder = new StringBuilder(length + 1);
-                            _ = GetWindowText(hWnd, builder, builder.Capacity);
-
-                            var title = builder.ToString();
-                            if (matchingWindowsTitles.Contains(title))
-                            {
-                                windows.Add((hWnd, title));
-                            }
-                        }
-
-                        return true; // Continue enumeration
-                    },
-                    IntPtr.Zero);
-
-                return windows;
-            }
-
-            /// <summary>
-            /// Get the center point coordinates of a specified window (in screen coordinates)
-            /// </summary>
-            /// <param name="hWnd">The window handle</param>
-            /// <returns>The center point (x, y)</returns>
-            public static (int CenterX, int CenterY) GetWindowCenter(IntPtr hWnd)
-            {
-                if (hWnd == IntPtr.Zero)
-                {
-                    throw new ArgumentException("Invalid window handle");
-                }
-
-                if (GetWindowRect(hWnd, out RECT rect))
-                {
-                    int width = rect.Right - rect.Left;
-                    int height = rect.Bottom - rect.Top;
-
-                    int centerX = rect.Left + (width / 2);
-                    int centerY = rect.Top + (height / 2);
-
-                    return (centerX, centerY);
-                }
-                else
-                {
-                    throw new InvalidOperationException("Failed to retrieve window coordinates");
-                }
-            }
-
-            public static (int Left, int Top, int Right, int Bottom) GetWindowRect(IntPtr hWnd)
-            {
-                if (hWnd == IntPtr.Zero)
-                {
-                    throw new ArgumentException("Invalid window handle");
-                }
-
-                if (GetWindowRect(hWnd, out RECT rect))
-                {
-                    return (rect.Left, rect.Top, rect.Right, rect.Bottom);
-                }
-                else
-                {
-                    throw new InvalidOperationException("Failed to retrieve window coordinates");
-                }
-            }
-
-            [DllImport("user32.dll")]
-            public static extern int GetSystemMetrics(int nIndex);
-
-            public enum SystemMetric
-            {
-                ScreenWidth = 0,            // Width of the primary screen in pixels (SM_CXSCREEN)
-                ScreenHeight = 1,           // Height of the primary screen in pixels (SM_CYSCREEN)
-                VirtualScreenWidth = 78,    // Width of the virtual screen that includes all monitors (SM_CXVIRTUALSCREEN)
-                VirtualScreenHeight = 79,   // Height of the virtual screen that includes all monitors (SM_CYVIRTUALSCREEN)
-                MonitorCount = 80,          // Number of display monitors (SM_CMONITORS, available on Windows XP+)
-            }
-
-            public static (int CenterX, int CenterY) GetScreenCenter()
-            {
-                int width = GetSystemMetrics((int)SystemMetric.ScreenWidth);
-                int height = GetSystemMetrics((int)SystemMetric.ScreenHeight);
-
-                return (width / 2, height / 2);
-            }
-        }
-    }
-}
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/app.manifest
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/app.manifest
@@ -9,7 +9,7 @@
           2) System < Windows 10 Anniversary Update
      -->
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
    </windowsSettings>
  </application>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
--- a/src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/OneFuzzConfig.json
+++ b/src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/OneFuzzConfig.json
@@ -16,7 +16,7 @@
        // project, where bugs will be filed 
        "org": "microsoft",
        "project": "OS",
-        "AssignedTo": "PowerToys@microsoft.com",
+        "AssignedTo": "leilzh@microsoft.com",
        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
        "IterationPath": "OS\\Future"
      },
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemClicked.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemClicked.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteClipboardItemClicked : EventBase, IEvent
    {
        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemDeletedEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemDeletedEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteClipboardItemDeletedEvent : EventBase, IEvent
    {
        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomFormatOutputThumbUpDownEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomFormatOutputThumbUpDownEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteCustomFormatOutputThumbUpDownEvent : EventBase, IEvent
    {
        public bool PositiveFeedback { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteFormatClickedEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteFormatClickedEvent.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
@@ -11,7 +11,6 @@ using Microsoft.PowerToys.Telemetry.Events;
 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteFormatClickedEvent : EventBase, IEvent
    {
        public PasteFormats PasteFormat { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomErrorEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomErrorEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteGenerateCustomErrorEvent : EventBase, IEvent
    {
        public string Error { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomFormatEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomFormatEvent.cs
@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;

 using Microsoft.PowerToys.Telemetry;
@@ -11,7 +10,6 @@ using Microsoft.PowerToys.Telemetry.Events;
 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteGenerateCustomFormatEvent : EventBase, IEvent
    {
        public int PromptTokens { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteInAppKeyboardShortcutEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteInAppKeyboardShortcutEvent.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
@@ -11,7 +11,6 @@ using Microsoft.PowerToys.Telemetry.Events;
 namespace AdvancedPaste.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class AdvancedPasteInAppKeyboardShortcutEvent : EventBase, IEvent
    {
        public PasteFormats PasteFormat { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelErrorEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelErrorEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace AdvancedPaste.Telemetry;

 [EventData]
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
 public class AdvancedPasteSemanticKernelErrorEvent(string error) : EventBase, IEvent
 {
    public string Error { get; set; } = error;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.

 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
 using System.Linq;
+
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
@@ -13,7 +13,6 @@ using Microsoft.PowerToys.Telemetry.Events;
 namespace AdvancedPaste.Telemetry;

 [EventData]
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
 public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string actionChain) : EventBase, IEvent
 {
    public static string FormatActionChain(IEnumerable<ActionChainItem> actionChain) => FormatActionChain(actionChain.Select(item => item.Format));
--- a/src/modules/AdvancedPaste/AdvancedPaste/app.manifest
+++ b/src/modules/AdvancedPaste/AdvancedPaste/app.manifest
@@ -16,7 +16,7 @@
           1) Per-Monitor for >= Windows 10 Anniversary Update
           2) System < Windows 10 Anniversary Update
           -->
-			<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+			<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
 		</windowsSettings>
 	</application>
 </assembly>
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -10,7 +10,7 @@
    <ProjectGuid>{f5e1146e-b7b3-4e11-85fd-270a500bd78c}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>CropAndLock</RootNamespace>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.26100.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -154,9 +154,6 @@
    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\Themes\Themes.vcxproj">
-      <Project>{98537082-0fdb-40de-abd8-0dc5a4269bab}</Project>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <Import Project="..\..\..\..\deps\spdlog.props" />
--- a/src/modules/CropAndLock/CropAndLock/main.cpp
+++ b/src/modules/CropAndLock/CropAndLock/main.cpp
@@ -17,9 +17,6 @@

 #include <common/Telemetry/EtwTrace/EtwTrace.h>

-#include <common/Themes/theme_helpers.h>
-#include <common/Themes/theme_listener.h>
-
 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")

 namespace winrt
@@ -38,23 +35,6 @@ namespace util
 const std::wstring instanceMutexName = L"Local\\PowerToys_CropAndLock_InstanceMutex";
 bool m_running = true;

-// Theming
-ThemeListener theme_listener{};
-// Keep a list of our cropped windows
-std::vector<std::shared_ptr<CropAndLockWindow>> croppedWindows;
-
-void handleTheme()
-{
-    auto theme = theme_listener.AppTheme;
-    auto isDark = theme == Theme::Dark;
-    Logger::info(L"Theme is now {}", isDark ? L"Dark" : L"Light");
-    for (auto&& croppedWindow : croppedWindows)
-    {
-        ThemeHelpers::SetImmersiveDarkMode(croppedWindow->Handle(), isDark);
-    }
-}
-
-
 int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _In_ int)
 {
    // Initialize COM
@@ -62,8 +42,6 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I

    Trace::CropAndLock::RegisterProvider();

-    theme_listener.AddChangedHandler(handleTheme);
-
    Shared::Trace::ETWTrace trace;
    trace.UpdateState(true);

@@ -129,6 +107,8 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
    // Create our overlay window
    std::unique_ptr<OverlayWindow> overlayWindow;

+    // Keep a list of our cropped windows
+    std::vector<std::shared_ptr<CropAndLockWindow>> croppedWindows;

    // Handles and thread for the events sent from runner
    HANDLE m_reparent_event_handle;
@@ -187,7 +167,6 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
            croppedWindow->CropAndLock(targetWindow, cropRect);
            croppedWindow->OnClosed(removeWindowCallback);
            croppedWindows.push_back(croppedWindow);
-            handleTheme();
        };

        overlayWindow.reset();
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesOpenedEvent.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesOpenedEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace EnvironmentVariables.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class EnvironmentVariablesOpenedEvent : EventBase, IEvent
    {
        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesProfileEnabledEvent.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesProfileEnabledEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace EnvironmentVariables.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class EnvironmentVariablesProfileEnabledEvent : EventBase, IEvent
    {
        public bool Enabled { get; set; }
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesVariableChangedEvent.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesVariableChangedEvent.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using EnvironmentVariablesUILib.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
@@ -11,7 +11,6 @@ using Microsoft.PowerToys.Telemetry.Events;
 namespace EnvironmentVariables.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class EnvironmentVariablesVariableChangedEvent : EventBase, IEvent
    {
        public VariablesSetType VariablesType { get; set; }
--- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>
--- a/src/modules/FileLocksmith/FileLocksmithUI/app.manifest
+++ b/src/modules/FileLocksmith/FileLocksmithUI/app.manifest
@@ -9,7 +9,7 @@
           2) System < Windows 10 Anniversary Update
      -->
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
    </windowsSettings>
  </application>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
--- a/src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj
+++ b/src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj
@@ -6,7 +6,6 @@
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<DefineConstants>TESTONLY</DefineConstants>
 	</PropertyGroup>
 	
 	<PropertyGroup>
--- a/src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json
+++ b/src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json
@@ -16,11 +16,11 @@
        // project, where bugs will be filed 
        "org": "microsoft",
        "project": "OS",
-        "AssignedTo": "PowerToys@microsoft.com",
+        "AssignedTo": "mengyuanchen@microsoft.com",
        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
        "IterationPath": "OS\\Future"
      },
-      "jobNotificationEmail": "PowerToys@microsoft.com",
+      "jobNotificationEmail": "mengyuanchen@microsoft.com",
      "skip": false,
      "rebootAfterSetup": false,
      "oneFuzzJobs": [
@@ -57,11 +57,11 @@
        // project, where bugs will be filed 
        "org": "microsoft",
        "project": "OS",
-        "AssignedTo": "PowerToys@microsoft.com",
+        "AssignedTo": "mengyuanchen@microsoft.com",
        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
        "IterationPath": "OS\\Future"
      },
-      "jobNotificationEmail": "PowerToys@microsoft.com",
+      "jobNotificationEmail": "mengyuanchen@microsoft.com",
      "skip": false,
      "rebootAfterSetup": false,
      "oneFuzzJobs": [
@@ -98,11 +98,11 @@
        // project, where bugs will be filed 
        "org": "microsoft",
        "project": "OS",
-        "AssignedTo": "PowerToys@microsoft.com",
+        "AssignedTo": "mengyuanchen@microsoft.com",
        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
        "IterationPath": "OS\\Future"
      },
-      "jobNotificationEmail": "PowerToys@microsoft.com",
+      "jobNotificationEmail": "mengyuanchen@microsoft.com",
      "skip": false,
      "rebootAfterSetup": false,
      "oneFuzzJobs": [
@@ -139,7 +139,7 @@
        // project, where bugs will be filed 
        "org": "microsoft",
        "project": "OS",
-        "AssignedTo": "PowerToys@microsoft.com",
+        "AssignedTo": "mengyuanchen@microsoft.com",
        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
        "IterationPath": "OS\\Future"
      },
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestAddingEntry_arm64.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestAddingEntry_arm64.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestAddingEntry_x64Win10.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestAddingEntry_x64Win10.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestAddingEntry_x64Win11.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestAddingEntry_x64Win11.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_EmptyView_arm64.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_EmptyView_arm64.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_EmptyView_x64Win10.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_EmptyView_x64Win10.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_EmptyView_x64Win11.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_EmptyView_x64Win11.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_NonEmptyView_arm64.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_NonEmptyView_arm64.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_NonEmptyView_x64Win10.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_NonEmptyView_x64Win10.png
--- a/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_NonEmptyView_x64Win11.png
+++ b/src/modules/Hosts/Hosts.UITests/Baseline/HostModuleTests_TestEmptyView_NonEmptyView_x64Win11.png
--- a/src/modules/Hosts/Hosts.UITests/HostModuleTests.cs
+++ b/src/modules/Hosts/Hosts.UITests/HostModuleTests.cs
@@ -13,7 +13,7 @@ namespace Hosts.UITests
    public class HostModuleTests : UITestBase
    {
        public HostModuleTests()
-            : base(PowerToysModule.Hosts, WindowSize.Small_Vertical)
+            : base(PowerToysModule.Hosts)
        {
        }

@@ -31,17 +31,14 @@ namespace Hosts.UITests
        /// </item>
        /// </list>
        /// </summary>
-        [TestMethod("Hosts.Basic.EmptyViewShouldWork")]
-        [TestCategory("Hosts File Editor #4")]
+        [TestMethod]
        public void TestEmptyView()
        {
            this.CloseWarningDialog();
            this.RemoveAllEntries();

            // 'Add an entry' button (only show-up when list is empty) should be visible
-            Assert.IsTrue(this.HasOne<HyperlinkButton>("Add an entry"), "'Add an entry' button should be visible in the empty view");
-
-            VisualAssert.AreEqual(this.TestContext, this.Find("Entries"), "EmptyView");
+            Assert.IsTrue(this.FindAll<HyperlinkButton>("Add an entry").Count == 1, "'Add an entry' button should be visible in the empty view");

            // Click 'Add an entry' from empty-view for adding Host override rule
            this.Find<HyperlinkButton>("Add an entry").Click();
@@ -49,10 +46,8 @@ namespace Hosts.UITests
            this.AddEntry("192.168.0.1", "localhost", false, false);

            // Should have one row now and not more empty view
-            Assert.IsTrue(this.Has<Button>("Delete"), "Should have one row now");
-            Assert.IsFalse(this.Has<HyperlinkButton>("Add an entry"), "'Add an entry' button should be invisible if not empty view");
-
-            VisualAssert.AreEqual(this.TestContext, this.Find("Entries"), "NonEmptyView");
+            Assert.IsTrue(this.FindAll<Button>("Delete").Count == 1, "Should have one row now");
+            Assert.IsTrue(this.FindAll<HyperlinkButton>("Add an entry").Count == 0, "'Add an entry' button should be invisible if not empty view");
        }

        /// <summary>
@@ -63,20 +58,17 @@ namespace Hosts.UITests
        /// </item>
        /// </list>
        /// </summary>
-        [TestMethod("Hosts.Basic.AddEntryButtonShouldWork")]
-        [TestCategory("Hosts File Editor #4")]
+        [TestMethod]
        public void TestAddingEntry()
        {
            this.CloseWarningDialog();
            this.RemoveAllEntries();

-            Assert.IsFalse(this.Has<Button>("Delete"), "Should have no row after removing all");
+            Assert.IsTrue(this.FindAll<Button>("Delete").Count == 0, "Should have no row after removing all");

            this.AddEntry("192.168.0.1", "localhost", true);

-            Assert.IsTrue(this.Has<Button>("Delete"), "Should have one row now");
-
-            VisualAssert.AreEqual(this.TestContext, this.Find("Entries"));
+            Assert.IsTrue(this.FindAll<Button>("Delete").Count == 1, "Should have one row now");
        }

        /// <summary>
@@ -90,8 +82,7 @@ namespace Hosts.UITests
        /// </item>
        /// </list>
        /// </summary>
-        [TestMethod("Hosts.Basic.CanNotAddMoreThenNighHosts")]
-        [TestCategory("Hosts File Editor #5")]
+        [TestMethod]
        public void TestTooManyHosts()
        {
            this.CloseWarningDialog();
@@ -125,48 +116,18 @@ namespace Hosts.UITests
        /// </item>
        /// </list>
        /// </summary>
-        [TestMethod("Hosts.Basic.ErrorMessageShowupIfNotRunAsAdmin")]
-        [TestCategory("Hosts File Editor #8")]
+        [TestMethod]
        public void TestErrorMessageWithNonAdminPermission()
        {
-            if (this.Session.IsElevated == false)
-            {
-                this.CloseWarningDialog();
-                this.RemoveAllEntries();
+            this.CloseWarningDialog();
+            this.RemoveAllEntries();

-                // Add new URL override and a warning tip should be shown
-                this.AddEntry("192.168.0.1", "localhost", true);
+            // Add new URL override and a warning tip should be shown
+            this.AddEntry("192.168.0.1", "localhost", true);

-                Assert.IsTrue(
-                    this.FindAll<TextBlock>("The hosts file cannot be saved because the program isn't running as administrator.").Count == 1,
-                    "Should display host-file saving error if not run as administrator");
-            }
-        }
-
-        /// <summary>
-        /// Test No Error-message in the Hosts-File-Editor
-        /// <list type="bullet">
-        /// <item>
-        /// <description>Validating error message should be shown if not run as admin.</description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        [TestMethod("Hosts.Basic.NoErrorMessageShowupIfRunAsAdmin")]
-        [TestCategory("Hosts File Editor #8")]
-        public void TestNoErrorMessageWithNonAdminPermission()
-        {
-            if (this.Session.IsElevated == true)
-            {
-                this.CloseWarningDialog();
-                this.RemoveAllEntries();
-
-                // Add new URL override and a warning tip should be shown
-                this.AddEntry("192.168.0.1", "localhost", true);
-
-                Assert.IsFalse(
-                    this.FindAll<TextBlock>("The hosts file cannot be saved because the program isn't running as administrator.").Count > 0,
-                    "Should display host-file saving error if not run as administrator");
-            }
+            Assert.IsTrue(
+                this.FindAll<TextBlock>("The hosts file cannot be saved because the program isn't running as administrator.").Count == 1,
+                "Should display host-file saving error if not run as administrator");
        }

        /// <summary>
@@ -183,8 +144,7 @@ namespace Hosts.UITests
        /// </item>
        /// </list>
        /// </summary>
-        [TestMethod("Hosts.Basic.FiltersControlShouldWork")]
-        [TestCategory("Hosts File Editor #6")]
+        [TestMethod]
        public void TestFilterControl()
        {
            this.CloseWarningDialog();
@@ -252,7 +212,7 @@ namespace Hosts.UITests

            // Close-filter-panel
            this.Find<Button>("Filters").Click();
-            Assert.IsFalse(this.FindAll<Button>("Clear filters").Count == 1, "Filter panel should be closed after clicking Filter Button");
+            Assert.IsFalse(this.FindAll<Button>("Clear filters").Count == 1, "Filter panel should be closed afer click Filter Button");
        }

        private void AddEntry(string ip, string host, bool active = true, bool clickAddEntryButton = true)
@@ -283,25 +243,25 @@ namespace Hosts.UITests
        private void CloseWarningDialog()
        {
            // Find 'Accept' button which come in 'Warning' dialog
-            if (this.FindAll("Warning", 1000).Count > 0 &&
-                this.FindAll<Button>("Accept", 1000).Count > 0)
+            if (this.FindAll("Warning").Count > 0 &&
+                this.FindAll<Button>("Accept").Count > 0)
            {
                // Hide Warning dialog if any
-                this.Find<Button>("Accept", 1000).Click();
+                this.Find<Button>("Accept").Click();
            }
        }

        private void RemoveAllEntries()
        {
            // Delete all existing host-override rules
-            foreach (var deleteBtn in this.FindAll<Button>("Delete", 1000))
+            foreach (var deleteBtn in this.FindAll<Button>("Delete"))
            {
                deleteBtn.Click();
-                this.Find<Button>("Yes", 1000).Click();
+                this.Find<Button>("Yes").Click();
            }

            // Should have no row left, and no more delete button
-            Assert.IsTrue(this.FindAll<Button>("Delete", 1000).Count == 0);
+            Assert.IsTrue(this.FindAll<Button>("Delete").Count == 0);
        }
    }
 }
--- a/src/modules/Hosts/Hosts.UITests/Hosts.UITests.csproj
+++ b/src/modules/Hosts/Hosts.UITests/Hosts.UITests.csproj
@@ -17,17 +17,6 @@
    <PropertyGroup>
      <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\Hosts.UITests\</OutputPath>
    </PropertyGroup>
-    <ItemGroup>
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_arm64.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_arm64.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_arm64.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_x64Win10.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_x64Win10.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_x64Win10.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_x64Win11.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_x64Win11.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_x64Win11.png" />
-    </ItemGroup>

    <ItemGroup>
      <PackageReference Include="MSTest" />
--- a/src/modules/Hosts/Hosts.UITests/HostsSettingTests.cs
+++ b/src/modules/Hosts/Hosts.UITests/HostsSettingTests.cs
@@ -12,11 +12,6 @@ namespace Hosts.UITests
    [TestClass]
    public class HostsSettingTests : UITestBase
    {
-        public HostsSettingTests()
-        : base(PowerToysModule.PowerToysSettings, WindowSize.Medium)
-        {
-        }
-
        /// <summary>
        /// Test Warning Dialog at startup
        /// <list type="bullet">
@@ -34,9 +29,7 @@ namespace Hosts.UITests
        /// </item>
        /// </list>
        /// </summary>
-        [TestMethod("Hosts.Settings.ShowWarningDialogIfRunAsAdmin")]
-        [TestCategory("Hosts File Editor #1")]
-        [TestCategory("Hosts File Editor #9")]
+        [TestMethod]
        public void TestWarningDialog()
        {
            this.LaunchFromSetting(showWarning: true);
@@ -58,7 +51,10 @@ namespace Hosts.UITests

            this.Find<Button>("Launch Hosts File Editor").Click();

-            this.Session.Attach(PowerToysModule.Hosts, WindowSize.Small_Vertical);
+            // wait for 500 ms to make sure Hosts File Editor is launched
+            Task.Delay(500).Wait();
+
+            this.Session.Attach(PowerToysModule.Hosts);

            // Should show warning dialog
            Assert.IsTrue(this.FindAll("Warning").Count > 0, "Should show warning dialog");
@@ -72,7 +68,7 @@ namespace Hosts.UITests
            Assert.IsFalse(this.IsHostsFileEditorClosed(), "Hosts File Editor should NOT be closed after click Accept button in Warning Dialog");

            // Close Hosts File Editor window
-            this.Session.CloseMainWindow();
+            this.Session.Find<Window>("Hosts File Editor").Close();

            // Restore back to PowerToysSettings Session
            this.Session.Attach(PowerToysModule.PowerToysSettings);
@@ -86,7 +82,7 @@ namespace Hosts.UITests
            Assert.IsFalse(this.IsHostsFileEditorClosed(), "Hosts File Editor should NOT be closed");

            // Close Hosts File Editor window
-            this.Session.CloseMainWindow();
+            this.Session.Find<Window>("Hosts File Editor").Close();

            // Restore back to PowerToysSettings Session
            this.Session.Attach(PowerToysModule.PowerToysSettings);
@@ -94,9 +90,14 @@ namespace Hosts.UITests

        private bool IsHostsFileEditorClosed()
        {
-            if (this.Session.FindAll<Window>("Hosts File Editor").Count == 0 && this.Session.FindAll<Window>("Administrator: Hosts File Editor").Count == 0)
+            try
            {
-                return true;
+                this.Session.FindAll<Window>("Hosts File Editor");
+            }
+            catch (Exception ex)
+            {
+                // Validate if editor window closed by checking exception.Message
+                return ex.Message.Contains("Currently selected window has been closed");
            }

            return false;
@@ -120,7 +121,7 @@ namespace Hosts.UITests
            // launch Hosts File Editor
            this.Find<Button>("Launch Hosts File Editor").Click();

-            Task.Delay(2000).Wait();
+            Task.Delay(500).Wait();

            this.Session.Attach(PowerToysModule.Hosts);
        }
--- a/src/modules/Hosts/Hosts/Telemetry/HostEditorStartEvent.cs
+++ b/src/modules/Hosts/Hosts/Telemetry/HostEditorStartEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace HostsEditor.Telemetry;

 [EventData]
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
 public class HostEditorStartEvent() : EventBase, IEvent
 {
    public long TimeStamp { get; set; }
--- a/src/modules/Hosts/Hosts/Telemetry/HostEditorStartFinishEvent.cs
+++ b/src/modules/Hosts/Hosts/Telemetry/HostEditorStartFinishEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace HostsEditor.Telemetry;

 [EventData]
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
 public class HostEditorStartFinishEvent() : EventBase, IEvent
 {
    public long TimeStamp { get; set; }
--- a/src/modules/Hosts/Hosts/Telemetry/HostsFileEditorOpenedEvent.cs
+++ b/src/modules/Hosts/Hosts/Telemetry/HostsFileEditorOpenedEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace Hosts.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class HostsFileEditorOpenedEvent : EventBase, IEvent
    {
        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
--- a/src/modules/Hosts/Hosts/app.manifest
+++ b/src/modules/Hosts/Hosts/app.manifest
@@ -10,7 +10,7 @@
           2) System < Windows 10 Anniversary Update
      -->
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
    </windowsSettings>
  </application>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
--- a/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
+++ b/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
@@ -611,7 +611,6 @@
        <ContentDialog
            x:Name="EntryDialog"
            x:Uid="EntryDialog"
-            x:DataType="models:Entry"
            IsPrimaryButtonEnabled="{Binding Valid, Mode=OneWay}"
            Loaded="ContentDialog_Loaded_ApplyMargin"
            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
--- a/src/modules/Hosts/HostsUILib/HostsMainPage.xaml.cs
+++ b/src/modules/Hosts/HostsUILib/HostsMainPage.xaml.cs
@@ -139,23 +139,10 @@ namespace HostsUILib.Views
                dialog.XamlRoot = XamlRoot;
                dialog.Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style;
                dialog.Title = resourceLoader.GetString("WarningDialog_Title");
-                dialog.Content = new StackPanel
+                dialog.Content = new TextBlock
                {
-                    Children =
-                    {
-                        new TextBlock
-                        {
-                            Text = resourceLoader.GetString("WarningDialog_Text"),
-                            TextWrapping = TextWrapping.Wrap,
-                        },
-                        new HyperlinkButton
-                        {
-                            Content = resourceLoader.GetString("WarningDialog_LearnMore"),
-                            NavigateUri = new Uri("https://aka.ms/PowerToysOverview_HostsFileEditor"),
-                            Padding = new Thickness(0),
-                            Margin = new Thickness(0, 5, 0, 5),
-                        },
-                    },
+                    Text = resourceLoader.GetString("WarningDialog_Text"),
+                    TextWrapping = TextWrapping.Wrap,
                };
                dialog.PrimaryButtonText = resourceLoader.GetString("WarningDialog_AcceptBtn");
                dialog.PrimaryButtonStyle = Application.Current.Resources["AccentButtonStyle"] as Style;
--- a/src/modules/Hosts/HostsUILib/Models/Entry.cs
+++ b/src/modules/Hosts/HostsUILib/Models/Entry.cs
@@ -11,9 +11,6 @@ using HostsUILib.Helpers;

 namespace HostsUILib.Models
 {
-#if !TESTONLY
-    [Microsoft.UI.Xaml.Data.Bindable]
-#endif
    public partial class Entry : ObservableObject
    {
        private static readonly char[] _spaceCharacters = new char[] { ' ', '\t' };
--- a/src/modules/Hosts/HostsUILib/Strings/en-us/Resources.resw
+++ b/src/modules/Hosts/HostsUILib/Strings/en-us/Resources.resw
@@ -331,9 +331,6 @@
  <data name="WarningDialog_Title" xml:space="preserve">
    <value>Warning</value>
  </data>
-  <data name="WarningDialog_LearnMore" xml:space="preserve">
-    <value>Learn more</value>
-  </data>
  <data name="WindowAdminTitle" xml:space="preserve">
    <value>Administrator: Hosts File Editor</value>
    <comment>Title of the window when running as administrator. "Hosts File Editor" is the name of the utility. "Hosts" refers to the system hosts file, do not loc</comment>
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
    <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -139,7 +139,7 @@
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
  </ImportGroup>
@@ -150,8 +150,8 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
--- a/src/modules/MeasureTool/MeasureToolCore/app.manifest
+++ b/src/modules/MeasureTool/MeasureToolCore/app.manifest
@@ -9,7 +9,7 @@
           2) System < Windows 10 Anniversary Update
      -->
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
    </windowsSettings>
  </application>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4188" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
 </packages>
--- a/src/modules/MeasureTool/MeasureToolUI/app.manifest
+++ b/src/modules/MeasureTool/MeasureToolUI/app.manifest
@@ -9,7 +9,7 @@
           2) System < Windows 10 Anniversary Update
      -->
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
    </windowsSettings>
  </application>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
--- a/src/modules/MouseUtils/MouseJumpUI/Telemetry/MouseJumpShowEvent.cs
+++ b/src/modules/MouseUtils/MouseJumpUI/Telemetry/MouseJumpShowEvent.cs
@@ -2,15 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

 namespace MouseJumpUI.Telemetry
 {
    [EventData]
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
    public class MouseJumpShowEvent : EventBase, IEvent
    {
        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
--- a/Show More
+++ b/Show More