common: refactor common library pt2 (#8588)

- remove common lib - split settings, remove common-md - move ipc interop/kb_layout to interop - rename core -> settings, settings -> old_settings - os-detect header-only; interop -> PowerToysInterop - split notifications, move single-use headers where they're used - winstore lib - rename com utils - rename Updating and Telemetry projects - rename core -> settings-ui and remove examples folder - rename settings-ui folder + consisent common/version include
2026-04-04 10:16:24 +02:00 · 2020-12-15 15:16:09 +03:00
parent cddf48547d
commit 212ea2de30
588 changed files with 3304 additions and 3328 deletions
--- a/src/common/COMUtils/COMUtils.cpp
+++ b/src/common/COMUtils/COMUtils.cpp
@@ -1,11 +1,29 @@
-#include "pch.h"
+#include "comUtils.h"

+#include <Windows.h>
+#pragma warning(push)
+#pragma warning(disable : 4067)
 #include <Sddl.h>
+#pragma warning(pop)

+#include <memory>
 #include <wil/resource.h>

-#include "comUtils.h"
-#include "common.h"
+// Helper class for various COM-related APIs, e.g working with security descriptors
+template<typename T>
+struct typed_storage
+{
+    std::unique_ptr<char[]> _buffer;
+    inline explicit typed_storage(const DWORD size) :
+        _buffer{ std::make_unique<char[]>(size) }
+    {
+    }
+    
+    inline operator T*()
+    {
+        return reinterpret_cast<T*>(_buffer.get());
+    }
+};

 bool initializeCOMSecurity(const wchar_t* securityDescriptor)
 {
@@ -64,4 +82,4 @@ bool initializeCOMSecurity(const wchar_t* securityDescriptor)
        nullptr,
        EOAC_DYNAMIC_CLOAKING | EOAC_DISABLE_AAA,
        nullptr));
-}
+}
--- a/src/common/COMUtils/COMUtils.h
+++ b/src/common/COMUtils/COMUtils.h
--- a/src/common/COMUtils/COMUtils.vcxproj
+++ b/src/common/COMUtils/COMUtils.vcxproj
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{7319089E-46D6-4400-BC65-E39BDF1416EE}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>COMUtils</RootNamespace>
+    <ProjectName>COMUtils</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="comUtils.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="comUtils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+  </ImportGroup>
+  <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>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+  </Target>
+</Project>
--- a/src/common/common-md-flag/packages.config
+++ b/src/common/common-md-flag/packages.config
--- a/src/common/Display/Display.vcxproj
+++ b/src/common/Display/Display.vcxproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{CABA8DFB-823B-4BF2-93AC-3F31984150D9}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Display</RootNamespace>
+    <ProjectName>Display</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+    <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="monitors.h" />
+    <ClInclude Include="dpi_aware.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="monitors.cpp" />
+    <ClCompile Include="dpi_aware.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
--- a/src/common/Display/dpi_aware.cpp
+++ b/src/common/Display/dpi_aware.cpp
@@ -1,7 +1,9 @@
-#include "pch.h"
 #include "dpi_aware.h"
 #include "monitors.h"
 #include <ShellScalingApi.h>
+#include <array>
+
+#pragma comment(lib, "shcore.lib")

 namespace DPIAware
 {
--- a/src/common/Display/dpi_aware.h
+++ b/src/common/Display/dpi_aware.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "windef.h"

-#pragma comment(lib, "shcore.lib")
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>

 namespace DPIAware
 {
--- a/src/common/Display/monitors.cpp
+++ b/src/common/Display/monitors.cpp
@@ -1,11 +1,10 @@
-#include "pch.h"
-
 #include "monitors.h"

-#include "common.h"
+#include <algorithm>

 namespace
 {
+    // TODO: use compare
    bool operator<(const RECT& lhs, const RECT& rhs)
    {
        auto lhs_tuple = std::make_tuple(lhs.left, lhs.right, lhs.top, lhs.bottom);
--- a/src/common/Display/monitors.h
+++ b/src/common/Display/monitors.h
--- a/src/common/ManagedCommon/ManagedCommon.csproj
+++ b/src/common/ManagedCommon/ManagedCommon.csproj
@@ -33,7 +33,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\ManagedTelemetry\Telemetry\Telemetry.csproj" />
+    <ProjectReference Include="..\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
  </ItemGroup>
  <ItemGroup>
    <AdditionalFiles Include="..\..\codeAnalysis\StyleCop.json">
--- a/src/common/ManagedTelemetry/Telemetry/ManagedTelemetry.csproj
+++ b/src/common/ManagedTelemetry/Telemetry/ManagedTelemetry.csproj
@@ -1,40 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\Version.props" />
-  <PropertyGroup>
-    <Platforms>x64</Platforms>
-    <PlatformTarget>x64</PlatformTarget>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>$(Version).0</Version>
-    <Authors>Microsoft Corporation</Authors>
-    <Product>PowerToys</Product>
-    <Description>PowerToys Telemetry</Description>
-    <Copyright>Copyright (C) 2020 Microsoft Corporation</Copyright>
-    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
-    <RepositoryType>Github</RepositoryType>
-    <PackageTags>PowerToys</PackageTags>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\..\codeAnalysis\StyleCop.json">
-      <Link>StyleCop.json</Link>
-    </AdditionalFiles>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.118</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs">
-      <Link>GlobalSuppressions.cs</Link>
-    </Compile>
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\Version.props" />
+  <PropertyGroup>
+    <Platforms>x64</Platforms>
+    <PlatformTarget>x64</PlatformTarget>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>$(Version).0</Version>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
+    <Description>PowerToys Telemetry</Description>
+    <Copyright>Copyright (C) 2020 Microsoft Corporation</Copyright>
+    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
+    <RepositoryType>Github</RepositoryType>
+    <PackageTags>PowerToys</PackageTags>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\Telemetry\TelemetryBase.cs" Link="TelemetryBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\..\codeAnalysis\StyleCop.json">
+      <Link>StyleCop.json</Link>
+    </AdditionalFiles>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers">
+      <Version>1.1.118</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs">
+      <Link>GlobalSuppressions.cs</Link>
+    </Compile>
+  </ItemGroup>
+</Project>
--- a/src/common/RcResource.cpp
+++ b/src/common/RcResource.cpp
@@ -1,40 +0,0 @@
-#include "pch.h"
-#include "RcResource.h"
-
-#include <fstream>
-
-std::optional<RcResource> RcResource::create(int resource_id, const std::wstring_view resource_class)
-{
-    const HRSRC resHandle = FindResourceW(nullptr, MAKEINTRESOURCEW(resource_id), resource_class.data());
-    if (!resHandle)
-    {
-        return std::nullopt;
-    }
-    const HGLOBAL memHandle = LoadResource(nullptr, resHandle);
-    if (!memHandle)
-    {
-        return std::nullopt;
-    }
-    const size_t resSize = SizeofResource(nullptr, resHandle);
-    if (!resSize)
-    {
-        return std::nullopt;
-    }
-    auto res = static_cast<const std::byte*>(LockResource(memHandle));
-    if (!res)
-    {
-        return std::nullopt;
-    }
-    return RcResource{ res, resSize };
-}
-
-bool RcResource::saveAsFile(const std::filesystem::path destination)
-{
-    std::fstream installerFile{ destination, std::ios_base::binary | std::ios_base::out | std::ios_base::trunc };
-    if (!installerFile.is_open())
-    {
-        return false;
-    }
-    installerFile.write(reinterpret_cast<const char*>(_memory), _size);
-    return true;
-}
--- a/src/common/RcResource.h
+++ b/src/common/RcResource.h
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <string_view>
-#include <optional>
-#include <filesystem>
-
-class RcResource
-{
-public:
-    const std::byte* _memory = nullptr;
-    size_t _size = 0;
-
-    static std::optional<RcResource> create(int resource_id, const std::wstring_view resource_class);
-    bool saveAsFile(const std::filesystem::path destination);
-
-private:
-    RcResource() = delete;
-    RcResource(const std::byte* memory, size_t size) :
-        _memory{ memory }, _size{ size }
-    {
-    }
-};
--- a/src/common/RestartManagement.cpp
+++ b/src/common/RestartManagement.cpp
@@ -1,37 +0,0 @@
-#include "pch.h"
-#include "RestartManagement.h"
-
-#include <RestartManager.h>
-#include <Psapi.h>
-
-#include "processApi.h"
-
-void RestartProcess(const std::wstring& processName)
-{
-    DWORD sessionHandle{};
-    WCHAR sessionKey[CCH_RM_SESSION_KEY + 1];
-    if (RmStartSession(&sessionHandle, 0, sessionKey) != ERROR_SUCCESS)
-    {
-        return;
-    }
-    auto processHandles = getProcessHandlesByName(processName, PROCESS_QUERY_INFORMATION);
-    std::vector<RM_UNIQUE_PROCESS> pInfo;
-    for (const auto& hProcess : processHandles)
-    {
-        FILETIME creationTime{};
-        FILETIME _{};
-        if (GetProcessTimes(hProcess.get(), &creationTime, &_, &_, &_))
-        {
-            pInfo.emplace_back(RM_UNIQUE_PROCESS{ GetProcessId(hProcess.get()), creationTime });
-        }
-    }
-
-    if (pInfo.empty() ||
-        RmRegisterResources(sessionHandle, 0, nullptr, sizeof(pInfo), pInfo.data(), 0, nullptr) != ERROR_SUCCESS)
-    {
-        return;
-    }
-    RmShutdown(sessionHandle, RmForceShutdown, nullptr);
-    RmRestart(sessionHandle, 0, nullptr);
-    RmEndSession(sessionHandle);
-}
--- a/src/common/RestartManagement.h
+++ b/src/common/RestartManagement.h
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <string>
-
-void RestartProcess(const std::wstring& processName);
--- a/src/common/SettingsAPI/SetttingsAPI.vcxproj
+++ b/src/common/SettingsAPI/SetttingsAPI.vcxproj
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{6955446D-23F7-4023-9BB3-8657F904AF99}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>SetttingsAPI</RootNamespace>
+    <ProjectName>SetttingsAPI</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="settings_helpers.h" />
+    <ClInclude Include="settings_objects.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="settings_helpers.cpp" />
+    <ClCompile Include="settings_objects.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>  
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <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>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
--- a/src/common/SettingsAPI/pch.cpp
+++ b/src/common/SettingsAPI/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
--- a/src/common/SettingsAPI/pch.h
+++ b/src/common/SettingsAPI/pch.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <winrt/base.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <Windows.h>
+
+#include <filesystem>
+#include <fstream>
+
--- a/src/common/SettingsAPI/settings_helpers.cpp
+++ b/src/common/SettingsAPI/settings_helpers.cpp
@@ -1,7 +1,5 @@
 #include "pch.h"
 #include "settings_helpers.h"
-#include <filesystem>
-#include <fstream>

 namespace PTSettingsHelper
 {
--- a/src/common/SettingsAPI/settings_helpers.h
+++ b/src/common/SettingsAPI/settings_helpers.h
@@ -2,7 +2,7 @@
 #include <string>
 #include <Shlobj.h>

-#include "json.h"
+#include "../utils/json.h"

 namespace PTSettingsHelper
 {
--- a/src/common/SettingsAPI/settings_objects.cpp
+++ b/src/common/SettingsAPI/settings_objects.cpp
@@ -1,7 +1,6 @@
 #include "pch.h"
 #include "settings_objects.h"
 #include "settings_helpers.h"
-#include <winrt/base.h>

 namespace PowerToysSettings
 {
--- a/src/common/SettingsAPI/settings_objects.h
+++ b/src/common/SettingsAPI/settings_objects.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "json.h"
+#include "../utils/json.h"

 namespace PowerToysSettings
 {
--- a/src/common/Themes/Themes.vcxproj
+++ b/src/common/Themes/Themes.vcxproj
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{98537082-0FDB-40DE-ABD8-0DC5A4269BAB}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Themes</RootNamespace>
+    <ProjectName>Themes</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="icon_helpers.h" />
+    <ClInclude Include="windows_colors.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="icon_helpers.cpp" />
+    <ClCompile Include="windows_colors.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <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>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
--- a/src/common/Themes/icon_helpers.cpp
+++ b/src/common/Themes/icon_helpers.cpp
@@ -1,90 +1,92 @@
-#include "icon_helpers.h"
-#include "pch.h"
-
-HRESULT GetIconIndexFromPath(_In_ PCWSTR path, _Out_ int* index)
-{
-    *index = 0;
-
-    HRESULT hr = E_FAIL;
-
-    SHFILEINFO shFileInfo = { 0 };
-
-    if (!PathIsRelative(path))
-    {
-        DWORD attrib = GetFileAttributes(path);
-        HIMAGELIST himl = (HIMAGELIST)SHGetFileInfo(path, attrib, &shFileInfo, sizeof(shFileInfo), (SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_USEFILEATTRIBUTES));
-        if (himl)
-        {
-            *index = shFileInfo.iIcon;
-            // We shouldn't free the HIMAGELIST.
-            hr = S_OK;
-        }
-    }
-
-    return hr;
-}
-
-HBITMAP CreateBitmapFromIcon(_In_ HICON hIcon, _In_opt_ UINT width, _In_opt_ UINT height)
-{
-    HBITMAP hBitmapResult = NULL;
-
-    // Create compatible DC
-    HDC hDC = CreateCompatibleDC(NULL);
-    if (hDC != NULL)
-    {
-        // Get bitmap rectangle size
-        RECT rc = { 0 };
-        rc.left = 0;
-        rc.right = (width != 0) ? width : GetSystemMetrics(SM_CXSMICON);
-        rc.top = 0;
-        rc.bottom = (height != 0) ? height : GetSystemMetrics(SM_CYSMICON);
-
-        // Create bitmap compatible with DC
-        BITMAPINFO BitmapInfo;
-        ZeroMemory(&BitmapInfo, sizeof(BITMAPINFO));
-
-        BitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-        BitmapInfo.bmiHeader.biWidth = rc.right;
-        BitmapInfo.bmiHeader.biHeight = rc.bottom;
-        BitmapInfo.bmiHeader.biPlanes = 1;
-        BitmapInfo.bmiHeader.biBitCount = 32;
-        BitmapInfo.bmiHeader.biCompression = BI_RGB;
-
-        HDC hDCBitmap = GetDC(NULL);
-
-        HBITMAP hBitmap = CreateDIBSection(hDCBitmap, &BitmapInfo, DIB_RGB_COLORS, NULL, NULL, 0);
-
-        ReleaseDC(NULL, hDCBitmap);
-
-        if (hBitmap != NULL)
-        {
-            // Select bitmap into DC
-            HBITMAP hBitmapOld = (HBITMAP)SelectObject(hDC, hBitmap);
-            if (hBitmapOld != NULL)
-            {
-                // Draw icon into DC
-                if (DrawIconEx(hDC, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL))
-                {
-                    // Restore original bitmap in DC
-                    hBitmapResult = (HBITMAP)SelectObject(hDC, hBitmapOld);
-                    hBitmapOld = NULL;
-                    hBitmap = NULL;
-                }
-
-                if (hBitmapOld != NULL)
-                {
-                    SelectObject(hDC, hBitmapOld);
-                }
-            }
-
-            if (hBitmap != NULL)
-            {
-                DeleteObject(hBitmap);
-            }
-        }
-
-        DeleteDC(hDC);
-    }
-
-    return hBitmapResult;
+#include "icon_helpers.h"
+#include <shellapi.h>
+#include <shlwapi.h>
+#include <commctrl.h>
+
+HRESULT GetIconIndexFromPath(_In_ PCWSTR path, _Out_ int* index)
+{
+    *index = 0;
+
+    HRESULT hr = E_FAIL;
+
+    SHFILEINFO shFileInfo = { 0 };
+
+    if (!PathIsRelative(path))
+    {
+        DWORD attrib = GetFileAttributes(path);
+        HIMAGELIST himl = (HIMAGELIST)SHGetFileInfo(path, attrib, &shFileInfo, sizeof(shFileInfo), (SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_USEFILEATTRIBUTES));
+        if (himl)
+        {
+            *index = shFileInfo.iIcon;
+            // We shouldn't free the HIMAGELIST.
+            hr = S_OK;
+        }
+    }
+
+    return hr;
+}
+
+HBITMAP CreateBitmapFromIcon(_In_ HICON hIcon, _In_opt_ UINT width, _In_opt_ UINT height)
+{
+    HBITMAP hBitmapResult = NULL;
+
+    // Create compatible DC
+    HDC hDC = CreateCompatibleDC(NULL);
+    if (hDC != NULL)
+    {
+        // Get bitmap rectangle size
+        RECT rc = { 0 };
+        rc.left = 0;
+        rc.right = (width != 0) ? width : GetSystemMetrics(SM_CXSMICON);
+        rc.top = 0;
+        rc.bottom = (height != 0) ? height : GetSystemMetrics(SM_CYSMICON);
+
+        // Create bitmap compatible with DC
+        BITMAPINFO BitmapInfo;
+        ZeroMemory(&BitmapInfo, sizeof(BITMAPINFO));
+
+        BitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+        BitmapInfo.bmiHeader.biWidth = rc.right;
+        BitmapInfo.bmiHeader.biHeight = rc.bottom;
+        BitmapInfo.bmiHeader.biPlanes = 1;
+        BitmapInfo.bmiHeader.biBitCount = 32;
+        BitmapInfo.bmiHeader.biCompression = BI_RGB;
+
+        HDC hDCBitmap = GetDC(NULL);
+
+        HBITMAP hBitmap = CreateDIBSection(hDCBitmap, &BitmapInfo, DIB_RGB_COLORS, NULL, NULL, 0);
+
+        ReleaseDC(NULL, hDCBitmap);
+
+        if (hBitmap != NULL)
+        {
+            // Select bitmap into DC
+            HBITMAP hBitmapOld = (HBITMAP)SelectObject(hDC, hBitmap);
+            if (hBitmapOld != NULL)
+            {
+                // Draw icon into DC
+                if (DrawIconEx(hDC, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL))
+                {
+                    // Restore original bitmap in DC
+                    hBitmapResult = (HBITMAP)SelectObject(hDC, hBitmapOld);
+                    hBitmapOld = NULL;
+                    hBitmap = NULL;
+                }
+
+                if (hBitmapOld != NULL)
+                {
+                    SelectObject(hDC, hBitmapOld);
+                }
+            }
+
+            if (hBitmap != NULL)
+            {
+                DeleteObject(hBitmap);
+            }
+        }
+
+        DeleteDC(hDC);
+    }
+
+    return hBitmapResult;
 }
--- a/src/common/Themes/icon_helpers.h
+++ b/src/common/Themes/icon_helpers.h
@@ -1,5 +1,7 @@
-#pragma once
-#include "common.h"
-
-HRESULT GetIconIndexFromPath(_In_ PCWSTR path, _Out_ int* index);
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+HRESULT GetIconIndexFromPath(_In_ PCWSTR path, _Out_ int* index);
 HBITMAP CreateBitmapFromIcon(_In_ HICON hIcon, _In_opt_ UINT width = 0, _In_opt_ UINT height = 0);
--- a/src/common/notifications_winrt/packages.config
+++ b/src/common/notifications_winrt/packages.config
--- a/src/common/Themes/windows_colors.cpp
+++ b/src/common/Themes/windows_colors.cpp
@@ -1,4 +1,3 @@
-#include "pch.h"
 #include "windows_colors.h"

 DWORD WindowsColors::rgb_color(DWORD abgr_color)
--- a/src/common/Themes/windows_colors.h
+++ b/src/common/Themes/windows_colors.h
@@ -1,4 +1,6 @@
 #pragma once
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <winrt/Windows.UI.ViewManagement.h>

 struct WindowsColors
--- a/src/common/UnitTests-CommonLib/Settings.Tests.cpp
+++ b/src/common/UnitTests-CommonLib/Settings.Tests.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
-#include <settings_objects.h>
+#include <common/SettingsAPI/settings_objects.h>

-#include "VersionHelper.h"
+#include "version/helper.h"

 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 using namespace PowerToysSettings;
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "resource.h"
-#include "../version.h"
+#include "../version/version.h"

 1 VERSIONINFO
 FILEVERSION FILE_VERSION
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
@@ -9,12 +9,10 @@
    <ProjectSubType>NativeUnitTestProject</ProjectSubType>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
-
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
@@ -27,10 +25,9 @@
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
-
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\Telemetry;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\Telemetry;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -38,7 +35,6 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="UnitTestsCommon.cpp" />
    <ClCompile Include="UnitTestsVersionHelper.cpp" />
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
@@ -50,8 +46,11 @@
    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\common.vcxproj">
-      <Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project>
+    <ProjectReference Include="..\SettingsAPI\SetttingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters
@@ -24,9 +24,6 @@
    <ClCompile Include="UnitTestsVersionHelper.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="UnitTestsCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h">
--- a/src/common/UnitTests-CommonLib/UnitTestsCommon.cpp
+++ b/src/common/UnitTests-CommonLib/UnitTestsCommon.cpp
@@ -1,57 +0,0 @@
-#include "pch.h"
-#include "common.h"
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace UnitTestsCommon
-{
-    TEST_CLASS (CommonUtils)
-    {
-        std::vector<std::wstring> what_global{
-            L"TELEGRAM",
-            L"SUBLIME TEXT",
-            L"PROGRAM",
-            L"TEXT",
-        };
-
-        TEST_METHOD (FindAppNameInPathTest1)
-        {
-            std::wstring where(L"C:\\USERS\\GUEST\\APPDATA\\ROAMING\\TELEGRAM DESKTOP\\TELEGRAM.EXE");
-            bool ans = find_app_name_in_path(where, what_global);
-            Assert::IsTrue(ans);
-        }
-        TEST_METHOD (FindAppNameInPathTest2)
-        {
-            std::vector<std::wstring> what{
-                L"NOTEPAD",
-            };
-            std::wstring where(L"C:\\PROGRAM FILES\\NOTEPAD++\\NOTEPAD++.EXE");
-            bool ans = find_app_name_in_path(where, what);
-            Assert::IsTrue(ans);
-        }
-        TEST_METHOD (FindAppNameInPathTest3)
-        {
-            std::vector<std::wstring> what{
-                L"NOTEPAD++.EXE",
-            };
-            std::wstring where(L"C:\\PROGRAM FILES\\NOTEPAD++\\NOTEPAD++.EXE");
-            bool ans = find_app_name_in_path(where, what);
-            Assert::IsTrue(ans);
-        }
-        TEST_METHOD (FindAppNameInPathTest4)
-        {
-            std::wstring where(L"C:\\PROGRAM FILES\\SUBLIME TEXT 3\\SUBLIME_TEXT.EXE");
-            bool ans = find_app_name_in_path(where, what_global);
-            Assert::IsFalse(ans);
-        }
-        TEST_METHOD (FindAppNameInPathTest5)
-        {
-            std::vector<std::wstring> what{
-                L"NOTEPAD.EXE",
-            };
-            std::wstring where(L"C:\\PROGRAM FILES\\NOTEPAD++\\NOTEPAD++.EXE");
-            bool ans = find_app_name_in_path(where, what);
-            Assert::IsFalse(ans);
-        }
-    };
-}
--- a/src/common/UnitTests-CommonLib/UnitTestsVersionHelper.cpp
+++ b/src/common/UnitTests-CommonLib/UnitTestsVersionHelper.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"

-#include "VersionHelper.h"
+#include <common/version/helper.h>

 using namespace Microsoft::VisualStudio::CppUnitTestFramework;

--- a/src/common/WinStore/Winstore.vcxproj
+++ b/src/common/WinStore/Winstore.vcxproj
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{C502A854-53AC-4EBB-8DC0-E4AF2191E4F6}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>WinStore</RootNamespace>
+    <ProjectName>WinStore</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="winstore.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="winstore.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <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>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
--- a/src/common/WinStore/packages.config
+++ b/src/common/WinStore/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.200902.2" targetFramework="native" />
 </packages>
--- a/src/common/WinStore/winstore.cpp
+++ b/src/common/WinStore/winstore.cpp
@@ -1,10 +1,8 @@
-#include "pch.h"
 #include "winstore.h"

+#include <Windows.h>
 #include <appmodel.h>

-#include <winrt/Windows.ApplicationModel.h>
-
 using winrt::Windows::ApplicationModel::StartupTask;

 namespace
--- a/src/common/WinStore/winstore.h
+++ b/src/common/WinStore/winstore.h
@@ -2,6 +2,8 @@

 #include <future>

+#include <winrt/base.h>
+#include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.ApplicationModel.h>

 namespace winstore
--- a/src/common/animation.cpp
+++ b/src/common/animation.cpp
@@ -1,51 +0,0 @@
-#include "pch.h"
-#include "animation.h"
-
-Animation::Animation(double duration, double start, double stop) :
-    duration(duration), start_value(start), end_value(stop), start(std::chrono::high_resolution_clock::now()) {}
-
-void Animation::reset()
-{
-    start = std::chrono::high_resolution_clock::now();
-}
-void Animation::reset(double duration)
-{
-    this->duration = duration;
-    reset();
-}
-void Animation::reset(double duration, double start, double stop)
-{
-    start_value = start;
-    end_value = stop;
-    reset(duration);
-}
-
-static double ease_out_expo(double t)
-{
-    return 1 - pow(2, -8 * t);
-}
-
-double Animation::apply_animation_function(double t, AnimFunctions apply_function)
-{
-    switch (apply_function)
-    {
-    case EASE_OUT_EXPO:
-        return ease_out_expo(t);
-    case LINEAR:
-    default:
-        return t;
-    }
-}
-
-double Animation::value(AnimFunctions apply_function) const
-{
-    auto anim_duration = std::chrono::high_resolution_clock::now() - start;
-    double t = std::chrono::duration<double>(anim_duration).count() / duration;
-    if (t >= 1)
-        return end_value;
-    return start_value + (end_value - start_value) * apply_animation_function(t, apply_function);
-}
-bool Animation::done() const
-{
-    return std::chrono::high_resolution_clock::now() - start >= std::chrono::duration<double>(duration);
-}
--- a/src/common/animation.h
+++ b/src/common/animation.h
@@ -1,34 +0,0 @@
-#pragma once
-#include <chrono>
-
-/*
-  Usage:
-    When creating animation constructor takes one parameter - how long
-    should the animation take in seconds.
-
-    Call reset() when starting animation.
-
-    When rendering, call value() to get value from 0 to 1 - depending on animation
-    progress.
-*/
-class Animation
-{
-public:
-    enum AnimFunctions
-    {
-        LINEAR = 0,
-        EASE_OUT_EXPO
-    };
-
-    Animation(double duration = 1, double start = 0, double stop = 1);
-    void reset();
-    void reset(double duration);
-    void reset(double duration, double start, double stop);
-    double value(AnimFunctions apply_function) const;
-    bool done() const;
-
-private:
-    static double apply_animation_function(double t, AnimFunctions apply_function);
-    std::chrono::high_resolution_clock::time_point start;
-    double start_value, end_value, duration;
-};
--- a/src/common/common-md-flag/common-md-flag.vcxproj.filters
+++ b/src/common/common-md-flag/common-md-flag.vcxproj.filters
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\keyboard_layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\keyboard_layout_impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\two_way_pipe_message_ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\two_way_pipe_message_ipc_impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\os-detect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\keyboard_layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\two_way_pipe_message_ipc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\common.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\os-detect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
--- a/src/common/common.cpp
+++ b/src/common/common.cpp
@@ -1,638 +0,0 @@
-#include "pch.h"
-#include "common.h"
-#include <dwmapi.h>
-#pragma comment(lib, "dwmapi.lib")
-#include <strsafe.h>
-#include <sddl.h>
-#include "version.h"
-
-#include <wil/resource.h>
-
-#pragma comment(lib, "advapi32.lib")
-#pragma comment(lib, "shlwapi.lib")
-
-std::optional<RECT> get_window_pos(HWND hwnd)
-{
-    RECT window;
-    if (DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &window, sizeof(window)) == S_OK)
-    {
-        return window;
-    }
-    else
-    {
-        return {};
-    }
-}
-
-bool is_system_window(HWND hwnd, const char* class_name)
-{
-    // We compare the HWND against HWND of the desktop and shell windows,
-    // we also filter out some window class names know to belong to the taskbar.
-    static auto system_classes = { "SysListView32", "WorkerW", "Shell_TrayWnd", "Shell_SecondaryTrayWnd", "Progman" };
-    static auto system_hwnds = { GetDesktopWindow(), GetShellWindow() };
-    for (auto system_hwnd : system_hwnds)
-    {
-        if (hwnd == system_hwnd)
-        {
-            return true;
-        }
-    }
-    for (const auto& system_class : system_classes)
-    {
-        if (strcmp(system_class, class_name) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-int run_message_loop(const bool until_idle, const std::optional<uint32_t> timeout_seconds)
-{
-    MSG msg{};
-    bool stop = false;
-    UINT_PTR timerId = 0;
-    if (timeout_seconds.has_value())
-    {
-        timerId = SetTimer(nullptr, 0, *timeout_seconds * 1000, nullptr);
-    }
-
-    while (!stop && GetMessageW(&msg, nullptr, 0, 0))
-    {
-        TranslateMessage(&msg);
-        DispatchMessageW(&msg);
-        stop = until_idle && !PeekMessageW(&msg, nullptr, 0, 0, PM_NOREMOVE);
-        stop = stop || (msg.message == WM_TIMER && msg.wParam == timerId);
-    }
-    if (timeout_seconds.has_value())
-    {
-        KillTimer(nullptr, timerId);
-    }
-    return static_cast<int>(msg.wParam);
-}
-
-std::optional<std::wstring> get_last_error_message(const DWORD dw)
-{
-    std::optional<std::wstring> message;
-    try
-    {
-        const auto msg = std::system_category().message(dw);
-        message.emplace(begin(msg), end(msg));
-    }
-    catch (...)
-    {
-    }
-    return message;
-}
-
-void show_last_error_message(LPCWSTR functionName, DWORD dw, LPCWSTR errorTitle)
-{
-    const auto system_message = get_last_error_message(dw);
-    if (!system_message.has_value())
-    {
-        return;
-    }
-    LPWSTR lpDisplayBuf = (LPWSTR)LocalAlloc(LMEM_ZEROINIT, (system_message->size() + lstrlenW(functionName) + 40) * sizeof(WCHAR));
-    if (lpDisplayBuf != NULL)
-    {
-        StringCchPrintfW(lpDisplayBuf,
-                         LocalSize(lpDisplayBuf) / sizeof(WCHAR),
-                         L"%s: %s (%d)",
-                         functionName,
-                         system_message->c_str(),
-                         dw);
-        MessageBoxW(NULL, (LPCTSTR)lpDisplayBuf, errorTitle, MB_OK | MB_ICONERROR);
-        LocalFree(lpDisplayBuf);
-    }
-}
-
-WindowState get_window_state(HWND hwnd)
-{
-    WINDOWPLACEMENT placement;
-    placement.length = sizeof(WINDOWPLACEMENT);
-
-    if (GetWindowPlacement(hwnd, &placement) == 0)
-    {
-        return UNKNOWN;
-    }
-
-    if (placement.showCmd == SW_MINIMIZE || placement.showCmd == SW_SHOWMINIMIZED || IsIconic(hwnd))
-    {
-        return MINIMIZED;
-    }
-
-    if (placement.showCmd == SW_MAXIMIZE || placement.showCmd == SW_SHOWMAXIMIZED)
-    {
-        return MAXIMIZED;
-    }
-
-    auto rectp = get_window_pos(hwnd);
-    if (!rectp)
-    {
-        return UNKNOWN;
-    }
-
-    auto rect = *rectp;
-    MONITORINFO monitor;
-    monitor.cbSize = sizeof(MONITORINFO);
-    auto h_monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
-    GetMonitorInfo(h_monitor, &monitor);
-    bool top_left = monitor.rcWork.top == rect.top && monitor.rcWork.left == rect.left;
-    bool bottom_left = monitor.rcWork.bottom == rect.bottom && monitor.rcWork.left == rect.left;
-    bool top_right = monitor.rcWork.top == rect.top && monitor.rcWork.right == rect.right;
-    bool bottom_right = monitor.rcWork.bottom == rect.bottom && monitor.rcWork.right == rect.right;
-
-    if (top_left && bottom_left)
-        return SNAPED_LEFT;
-    if (top_left)
-        return SNAPED_TOP_LEFT;
-    if (bottom_left)
-        return SNAPED_BOTTOM_LEFT;
-    if (top_right && bottom_right)
-        return SNAPED_RIGHT;
-    if (top_right)
-        return SNAPED_TOP_RIGHT;
-    if (bottom_right)
-        return SNAPED_BOTTOM_RIGHT;
-
-    return RESTORED;
-}
-
-bool is_process_elevated(const bool use_cached_value)
-{
-    auto detection_func = []() {
-        HANDLE token = nullptr;
-        bool elevated = false;
-
-        if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token))
-        {
-            TOKEN_ELEVATION elevation;
-            DWORD size;
-            if (GetTokenInformation(token, TokenElevation, &elevation, sizeof(elevation), &size))
-            {
-                elevated = (elevation.TokenIsElevated != 0);
-            }
-        }
-
-        if (token)
-        {
-            CloseHandle(token);
-        }
-
-        return elevated;
-    };
-    static const bool cached_value = detection_func();
-    return use_cached_value ? cached_value : detection_func();
-}
-
-bool drop_elevated_privileges()
-{
-    HANDLE token = nullptr;
-    LPCTSTR lpszPrivilege = SE_SECURITY_NAME;
-    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_DEFAULT | WRITE_OWNER, &token))
-    {
-        return false;
-    }
-
-    PSID medium_sid = NULL;
-    if (!::ConvertStringSidToSid(SDDL_ML_MEDIUM, &medium_sid))
-    {
-        return false;
-    }
-
-    TOKEN_MANDATORY_LABEL label = { 0 };
-    label.Label.Attributes = SE_GROUP_INTEGRITY;
-    label.Label.Sid = medium_sid;
-    DWORD size = (DWORD)sizeof(TOKEN_MANDATORY_LABEL) + ::GetLengthSid(medium_sid);
-
-    BOOL result = SetTokenInformation(token, TokenIntegrityLevel, &label, size);
-    LocalFree(medium_sid);
-    CloseHandle(token);
-
-    return result;
-}
-
-std::wstring get_process_path(DWORD pid) noexcept
-{
-    auto process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, TRUE, pid);
-    std::wstring name;
-    if (process != INVALID_HANDLE_VALUE)
-    {
-        name.resize(MAX_PATH);
-        DWORD name_length = static_cast<DWORD>(name.length());
-        if (QueryFullProcessImageNameW(process, 0, (LPWSTR)name.data(), &name_length) == 0)
-        {
-            name_length = 0;
-        }
-        name.resize(name_length);
-        CloseHandle(process);
-    }
-    return name;
-}
-
-HANDLE run_elevated(const std::wstring& file, const std::wstring& params)
-{
-    SHELLEXECUTEINFOW exec_info = { 0 };
-    exec_info.cbSize = sizeof(SHELLEXECUTEINFOW);
-    exec_info.lpVerb = L"runas";
-    exec_info.lpFile = file.c_str();
-    exec_info.lpParameters = params.c_str();
-    exec_info.hwnd = 0;
-    exec_info.fMask = SEE_MASK_NOCLOSEPROCESS;
-    exec_info.lpDirectory = 0;
-    exec_info.hInstApp = 0;
-    exec_info.nShow = SW_SHOWDEFAULT;
-
-    return ShellExecuteExW(&exec_info) ? exec_info.hProcess : nullptr;
-}
-
-bool run_non_elevated(const std::wstring& file, const std::wstring& params, DWORD* returnPid)
-{
-    auto executable_args = L"\"" + file + L"\"";
-    if (!params.empty())
-    {
-        executable_args += L" " + params;
-    }
-
-    HWND hwnd = GetShellWindow();
-    if (!hwnd)
-    {
-        return false;
-    }
-    DWORD pid;
-    GetWindowThreadProcessId(hwnd, &pid);
-
-    winrt::handle process{ OpenProcess(PROCESS_CREATE_PROCESS, FALSE, pid) };
-    if (!process)
-    {
-        return false;
-    }
-
-    SIZE_T size = 0;
-
-    InitializeProcThreadAttributeList(nullptr, 1, 0, &size);
-    auto pproc_buffer = std::make_unique<char[]>(size);
-    auto pptal = reinterpret_cast<PPROC_THREAD_ATTRIBUTE_LIST>(pproc_buffer.get());
-
-    if (!InitializeProcThreadAttributeList(pptal, 1, 0, &size))
-    {
-        return false;
-    }
-
-    HANDLE process_handle = process.get();
-    if (!pptal || !UpdateProcThreadAttribute(pptal,
-                                             0,
-                                             PROC_THREAD_ATTRIBUTE_PARENT_PROCESS,
-                                             &process_handle,
-                                             sizeof(process_handle),
-                                             nullptr,
-                                             nullptr))
-    {
-        return false;
-    }
-
-    STARTUPINFOEX siex = { 0 };
-    siex.lpAttributeList = pptal;
-    siex.StartupInfo.cb = sizeof(siex);
-
-    PROCESS_INFORMATION pi = { 0 };
-    auto succeeded = CreateProcessW(file.c_str(),
-                                    const_cast<LPWSTR>(executable_args.c_str()),
-                                    nullptr,
-                                    nullptr,
-                                    FALSE,
-                                    EXTENDED_STARTUPINFO_PRESENT,
-                                    nullptr,
-                                    nullptr,
-                                    &siex.StartupInfo,
-                                    &pi);
-    if (succeeded)
-    {
-        if (pi.hProcess)
-        {
-            if (returnPid)
-            {
-                *returnPid = GetProcessId(pi.hProcess);
-            }
-
-            CloseHandle(pi.hProcess);
-        }
-        if (pi.hThread)
-        {
-            CloseHandle(pi.hThread);
-        }
-    }
-
-    return succeeded;
-}
-
-bool run_same_elevation(const std::wstring& file, const std::wstring& params, DWORD* returnPid)
-{
-    auto executable_args = L"\"" + file + L"\"";
-    if (!params.empty())
-    {
-        executable_args += L" " + params;
-    }
-
-    STARTUPINFO si = { 0 };
-    PROCESS_INFORMATION pi = { 0 };
-    auto succeeded = CreateProcessW(file.c_str(),
-                                    const_cast<LPWSTR>(executable_args.c_str()),
-                                    nullptr,
-                                    nullptr,
-                                    FALSE,
-                                    0,
-                                    nullptr,
-                                    nullptr,
-                                    &si,
-                                    &pi);
-
-    if (succeeded)
-    {
-        if (pi.hProcess)
-        {
-            if (returnPid)
-            {
-                *returnPid = GetProcessId(pi.hProcess);
-            }
-
-            CloseHandle(pi.hProcess);
-        }
-
-        if (pi.hThread)
-        {
-            CloseHandle(pi.hThread);
-        }
-    }
-    return succeeded;
-}
-
-std::wstring get_process_path(HWND window) noexcept
-{
-    const static std::wstring app_frame_host = L"ApplicationFrameHost.exe";
-    DWORD pid{};
-    GetWindowThreadProcessId(window, &pid);
-    auto name = get_process_path(pid);
-    if (name.length() >= app_frame_host.length() &&
-        name.compare(name.length() - app_frame_host.length(), app_frame_host.length(), app_frame_host) == 0)
-    {
-        // It is a UWP app. We will enumerate the windows and look for one created
-        // by something with a different PID
-        DWORD new_pid = pid;
-        EnumChildWindows(
-            window, [](HWND hwnd, LPARAM param) -> BOOL {
-                auto new_pid_ptr = reinterpret_cast<DWORD*>(param);
-                DWORD pid;
-                GetWindowThreadProcessId(hwnd, &pid);
-                if (pid != *new_pid_ptr)
-                {
-                    *new_pid_ptr = pid;
-                    return FALSE;
-                }
-                else
-                {
-                    return TRUE;
-                }
-            },
-            reinterpret_cast<LPARAM>(&new_pid));
-        // If we have a new pid, get the new name.
-        if (new_pid != pid)
-        {
-            return get_process_path(new_pid);
-        }
-    }
-    return name;
-}
-
-std::wstring get_product_version()
-{
-    static std::wstring version = L"v" + std::to_wstring(VERSION_MAJOR) +
-                                  L"." + std::to_wstring(VERSION_MINOR) +
-                                  L"." + std::to_wstring(VERSION_REVISION);
-
-    return version;
-}
-
-std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, const wchar_t* fallback)
-{
-    wchar_t* text_ptr;
-    auto length = LoadStringW(instance, resource_id, reinterpret_cast<wchar_t*>(&text_ptr), 0);
-    if (length == 0)
-    {
-        return fallback;
-    }
-    else
-    {
-        return { text_ptr, static_cast<std::size_t>(length) };
-    }
-}
-
-std::wstring get_module_filename(HMODULE mod)
-{
-    wchar_t buffer[MAX_PATH + 1];
-    DWORD actual_length = GetModuleFileNameW(mod, buffer, MAX_PATH);
-    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-    {
-        const DWORD long_path_length = 0xFFFF; // should be always enough
-        std::wstring long_filename(long_path_length, L'\0');
-        actual_length = GetModuleFileNameW(mod, long_filename.data(), long_path_length);
-        return long_filename.substr(0, actual_length);
-    }
-    return { buffer, actual_length };
-}
-
-std::wstring get_module_folderpath(HMODULE mod, const bool removeFilename)
-{
-    wchar_t buffer[MAX_PATH + 1];
-    DWORD actual_length = GetModuleFileNameW(mod, buffer, MAX_PATH);
-    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-    {
-        const DWORD long_path_length = 0xFFFF; // should be always enough
-        std::wstring long_filename(long_path_length, L'\0');
-        actual_length = GetModuleFileNameW(mod, long_filename.data(), long_path_length);
-        PathRemoveFileSpecW(long_filename.data());
-        long_filename.resize(std::wcslen(long_filename.data()));
-        long_filename.shrink_to_fit();
-        return long_filename;
-    }
-
-    if (removeFilename)
-    {
-        PathRemoveFileSpecW(buffer);
-    }
-    return { buffer, (UINT)lstrlenW(buffer) };
-}
-
-// The function returns true in case of error since we want to return false
-// only in case of a positive verification that the user is not an admin.
-bool check_user_is_admin()
-{
-    auto freeMemory = [](PSID pSID, PTOKEN_GROUPS pGroupInfo) {
-        if (pSID)
-        {
-            FreeSid(pSID);
-        }
-        if (pGroupInfo)
-        {
-            GlobalFree(pGroupInfo);
-        }
-    };
-
-    HANDLE hToken;
-    DWORD dwSize = 0;
-    PTOKEN_GROUPS pGroupInfo;
-    SID_IDENTIFIER_AUTHORITY SIDAuth = SECURITY_NT_AUTHORITY;
-    PSID pSID = NULL;
-
-    // Open a handle to the access token for the calling process.
-    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
-    {
-        return true;
-    }
-
-    // Call GetTokenInformation to get the buffer size.
-    if (!GetTokenInformation(hToken, TokenGroups, NULL, dwSize, &dwSize))
-    {
-        if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-        {
-            return true;
-        }
-    }
-
-    // Allocate the buffer.
-    pGroupInfo = (PTOKEN_GROUPS)GlobalAlloc(GPTR, dwSize);
-
-    // Call GetTokenInformation again to get the group information.
-    if (!GetTokenInformation(hToken, TokenGroups, pGroupInfo, dwSize, &dwSize))
-    {
-        freeMemory(pSID, pGroupInfo);
-        return true;
-    }
-
-    // Create a SID for the BUILTIN\Administrators group.
-    if (!AllocateAndInitializeSid(&SIDAuth, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &pSID))
-    {
-        freeMemory(pSID, pGroupInfo);
-        return true;
-    }
-
-    // Loop through the group SIDs looking for the administrator SID.
-    for (DWORD i = 0; i < pGroupInfo->GroupCount; ++i)
-    {
-        if (EqualSid(pSID, pGroupInfo->Groups[i].Sid))
-        {
-            freeMemory(pSID, pGroupInfo);
-            return true;
-        }
-    }
-
-    freeMemory(pSID, pGroupInfo);
-    return false;
-}
-
-bool find_app_name_in_path(const std::wstring& where, const std::vector<std::wstring>& what)
-{
-    for (const auto& row : what)
-    {
-        const auto pos = where.rfind(row);
-        const auto last_slash = where.rfind('\\');
-        //Check that row occurs in where, and its last occurrence contains in itself the first character after the last backslash.
-        if (pos != std::wstring::npos && pos <= last_slash + 1 && pos + row.length() > last_slash)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-std::optional<std::string> exec_and_read_output(const std::wstring_view command, DWORD timeout_ms)
-{
-    SECURITY_ATTRIBUTES saAttr{ sizeof(saAttr) };
-    saAttr.bInheritHandle = false;
-
-    constexpr size_t bufferSize = 4096;
-    // We must use a named pipe for async I/O
-    char pipename[MAX_PATH + 1];
-    if (!GetTempFileNameA(R"(\\.\pipe\)", "tmp", 1, pipename))
-    {
-        return std::nullopt;
-    }
-
-    wil::unique_handle readPipe{ CreateNamedPipeA(pipename, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, PIPE_UNLIMITED_INSTANCES, bufferSize, bufferSize, 0, &saAttr) };
-
-    saAttr.bInheritHandle = true;
-    wil::unique_handle writePipe{ CreateFileA(pipename, GENERIC_WRITE, 0, &saAttr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr) };
-
-    if (!readPipe || !writePipe)
-    {
-        return std::nullopt;
-    }
-
-    PROCESS_INFORMATION piProcInfo{};
-    STARTUPINFOW siStartInfo{ sizeof(siStartInfo) };
-
-    siStartInfo.hStdError = writePipe.get();
-    siStartInfo.hStdOutput = writePipe.get();
-    siStartInfo.dwFlags |= STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-    siStartInfo.wShowWindow = SW_HIDE;
-
-    std::wstring cmdLine{ command };
-    if (!CreateProcessW(nullptr,
-                        cmdLine.data(),
-                        nullptr,
-                        nullptr,
-                        true,
-                        NORMAL_PRIORITY_CLASS | CREATE_NEW_CONSOLE,
-                        nullptr,
-                        nullptr,
-                        &siStartInfo,
-                        &piProcInfo))
-    {
-        return std::nullopt;
-    }
-    // Child process inherited the write end of the pipe, we can close it now
-    writePipe.reset();
-
-    auto closeProcessHandles = wil::scope_exit([&] {
-        CloseHandle(piProcInfo.hThread);
-        CloseHandle(piProcInfo.hProcess);
-    });
-
-    std::string childOutput;
-    bool processExited = false;
-    for (;;)
-    {
-        char buffer[bufferSize];
-        DWORD gotBytes = 0;
-        wil::unique_handle IOEvent{ CreateEventW(nullptr, true, false, nullptr) };
-        OVERLAPPED overlapped{ .hEvent = IOEvent.get() };
-        ReadFile(readPipe.get(), buffer, sizeof(buffer), nullptr, &overlapped);
-
-        const std::array<HANDLE, 2> handlesToWait = { overlapped.hEvent, piProcInfo.hProcess };
-        switch (WaitForMultipleObjects(1 + !processExited, handlesToWait.data(), false, timeout_ms))
-        {
-        case WAIT_OBJECT_0 + 1:
-            if (!processExited)
-            {
-                // When the process exits, we can reduce timeout and read the rest of the output w/o possibly big timeout
-                timeout_ms = 1000;
-                processExited = true;
-                closeProcessHandles.reset();
-            }
-            [[fallthrough]];
-        case WAIT_OBJECT_0:
-            if (GetOverlappedResultEx(readPipe.get(), &overlapped, &gotBytes, timeout_ms, true))
-            {
-                childOutput += std::string_view{ buffer, gotBytes };
-                break;
-            }
-            // Timeout
-            [[fallthrough]];
-        default:
-            goto exit;
-        }
-    }
-exit:
-    CancelIo(readPipe.get());
-    return childOutput;
-}
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -1,99 +0,0 @@
-#pragma once
-#include <optional>
-#include <string>
-#include <Windows.h>
-#include <string>
-#include <memory>
-#include <vector>
-
-
-// Gets position of given window.
-std::optional<RECT> get_window_pos(HWND hwnd);
-
-// Check if window is part of the shell or the taskbar.
-bool is_system_window(HWND hwnd, const char* class_name);
-
-// Initializes and runs windows message loop
-int run_message_loop(const bool until_idle = false, const std::optional<uint32_t> timeout_seconds = {});
-
-std::optional<std::wstring> get_last_error_message(const DWORD dw);
-void show_last_error_message(LPCWSTR lpszFunction, DWORD dw, LPCWSTR errorTitle);
-
-enum WindowState
-{
-    UNKNOWN,
-    MINIMIZED,
-    MAXIMIZED,
-    SNAPED_TOP_LEFT,
-    SNAPED_LEFT,
-    SNAPED_BOTTOM_LEFT,
-    SNAPED_TOP_RIGHT,
-    SNAPED_RIGHT,
-    SNAPED_BOTTOM_RIGHT,
-    RESTORED
-};
-WindowState get_window_state(HWND hwnd);
-
-// Returns true if the current process is running with elevated privileges
-bool is_process_elevated(const bool use_cached_value = true);
-
-// Drops the elevated privileges if present
-bool drop_elevated_privileges();
-
-// Run command as elevated user, returns true if succeeded
-HANDLE run_elevated(const std::wstring& file, const std::wstring& params);
-
-// Run command as non-elevated user, returns true if succeeded, puts the process id into returnPid if returnPid != NULL
-bool run_non_elevated(const std::wstring& file, const std::wstring& params, DWORD* returnPid);
-
-// Run command with the same elevation, returns true if succeeded
-bool run_same_elevation(const std::wstring& file, const std::wstring& params, DWORD* returnPid);
-
-// Returns true if the current process is running from administrator account
-bool check_user_is_admin();
-
-// Returns true when one or more strings from vector found in string
-bool find_app_name_in_path(const std::wstring& where, const std::vector<std::wstring>& what);
-
-// Get the executable path or module name for modern apps
-std::wstring get_process_path(DWORD pid) noexcept;
-// Get the executable path or module name for modern apps
-std::wstring get_process_path(HWND hwnd) noexcept;
-
-std::wstring get_product_version();
-
-std::wstring get_module_filename(HMODULE mod = nullptr);
-std::wstring get_module_folderpath(HMODULE mod = nullptr, const bool removeFilename = true);
-
-// Get a string from the resource file
-std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, const wchar_t* fallback);
-// Wrapper for getting a string from the resource file. Returns the resource id text when fails.
-// Requires that
-//  extern "C" IMAGE_DOS_HEADER __ImageBase;
-// is added to the .cpp file.
-#define GET_RESOURCE_STRING(resource_id) get_resource_string(resource_id, reinterpret_cast<HINSTANCE>(&__ImageBase), L#resource_id)
-
-std::optional<std::string> exec_and_read_output(const std::wstring_view command, DWORD timeout_ms = 30000);
-
-// Helper class for various COM-related APIs, e.g working with security descriptors
-template<typename T>
-struct typed_storage
-{
-    std::unique_ptr<char[]> _buffer;
-    inline explicit typed_storage(const DWORD size) :
-        _buffer{ std::make_unique<char[]>(size) }
-    {
-    }
-    inline operator T*()
-    {
-        return reinterpret_cast<T*>(_buffer.get());
-    }
-};
-
-template<class... Ts>
-struct overloaded : Ts...
-{
-    using Ts::operator()...;
-};
-template<class... Ts>
-overloaded(Ts...) -> overloaded<Ts...>;
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Import Project="..\Version.props" />
-  <Target Name="GenerateVersionData" BeforeTargets="PrepareForBuild">
-    <ItemGroup>
-      <HeaderLines Include="#pragma once" />
-      <HeaderLines Include="#define VERSION_MAJOR $(Version.Split('.')[0])" />
-      <HeaderLines Include="#define VERSION_MINOR $(Version.Split('.')[1])" />
-      <HeaderLines Include="#define VERSION_REVISION $(Version.Split('.')[2])" />
-    </ItemGroup>
-    <WriteLinesToFile File="Generated Files\version_gen.h" Lines="@(HeaderLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
-  </Target>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{74485049-C722-400F-ABE5-86AC52D929B3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>common</RootNamespace>
-    <ProjectName>common</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <ImportGroup Label="Shared" />
-
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>inc;telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>inc;telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="animation.h" />
-    <ClInclude Include="appMutex.h" />
-    <ClInclude Include="async_message_queue.h" />
-    <ClInclude Include="comUtils.h" />
-    <ClInclude Include="debug_control.h" />
-    <ClInclude Include="dpi_aware.h" />
-    <ClInclude Include="com_object_factory.h" />
-    <ClInclude Include="keyboard_layout.h" />
-    <ClInclude Include="keyboard_layout_impl.h" />
-    <ClInclude Include="LowlevelKeyboardEvent.h" />
-    <ClInclude Include="monitor_utils.h" />
-    <ClInclude Include="notifications.h" />
-    <ClInclude Include="processApi.h" />
-    <ClInclude Include="RcResource.h" />
-    <ClInclude Include="os-detect.h" />
-    <ClInclude Include="RestartManagement.h" />
-    <ClInclude Include="shared_constants.h" />
-    <ClInclude Include="string_utils.h" />
-    <ClInclude Include="timeutil.h" />
-    <ClInclude Include="toast_dont_show_again.h" />
-    <ClInclude Include="two_way_pipe_message_ipc.h" />
-    <ClInclude Include="VersionHelper.h" />
-    <ClInclude Include="window_helpers.h" />
-    <ClInclude Include="icon_helpers.h" />
-    <ClInclude Include="json.h" />
-    <ClInclude Include="monitors.h" />
-    <ClInclude Include="on_thread_executor.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="settings_helpers.h" />
-    <ClInclude Include="settings_objects.h" />
-    <ClInclude Include="start_visible.h" />
-    <ClInclude Include="tasklist_positions.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="Telemetry\ProjectTelemetry.h" />
-    <ClInclude Include="Telemetry\TraceLoggingDefines.h" />
-    <ClInclude Include="two_way_pipe_message_ipc_impl.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="windows_colors.h" />
-    <ClInclude Include="WinHookEvent.h" />
-    <ClInclude Include="winstore.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="animation.cpp" />
-    <ClCompile Include="comUtils.cpp" />
-    <ClCompile Include="dpi_aware.cpp" />
-    <ClCompile Include="json.cpp" />
-    <ClCompile Include="keyboard_layout.cpp" />
-    <ClCompile Include="monitors.cpp" />
-    <ClCompile Include="notifications.cpp" />
-    <ClCompile Include="on_thread_executor.cpp" />
-    <ClCompile Include="os-detect.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="RcResource.cpp" />
-    <ClCompile Include="RestartManagement.cpp" />
-    <ClCompile Include="settings_helpers.cpp" />
-    <ClCompile Include="settings_objects.cpp" />
-    <ClCompile Include="icon_helpers.cpp" />
-    <ClCompile Include="start_visible.cpp" />
-    <ClCompile Include="tasklist_positions.cpp" />
-    <ClCompile Include="common.cpp" />
-    <ClCompile Include="toast_dont_show_again.cpp" />
-    <ClCompile Include="version.cpp" />
-    <ClCompile Include="two_way_pipe_message_ipc.cpp" />
-    <ClCompile Include="VersionHelper.cpp" />
-    <ClCompile Include="windows_colors.cpp" />
-    <ClCompile Include="window_helpers.cpp" />
-    <ClCompile Include="winstore.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-  </ImportGroup>
-  <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>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-  </Target>
-</Project>
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Telemetry">
-      <UniqueIdentifier>{3e9f944e-5d97-4a28-8865-2eff3a3568e7}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="animation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="monitors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tasklist_positions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windows_colors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="start_visible.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Telemetry\ProjectTelemetry.h">
-      <Filter>Header Files\Telemetry</Filter>
-    </ClInclude>
-    <ClInclude Include="Telemetry\TraceLoggingDefines.h">
-      <Filter>Header Files\Telemetry</Filter>
-    </ClInclude>
-    <ClInclude Include="async_message_queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="settings_helpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="settings_objects.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dpi_aware.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="on_thread_executor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="json.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="winstore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="icon_helpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="window_helpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="notifications.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="com_object_factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="timeutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VersionHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="com_object_factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared_constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyboard_layout_impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keyboard_layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="two_way_pipe_message_ipc_impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="two_way_pipe_message_ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os-detect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RestartManagement.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="debug_control.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RcResource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="appMutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="processApi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="comUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LowlevelKeyboardEvent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WinHookEvent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="string_utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="toast_dont_show_again.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="monitor_utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp" />
-    <ClCompile Include="animation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="monitors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tasklist_positions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windows_colors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="start_visible.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="common.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="settings_helpers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="settings_objects.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dpi_aware.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="on_thread_executor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="json.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="winstore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="icon_helpers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="window_helpers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="notifications.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VersionHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keyboard_layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="version.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="two_way_pipe_message_ipc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="os-detect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RestartManagement.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RcResource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="comUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="toast_dont_show_again.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
--- a/src/common/hooks/LowlevelKeyboardEvent.h
+++ b/src/common/hooks/LowlevelKeyboardEvent.h
--- a/src/common/hooks/WinHookEvent.h
+++ b/src/common/hooks/WinHookEvent.h
--- a/src/common/interop/KeyboardHook.cpp
+++ b/src/common/interop/KeyboardHook.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 #include "KeyboardHook.h"
 #include <exception>
-#include <msclr\marshal.h>
-#include <msclr\marshal_cppstd.h>
+#include <msclr/marshal.h>
+#include <msclr/marshal_cppstd.h>
 #include <common/debug_control.h>
-#include <common/common.h>
+#include <common/utils/winapi_error.h>

 using namespace interop;
 using namespace System::Runtime::InteropServices;
--- a/src/common/interop/PowerToysInterop.vcxproj
+++ b/src/common/interop/PowerToysInterop.vcxproj
@@ -1,117 +1,118 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\Version.props" />
-  <PropertyGroup>
-    <AssemblyTitle>PowerToysInterop</AssemblyTitle>
-    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
-    <AssemblyCopyright>Copyright (C) 2019 Microsoft Corp.</AssemblyCopyright>
-  </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{F055103B-F80B-4D0C-BF48-057C55620033}</ProjectGuid>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <Keyword>ManagedCProj</Keyword>
-    <RootNamespace>PowerToysInterop</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CLRSupport>true</CLRSupport>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <TargetName>PowerToysInterop</TargetName>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\common\interop;../../;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <AdditionalOptions>/Zc:twoPhase- </AdditionalOptions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <AssemblyVersionFiles Include="Generated Files\AssemblyInfo.cpp" />
-  </ItemGroup>
-  <Target Name="GenerateAssemblyInfo" BeforeTargets="PrepareForBuild">
-    <ItemGroup>
-      <HeaderLines Include="#include &lt;pch.h&gt; " />
-      <HeaderLines Include="using namespace System%3b" />
-      <HeaderLines Include="using namespace System::Reflection%3b" />
-      <HeaderLines Include="using namespace System::Runtime::CompilerServices%3b" />
-      <HeaderLines Include="using namespace System::Runtime::InteropServices%3b" />
-      <HeaderLines Include="using namespace System::Security::Permissions%3b" />
-      <HeaderLines Include="[assembly: AssemblyTitleAttribute(L&quot;$(AssemblyTitle)&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyDescriptionAttribute(&quot;&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyConfigurationAttribute(&quot;&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyCompanyAttribute(&quot;$(AssemblyCompany)&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyCopyrightAttribute(&quot;$(AssemblyCopyright)&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyProductAttribute(&quot;$(AssemblyTitle)&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyTrademarkAttribute(&quot;&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyCultureAttribute(&quot;&quot;)]%3b" />
-      <HeaderLines Include="[assembly: AssemblyVersionAttribute(&quot;$(Version).0&quot;)]%3b" />
-      <HeaderLines Include="[assembly: ComVisible(false)]%3b" />
-      <HeaderLines Include="[assembly:CLSCompliantAttribute(true)]%3b" />
-    </ItemGroup>
-    <WriteLinesToFile File="Generated Files\AssemblyInfo.cpp" Lines="@(HeaderLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
-  </Target>
-  <ItemGroup>
-    <ClInclude Include="HotkeyManager.h" />
-    <ClInclude Include="interop.h" />
-    <ClInclude Include="KeyboardHook.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Generated Files\AssemblyInfo.cpp" />
-    <ClCompile Include="HotkeyManager.cpp" />
-    <ClCompile Include="interop.cpp" />
-    <ClCompile Include="KeyboardHook.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="interop.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\common-md-flag\common-md-flag.vcxproj">
-      <Project>{985b3f2f-ceed-4c0a-a249-69257e719145}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Version.props" />
+  <PropertyGroup>
+    <AssemblyTitle>PowerToysInterop</AssemblyTitle>
+    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
+    <AssemblyCopyright>Copyright (C) 2019 Microsoft Corp.</AssemblyCopyright>
+  </PropertyGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{F055103B-F80B-4D0C-BF48-057C55620033}</ProjectGuid>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <Keyword>ManagedCProj</Keyword>
+    <RootNamespace>PowerToysInterop</RootNamespace>
+    <ProjectName>PowerToysInterop</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <TargetName>PowerToysInterop</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\common\interop;../../;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OmitDefaultLibName>false</OmitDefaultLibName>
+      <AdditionalOptions>/Zc:twoPhase- </AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <AssemblyVersionFiles Include="Generated Files\AssemblyInfo.cpp" />
+  </ItemGroup>
+  <Target Name="GenerateAssemblyInfo" BeforeTargets="PrepareForBuild">
+    <ItemGroup>
+      <HeaderLines Include="#include &quot;../pch.h&quot;" />
+      <HeaderLines Include="using namespace System%3b" />
+      <HeaderLines Include="using namespace System::Reflection%3b" />
+      <HeaderLines Include="using namespace System::Runtime::CompilerServices%3b" />
+      <HeaderLines Include="using namespace System::Runtime::InteropServices%3b" />
+      <HeaderLines Include="using namespace System::Security::Permissions%3b" />
+      <HeaderLines Include="[assembly: AssemblyTitleAttribute(L&quot;$(AssemblyTitle)&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyDescriptionAttribute(&quot;&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyConfigurationAttribute(&quot;&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyCompanyAttribute(&quot;$(AssemblyCompany)&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyCopyrightAttribute(&quot;$(AssemblyCopyright)&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyProductAttribute(&quot;$(AssemblyTitle)&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyTrademarkAttribute(&quot;&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyCultureAttribute(&quot;&quot;)]%3b" />
+      <HeaderLines Include="[assembly: AssemblyVersionAttribute(&quot;$(Version).0&quot;)]%3b" />
+      <HeaderLines Include="[assembly: ComVisible(false)]%3b" />
+      <HeaderLines Include="[assembly:CLSCompliantAttribute(true)]%3b" />
+    </ItemGroup>
+    <WriteLinesToFile File="Generated Files\AssemblyInfo.cpp" Lines="@(HeaderLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
+  </Target>
+  <ItemGroup>
+    <ClInclude Include="HotkeyManager.h" />
+    <ClInclude Include="interop.h" />
+    <ClInclude Include="KeyboardHook.h" />
+    <ClInclude Include="os-detect.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Generated Files\AssemblyInfo.cpp" />
+    <ClCompile Include="HotkeyManager.cpp" />
+    <ClCompile Include="interop.cpp" />
+    <ClCompile Include="KeyboardHook.cpp" />
+    <ClCompile Include="keyboard_layout.cpp">
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
+    </ClCompile>
+    <ClCompile Include="two_way_pipe_message_ipc.cpp">
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="interop.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
--- a/src/common/interop/PowerToysInterop.vcxproj.filters
+++ b/src/common/interop/PowerToysInterop.vcxproj.filters
@@ -1,56 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="interop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="KeyboardHook.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HotkeyManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="interop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Generated Files\AssemblyInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KeyboardHook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HotkeyManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="interop.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="interop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="KeyboardHook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="HotkeyManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os-detect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="interop.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Generated Files\AssemblyInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="KeyboardHook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="HotkeyManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="two_way_pipe_message_ipc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keyboard_layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="interop.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/common/interop/async_message_queue.h
+++ b/src/common/interop/async_message_queue.h
--- a/src/common/interop/interop-tests/InteropTests.cs
+++ b/src/common/interop/interop-tests/InteropTests.cs
--- a/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj
+++ b/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Version.props" />
+  <Import Project="..\..\..\Version.props" />

  <PropertyGroup>
    <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -72,16 +72,16 @@
  </ItemGroup>
  
  <ItemGroup>
-    <Compile Include="..\..\codeAnalysis\GlobalSuppressions.cs">
+    <Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs">
      <Link>GlobalSuppressions.cs</Link>
 	</Compile>
-    <AdditionalFiles Include="..\..\codeAnalysis\StyleCop.json">
+    <AdditionalFiles Include="..\..\..\codeAnalysis\StyleCop.json">
 		<Link>StyleCop.json</Link>
 	</AdditionalFiles>
  </ItemGroup>
  
  <ItemGroup>
-    <ProjectReference Include="..\interop\interop.vcxproj" />
+    <ProjectReference Include="..\PowerToysInterop.vcxproj" />
  </ItemGroup>

 </Project>
--- a/src/common/interop/interop.h
+++ b/src/common/interop/interop.h
@@ -1,13 +1,14 @@
 #pragma once

-#include <msclr\marshal.h>
-#include <msclr\marshal_cppstd.h>
+#include <msclr/marshal.h>
+#include <msclr/marshal_cppstd.h>
 #include <functional>
-#include "..\keyboard_layout.h"
-#include "..\two_way_pipe_message_ipc.h"
-#include "..\common.h"
-#include "..\shared_constants.h"
-#include "..\os-detect.h"
+#include "keyboard_layout.h"
+#include "two_way_pipe_message_ipc.h"
+#include "shared_constants.h"
+#include "../utils/os-detect.h"
+
+#include <common/version/version.h>

 using namespace System;
 using namespace System::Runtime::InteropServices;
@@ -56,7 +57,7 @@ public
        {
            _wrapperCallback = gcnew InternalReadCallback(this, &TwoWayPipeMessageIPCManaged::ReadCallbackHelper);
            _callback = callback;
-            
+
            TwoWayPipeMessageIPC::callback_function cb = nullptr;
            if (callback != nullptr)
            {
@@ -107,12 +108,11 @@ public
        }
    };

-    public
+public
    ref class CommonManaged
    {
    public:
-        static String^ GetProductVersion() 
-        {
+        static String ^ GetProductVersion() {
            return gcnew String(get_product_version().c_str());
        }

@@ -122,14 +122,13 @@ public
        }
    };

-    public
+public
    ref class Constants
    {
    public:
        literal int VK_WIN_BOTH = CommonSharedConstants::VK_WIN_BOTH;
-        
-        static String^ PowerLauncherSharedEvent()
-        {
+
+        static String ^ PowerLauncherSharedEvent() {
            return gcnew String(CommonSharedConstants::POWER_LAUNCHER_SHARED_EVENT);
        }
    };
--- a/src/common/interop/interop.rc
+++ b/src/common/interop/interop.rc
--- a/src/common/interop/keyboard_layout.cpp
+++ b/src/common/interop/keyboard_layout.cpp
--- a/src/common/interop/keyboard_layout.h
+++ b/src/common/interop/keyboard_layout.h
@@ -1,20 +1,20 @@
-#pragma once
-#include <string>
-#include <vector>
-#include <memory>
-#include <Windows.h>
-
-class LayoutMap
-{
-public:
-    LayoutMap();
-    ~LayoutMap();
-    void UpdateLayout();
-    std::wstring GetKeyName(DWORD key);
-    std::vector<DWORD> GetKeyCodeList(const bool isShortcut = false);
-    std::vector<std::pair<DWORD, std::wstring>> GetKeyNameList(const bool isShortcut = false);
-
-private:
-    class LayoutMapImpl;
-    LayoutMapImpl* impl;
-};
+#pragma once
+#include <string>
+#include <vector>
+#include <memory>
+#include <Windows.h>
+
+class LayoutMap
+{
+public:
+    LayoutMap();
+    ~LayoutMap();
+    void UpdateLayout();
+    std::wstring GetKeyName(DWORD key);
+    std::vector<DWORD> GetKeyCodeList(const bool isShortcut = false);
+    std::vector<std::pair<DWORD, std::wstring>> GetKeyNameList(const bool isShortcut = false);
+
+private:
+    class LayoutMapImpl;
+    LayoutMapImpl* impl;
+};
--- a/src/common/interop/keyboard_layout_impl.h
+++ b/src/common/interop/keyboard_layout_impl.h
--- a/src/common/interop/shared_constants.h
+++ b/src/common/interop/shared_constants.h
@@ -1,17 +1,18 @@
 #pragma once
-#include "common.h"
+
+#include <cstdint>

 namespace CommonSharedConstants
 {
    // Flag that can be set on an input event so that it is ignored by Keyboard Manager
-    const ULONG_PTR KEYBOARDMANAGER_INJECTED_FLAG = 0x1;
+    const uintptr_t KEYBOARDMANAGER_INJECTED_FLAG = 0x1;

    // Fake key code to represent VK_WIN.
-    inline const DWORD VK_WIN_BOTH = 0x104;
+    inline const int VK_WIN_BOTH = 0x104;

    // Path to the event used by PowerLauncher
    const wchar_t POWER_LAUNCHER_SHARED_EVENT[] = L"Local\\PowerToysRunInvokeEvent-30f26ad7-d36d-4c0e-ab02-68bb5ff3c4ab";

    // Max DWORD for key code to disable keys.
-    const DWORD VK_DISABLED = 0x100;
+    const int VK_DISABLED = 0x100;
 }
--- a/src/common/interop/two_way_pipe_message_ipc.cpp
+++ b/src/common/interop/two_way_pipe_message_ipc.cpp
@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "two_way_pipe_message_ipc_impl.h"

+#include <iterator>
+
 #pragma comment(lib, "advapi32.lib")

 TwoWayPipeMessageIPC::TwoWayPipeMessageIPC(
@@ -34,7 +36,6 @@ void TwoWayPipeMessageIPC::end()
    impl->end();
 }

-
 TwoWayPipeMessageIPC::TwoWayPipeMessageIPCImpl::TwoWayPipeMessageIPCImpl(
    std::wstring _input_pipe_name,
    std::wstring _output_pipe_name,
--- a/src/common/interop/two_way_pipe_message_ipc.h
+++ b/src/common/interop/two_way_pipe_message_ipc.h
@@ -4,8 +4,8 @@ class TwoWayPipeMessageIPC
 public:
    typedef void (*callback_function)(const std::wstring&);
    TwoWayPipeMessageIPC(
-        std::wstring _input_pipe_name, 
-        std::wstring _output_pipe_name, 
+        std::wstring _input_pipe_name,
+        std::wstring _output_pipe_name,
        callback_function p_func);
    ~TwoWayPipeMessageIPC();
    void send(std::wstring msg);
--- a/src/common/interop/two_way_pipe_message_ipc_impl.h
+++ b/src/common/interop/two_way_pipe_message_ipc_impl.h
--- a/src/common/json.cpp
+++ b/src/common/json.cpp
@@ -1,32 +0,0 @@
-#include "pch.h"
-#include "json.h"
-
-#include <fstream>
-
-namespace json
-{
-    std::optional<JsonObject> from_file(std::wstring_view file_name)
-    {
-        try
-        {
-            std::ifstream file(file_name.data(), std::ios::binary);
-            if (file.is_open())
-            {
-                using isbi = std::istreambuf_iterator<char>;
-                std::string obj_str{ isbi{ file }, isbi{} };
-                return JsonValue::Parse(winrt::to_hstring(obj_str)).GetObjectW();
-            }
-            return std::nullopt;
-        }
-        catch (...)
-        {
-            return std::nullopt;
-        }
-    }
-
-    void to_file(std::wstring_view file_name, const JsonObject& obj)
-    {
-        std::wstring obj_str{ obj.Stringify().c_str() };
-        std::ofstream{ file_name.data(), std::ios::binary } << winrt::to_string(obj_str);
-    }
-}
--- a/src/common/logger/logger.vcxproj
+++ b/src/common/logger/logger.vcxproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
-
  <PropertyGroup Label="Globals">
    <VCProjectVersion>16.0</VCProjectVersion>
    <Keyword>Win32Proj</Keyword>
@@ -12,7 +11,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
  </PropertyGroup>
-
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <Import Project="..\..\..\deps\spdlog.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -53,6 +51,9 @@
    <ProjectReference Include="..\..\logging\logging.vcxproj">
      <Project>{7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\SettingsAPI\SetttingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
    <CppWinRTOptimized>true</CppWinRTOptimized>
    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
    <MinimalCoreWin>true</MinimalCoreWin>
    <ProjectGuid>{0b593a6c-4143-4337-860e-db5710fb87db}</ProjectGuid>
-    <ProjectName>notifications</ProjectName>
-    <RootNamespace>PowerToysNotifications</RootNamespace>
+    <ProjectName>BackgroundActivator</ProjectName>
+    <RootNamespace>BackgroundActivator</RootNamespace>
    <DefaultLanguage>en-US</DefaultLanguage>
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
    <AppContainerApplication>true</AppContainerApplication>
@@ -141,13 +141,13 @@
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
  </ImportGroup>
  <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>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\.\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
  </Target>
 </Project>
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj.filters
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj.filters
--- a/src/common/notifications/BackgroundActivator/BackgroundHandler.cpp
+++ b/src/common/notifications/BackgroundActivator/BackgroundHandler.cpp
@@ -4,7 +4,7 @@

 #include "handler_functions.h"

-namespace winrt::PowerToysNotifications::implementation
+namespace winrt::BackgroundActivator::implementation
 {
    using Windows::ApplicationModel::Background::IBackgroundTaskInstance;
    using Windows::UI::Notifications::ToastNotificationActionTriggerDetail;
--- a/src/common/notifications/BackgroundActivator/BackgroundHandler.h
+++ b/src/common/notifications/BackgroundActivator/BackgroundHandler.h
@@ -2,7 +2,7 @@

 #include "BackgroundHandler.g.h"

-namespace winrt::PowerToysNotifications::implementation
+namespace winrt::BackgroundActivator::implementation
 {
    struct BackgroundHandler : BackgroundHandlerT<BackgroundHandler>
    {
@@ -12,7 +12,7 @@ namespace winrt::PowerToysNotifications::implementation
    };
 }

-namespace winrt::PowerToysNotifications::factory_implementation
+namespace winrt::BackgroundActivator::factory_implementation
 {
    struct BackgroundHandler : BackgroundHandlerT<BackgroundHandler, implementation::BackgroundHandler>
    {
--- a/src/common/notifications/BackgroundActivator/BackgroundHandler.idl
+++ b/src/common/notifications/BackgroundActivator/BackgroundHandler.idl
@@ -1,4 +1,4 @@
-namespace PowerToysNotifications
+namespace BackgroundActivator
 {
    [version(1)]
    runtimeclass BackgroundHandler
--- a/src/common/notifications/BackgroundActivator/handler_functions.cpp
+++ b/src/common/notifications/BackgroundActivator/handler_functions.cpp
--- a/src/common/notifications/BackgroundActivator/handler_functions.h
+++ b/src/common/notifications/BackgroundActivator/handler_functions.h
--- a/src/common/notifications/BackgroundActivator/packages.config
+++ b/src/common/notifications/BackgroundActivator/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
+</packages>
--- a/src/common/notifications/BackgroundActivator/pch.cpp
+++ b/src/common/notifications/BackgroundActivator/pch.cpp
--- a/src/common/notifications/BackgroundActivator/pch.h
+++ b/src/common/notifications/BackgroundActivator/pch.h
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.def
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.def
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.rc
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "resource.h"
-#include "../version.h"
+#include "../../version/version.h"

 1 VERSIONINFO
 FILEVERSION FILE_VERSION
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.vcxproj.filters
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.vcxproj.filters
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />

  <PropertyGroup Label="Globals">
    <VCProjectVersion>16.0</VCProjectVersion>
    <ProjectGuid>{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>notificationsdll</RootNamespace>
+    <RootNamespace>BackgroundActivatorDLL</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
@@ -32,7 +32,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <TargetName>Notifications</TargetName>
+    <TargetName>BackgroundActivatorDLL</TargetName>
  </PropertyGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -54,7 +54,7 @@
    </ClCompile>
    <Link>
      <EnableUAC>false</EnableUAC>
-      <ModuleDefinitionFile>notifications.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>BackgroundActivator.def</ModuleDefinitionFile>
      <AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalOptions> /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
    </Link>
@@ -77,21 +77,21 @@
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
  </ImportGroup>
  <ItemGroup>
-    <ProjectReference Include="..\notifications_winrt\notifications.vcxproj">
+    <ProjectReference Include="..\BackgroundActivator\BackgroundActivator.vcxproj">
      <Project>{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}</Project>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="notifications_dll.rc" />
+    <ResourceCompile Include="BackgroundActivator.rc" />
  </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>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
  </Target>
 </Project>
--- a/src/common/notifications/BackgroundActivatorDLL/cpp.hint
+++ b/src/common/notifications/BackgroundActivatorDLL/cpp.hint
--- a/src/common/notifications/BackgroundActivatorDLL/dllmain.cpp
+++ b/src/common/notifications/BackgroundActivatorDLL/dllmain.cpp
--- a/src/common/notifications/BackgroundActivatorDLL/framework.h
+++ b/src/common/notifications/BackgroundActivatorDLL/framework.h
--- a/src/common/notifications/BackgroundActivatorDLL/packages.config
+++ b/src/common/notifications/BackgroundActivatorDLL/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
+</packages>
--- a/src/common/notifications/BackgroundActivatorDLL/pch.cpp
+++ b/src/common/notifications/BackgroundActivatorDLL/pch.cpp
--- a/src/common/notifications/BackgroundActivatorDLL/pch.h
+++ b/src/common/notifications/BackgroundActivatorDLL/pch.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#ifndef PCH_H
+#define PCH_H
+
+#include "framework.h"
+
+#endif //PCH_H
--- a/src/common/notifications/BackgroundActivatorDLL/resource.h
+++ b/src/common/notifications/BackgroundActivatorDLL/resource.h
@@ -7,7 +7,7 @@

 #define FILE_DESCRIPTION "PowerToys Notifications"
 #define INTERNAL_NAME "Notifications"
-#define ORIGINAL_FILENAME "Notifications.dll"
+#define ORIGINAL_FILENAME "BackgroundActivatorDLL.dll"

 // Non-localizable
 //////////////////////////////
--- a/src/common/notifications/dont_show_again.cpp
+++ b/src/common/notifications/dont_show_again.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "toast_dont_show_again.h"
+#include "dont_show_again.h"

 namespace notifications
 {
--- a/src/common/notifications/dont_show_again.h
+++ b/src/common/notifications/dont_show_again.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "timeutil.h"
+#include "../utils/timeutil.h"

 namespace notifications
 {
--- a/src/common/notifications/notifications.cpp
+++ b/src/common/notifications/notifications.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"

-#include "common.h"
-#include "com_object_factory.h"
 #include "notifications.h"
-#include "winstore.h"
+#include "utils/com_object_factory.h"
+#include "utils/window.h"
+#include "winstore/winstore.h"

 #include <unknwn.h>
 #include <winrt/base.h>
@@ -19,12 +19,12 @@
 #include <propvarutil.h>
 #include <propkey.h>
 #include <Shobjidl.h>
+#include <filesystem>

 #include <winerror.h>
 #include <NotificationActivationCallback.h>

-#include "notifications_winrt/handler_functions.h"
-#include <filesystem>
+#include "BackgroundActivator/handler_functions.h"

 using namespace winrt::Windows::ApplicationModel::Background;
 using winrt::Windows::Data::Xml::Dom::XmlDocument;
@@ -33,10 +33,19 @@ using winrt::Windows::UI::Notifications::ToastNotificationManager;

 namespace fs = std::filesystem;

+template<class... Ts>
+struct overloaded : Ts...
+{
+    using Ts::operator()...;
+};
+
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
+
 namespace // Strings in this namespace should not be localized
 {
    constexpr std::wstring_view TASK_NAME = L"PowerToysBackgroundNotificationsHandler";
-    constexpr std::wstring_view TASK_ENTRYPOINT = L"PowerToysNotifications.BackgroundHandler";
+    constexpr std::wstring_view TASK_ENTRYPOINT = L"BackgroundActivator.BackgroundHandler";
    constexpr std::wstring_view PACKAGED_APPLICATION_ID = L"PowerToys";
    constexpr std::wstring_view APPIDS_REGISTRY = LR"(Software\Classes\AppUserModelId\)";

@@ -84,7 +93,7 @@ public:
        const NOTIFICATION_USER_INPUT_DATA*,
        ULONG) override
    {
-        auto lib = LoadLibraryW(L"Notifications.dll");
+        auto lib = LoadLibraryW(L"BackgroundActivatorDLL.dll");
        if (!lib)
        {
            return 1;
--- a/src/common/notifications/notifications.h
+++ b/src/common/notifications/notifications.h
--- a/src/common/common-md-flag/common-md-flag.vcxproj
+++ b/src/common/common-md-flag/common-md-flag.vcxproj
@@ -1,76 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{985B3F2F-CEED-4C0A-A249-69257E719145}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>commonmdflag</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>inc;telemetry;../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <ItemGroup>
-    <ClInclude Include="..\common.h" />
-    <ClInclude Include="..\keyboard_layout.h" />
-    <ClInclude Include="..\keyboard_layout_impl.h" />
-    <ClInclude Include="..\os-detect.h" />
-    <ClInclude Include="..\pch.h" />
-    <ClInclude Include="..\two_way_pipe_message_ipc.h" />
-    <ClInclude Include="..\two_way_pipe_message_ipc_impl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\common.cpp" />
-    <ClCompile Include="..\keyboard_layout.cpp" />
-    <ClCompile Include="..\os-detect.cpp" />
-    <ClCompile Include="..\pch.cpp">
-      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\two_way_pipe_message_ipc.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-  </ImportGroup>
-  <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>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>notifications</RootNamespace>
+    <ProjectName>Notifications</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="notifications.h" />
+    <ClInclude Include="dont_show_again.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dont_show_again.cpp" />
+    <ClCompile Include="notifications.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\WinStore\Winstore.vcxproj">
+      <Project>{c502a854-53ac-4ebb-8dc0-e4af2191e4f6}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+  </ImportGroup>
+  <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>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+  </Target>
 </Project>
--- a/src/common/notifications/packages.config
+++ b/src/common/notifications/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.200902.2" targetFramework="native" />
 </packages>
--- a/src/common/notifications/pch.cpp
+++ b/src/common/notifications/pch.cpp
@@ -1,5 +1 @@
-// pch.cpp: source file corresponding to the pre-compiled header
-
-#include "pch.h"
-
-// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.
+#include "pch.h"
--- a/src/common/notifications/pch.h
+++ b/src/common/notifications/pch.h
@@ -1,8 +1,8 @@
 #pragma once

-#ifndef PCH_H
-#define PCH_H
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN

-#include "framework.h"
-
-#endif //PCH_H
+#include <winrt/base.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <Windows.h>
--- a/src/common/on_thread_executor.cpp
+++ b/src/common/on_thread_executor.cpp
@@ -1,51 +0,0 @@
-#include "pch.h"
-
-#include "on_thread_executor.h"
-
-OnThreadExecutor::OnThreadExecutor() :
-    _shutdown_request{ false }, _worker_thread{ [this] { worker_thread(); } }
-{
-}
-
-std::future<void> OnThreadExecutor::submit(task_t task)
-{
-    auto future = task.get_future();
-    std::lock_guard lock{ _task_mutex };
-    _task_queue.emplace(std::move(task));
-    _task_cv.notify_one();
-    return future;
-}
-
-void OnThreadExecutor::cancel()
-{
-    std::lock_guard lock{ _task_mutex };
-    _task_queue = {};
-    _task_cv.notify_one();
-}
-
-
-void OnThreadExecutor::worker_thread()
-{
-    while (!_shutdown_request)
-    {
-        task_t task;
-        {
-            std::unique_lock task_lock{ _task_mutex };
-            _task_cv.wait(task_lock, [this] { return !_task_queue.empty() || _shutdown_request; });
-            if (_shutdown_request)
-            {
-                return;
-            }
-            task = std::move(_task_queue.front());
-            _task_queue.pop();
-        }
-        task();
-    }
-}
-
-OnThreadExecutor::~OnThreadExecutor()
-{
-    _shutdown_request = true;
-    _task_cv.notify_one();
-    _worker_thread.join();
-}
--- a/src/common/on_thread_executor.h
+++ b/src/common/on_thread_executor.h
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <future>
-#include <thread>
-#include <functional>
-#include <queue>
-#include <atomic>
-
-// OnThreadExecutor allows its caller to off-load some work to a persistently running background thread.
-// This might come in handy if you use the API which sets thread-wide global state and the state needs
-// to be isolated.
-
-class OnThreadExecutor final
-{
-public:
-    using task_t = std::packaged_task<void()>;
-
-    OnThreadExecutor();
-    ~OnThreadExecutor();
-    std::future<void> submit(task_t task);
-    void cancel();
-
-private:
-    void worker_thread();
-
-    std::mutex _task_mutex;
-    std::condition_variable _task_cv;
-    std::atomic_bool _shutdown_request;
-    std::queue<std::packaged_task<void()>> _task_queue;
-    std::thread _worker_thread;
-};
--- a/src/common/os-detect.h
+++ b/src/common/os-detect.h
@@ -1,3 +0,0 @@
-#pragma once
-
-bool UseNewSettings();
--- a/src/common/pch.cpp
+++ b/src/common/pch.cpp
@@ -1 +0,0 @@
-#include "pch.h"
--- a/src/common/pch.h
+++ b/src/common/pch.h
@@ -1,21 +0,0 @@
-#define NOMINMAX
-#include <winrt/base.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <Windows.h>
-
-#include <dcomp.h>
-#include <dwmapi.h>
-#include <Shobjidl.h>
-#include <Shlwapi.h>
-#include <string>
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <thread>
-#include <functional>
-#include <condition_variable>
-#include <stdexcept>
-#include <tuple>
-#include <unordered_set>
-#include <string>
-#include <vector>
--- a/src/common/start_visible.cpp
+++ b/src/common/start_visible.cpp
@@ -1,24 +0,0 @@
-#include "pch.h"
-#include "start_visible.h"
-
-bool is_start_visible()
-{
-    static const auto app_visibility = []() {
-        winrt::com_ptr<IAppVisibility> result;
-        CoCreateInstance(CLSID_AppVisibility,
-                         nullptr,
-                         CLSCTX_INPROC_SERVER,
-                         __uuidof(result),
-                         result.put_void());
-        return result;
-    }();
-
-    if (!app_visibility)
-    {
-        return false;
-    }
-
-    BOOL visible;
-    auto result = app_visibility->IsLauncherVisible(&visible);
-    return SUCCEEDED(result) && visible;
-}
--- a/src/common/start_visible.h
+++ b/src/common/start_visible.h
@@ -1,3 +0,0 @@
-#pragma once
-
-bool is_start_visible();
--- a/Show More
+++ b/Show More