diff --git a/PowerToys.sln b/PowerToys.sln
index a0612a81a8..232e5814e6 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -229,7 +229,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		src\tests\win-app-driver\packages.config = src\tests\win-app-driver\packages.config
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Lib", "src\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Library", "src\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interop", "src\common\interop\interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
 EndProject
diff --git a/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs b/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
index 44ec52ea89..fe6fddf015 100644
--- a/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
+++ b/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
@@ -1,5 +1,5 @@
 using ColorPicker.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Drawing;
 
diff --git a/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
index 34a479102a..c30008a5ac 100644
--- a/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
+++ b/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\src\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
     <ProjectReference Include="..\src\modules\colorPicker\ColorPickerUI\ColorPickerUI.csproj" />
   </ItemGroup>
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/AppSpecificKeysDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/AppSpecificKeysDataModel.cs
similarity index 95%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/AppSpecificKeysDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/AppSpecificKeysDataModel.cs
index e3bedd2eb3..d205c3ff66 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/AppSpecificKeysDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/AppSpecificKeysDataModel.cs
@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class AppSpecificKeysDataModel : KeysDataModel
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/BasePTModuleSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/BasePTModuleSettings.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/BasePTModuleSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/BasePTModuleSettings.cs
index 5a223c3b15..2948794041 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/BasePTModuleSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/BasePTModuleSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public abstract class BasePTModuleSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/BoolProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/BoolProperty.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/BoolProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/BoolProperty.cs
index fad18ef88f..3744a6ba4e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/BoolProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/BoolProperty.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class BoolProperty
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/BoolPropertyJsonConverter.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/BoolPropertyJsonConverter.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/BoolPropertyJsonConverter.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/BoolPropertyJsonConverter.cs
index bdfbd6e00e..3cbc0b72b5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/BoolPropertyJsonConverter.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/BoolPropertyJsonConverter.cs
@@ -6,7 +6,7 @@ using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class BoolPropertyJsonConverter : JsonConverter<bool>
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerProperties.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerProperties.cs
index e5ea8ef888..7f65789992 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerProperties.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public enum ColorRepresentationType
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerSettings.cs
index 42de1632d2..72ebb295c9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerSettings.cs
@@ -5,9 +5,9 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ColorPickerSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ConfigDefaults.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ConfigDefaults.cs
index 5d25a15d00..12a4819063 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ConfigDefaults.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public static class ConfigDefaults
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomActionDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomActionDataModel.cs
similarity index 87%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomActionDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomActionDataModel.cs
index e4bf4224ae..ee7617c85f 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomActionDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomActionDataModel.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
 {
     public class CustomActionDataModel
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomNamePolicy.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomNamePolicy.cs
similarity index 90%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomNamePolicy.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomNamePolicy.cs
index 0de49f3fd4..a64feddffe 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomNamePolicy.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomNamePolicy.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Text.Json;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
 {
     public class CustomNamePolicy : JsonNamingPolicy
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/ModuleCustomAction.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/ModuleCustomAction.cs
similarity index 82%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/ModuleCustomAction.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/ModuleCustomAction.cs
index c0168b8bfa..99c57fa2a2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/ModuleCustomAction.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/ModuleCustomAction.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
 {
     public class ModuleCustomAction
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/SendCustomAction.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/SendCustomAction.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/SendCustomAction.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/SendCustomAction.cs
index 81c8b7ef26..e863cd496a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/SendCustomAction.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/SendCustomAction.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
 {
     public class SendCustomAction
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/DoubleProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/DoubleProperty.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/DoubleProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/DoubleProperty.cs
index 4b6ee0f1f6..7854f70529 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/DoubleProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/DoubleProperty.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     // Represents the configuration property of the settings that store Double type.
     public class DoubleProperty
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs
index eb38781b4e..1fadcb961b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs
@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
 using Microsoft.PowerToys.Settings.Telemetry;
 using Microsoft.PowerToys.Telemetry;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class EnabledModules
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs
index 7d5e379087..9ce51ba406 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class FZConfigProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettings.cs
index 570b75cc97..bff72a5984 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettings.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class FancyZonesSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettingsIPCMessage.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettingsIPCMessage.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettingsIPCMessage.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettingsIPCMessage.cs
index e56d53f534..4da9cac2f1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettingsIPCMessage.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettingsIPCMessage.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class FancyZonesSettingsIPCMessage
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettings.cs
similarity index 95%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettings.cs
index eafa9c9979..9c062e9bd4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettings.cs
@@ -6,10 +6,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class GeneralSettings : ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettingsCustomAction.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettingsCustomAction.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettingsCustomAction.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettingsCustomAction.cs
index 5554ce9a60..f180ca3186 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettingsCustomAction.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettingsCustomAction.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class GeneralSettingsCustomAction
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GenericProperty`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/GenericProperty`1.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/GenericProperty`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/GenericProperty`1.cs
index 8a75f16e46..7fa02ba03c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GenericProperty`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/GenericProperty`1.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class GenericProperty<T>
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Helpers/Observable.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Helpers/Observable.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Helpers/Observable.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Helpers/Observable.cs
index 918c5c531b..a77099b4b8 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Helpers/Observable.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Helpers/Observable.cs
@@ -5,7 +5,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Helpers
+namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
 {
     public class Observable : INotifyPropertyChanged
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs
index 37ee7da743..9fe1099a2d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs
@@ -4,9 +4,9 @@
 
 using System.Text;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class HotkeySettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettingsControlHook.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs
similarity index 87%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettingsControlHook.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs
index 26231e7553..0c738a2ff2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettingsControlHook.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs
@@ -3,9 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using interop;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public delegate void KeyEvent(int key);
 
@@ -20,6 +21,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
         private const int WmSysKeyDown = 0x0104;
         private const int WmSysKeyUp = 0x0105;
 
+        [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "This class conforms to the IDisposable pattern, and the Dispose and C++ destructor does get called when debugging. Looks like a false positive from FxCop.")]
         private KeyboardHook _hook;
         private KeyEvent _keyDown;
         private KeyEvent _keyUp;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ISettingsUtils.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ISettingsUtils.cs
similarity index 85%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ISettingsUtils.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ISettingsUtils.cs
index c5083f3a16..1fa497af48 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ISettingsUtils.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ISettingsUtils.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public interface ISettingsUtils
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerProperties.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerProperties.cs
index ef217cb47b..7178958c2c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerProperties.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImageResizerProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerSettings.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerSettings.cs
index cffb1e0f9e..b956e04120 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerSettings.cs
@@ -4,9 +4,9 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImageResizerSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
similarity index 99%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
index cd268add57..6da91eca0d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImageSize : INotifyPropertyChanged
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImagerResizerKeepDateModified.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImagerResizerKeepDateModified.cs
similarity index 90%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImagerResizerKeepDateModified.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImagerResizerKeepDateModified.cs
index 1d9be0d93a..b402312040 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImagerResizerKeepDateModified.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImagerResizerKeepDateModified.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImagerResizerKeepDateModified
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerCustomSizeProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerCustomSizeProperty.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerCustomSizeProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerCustomSizeProperty.cs
index 71ccd88d8e..da2747f845 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerCustomSizeProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerCustomSizeProperty.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImageResizerCustomSizeProperty
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerFallbackEncoder.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerFallbackEncoder.cs
similarity index 90%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerFallbackEncoder.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerFallbackEncoder.cs
index 4663d3e381..e1b70603a2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerFallbackEncoder.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerFallbackEncoder.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImageResizerFallbackEncoder
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerSizes.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerSizes.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerSizes.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerSizes.cs
index 36d79b2d03..6ca2b550c4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerSizes.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerSizes.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ImageResizerSizes
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/IntProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/IntProperty.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/IntProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/IntProperty.cs
index 59da1fa985..fc7a6376da 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/IntProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/IntProperty.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     // Represents the configuration property of the settings that store Integer type.
     public class IntProperty
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsConfig.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsConfig.cs
similarity index 88%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsConfig.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsConfig.cs
index fa0291568f..0b49cad8eb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsConfig.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsConfig.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Interface
+namespace Microsoft.PowerToys.Settings.UI.Library.Interfaces
 {
     // Common interface to be implemented by all the objects which get and store settings properties.
     public interface ISettingsConfig
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsRepository`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsRepository`1.cs
similarity index 82%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsRepository`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsRepository`1.cs
index 6caadb85f9..221a5d04a1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsRepository`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsRepository`1.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Interface
+namespace Microsoft.PowerToys.Settings.UI.Library.Interfaces
 {
     public interface ISettingsRepository<T>
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyBoardKeysProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyBoardKeysProperty.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyBoardKeysProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyBoardKeysProperty.cs
index 1977918c69..00e8a797e5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyBoardKeysProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyBoardKeysProperty.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class KeyboardKeysProperty
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProfile.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProfile.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProfile.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProfile.cs
index 66246e2cc4..0ad511a357 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProfile.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProfile.cs
@@ -4,9 +4,9 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class KeyboardManagerProfile : ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProperties.cs
similarity index 95%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProperties.cs
index 29fe04e23b..1c8f17ed7a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProperties.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class KeyboardManagerProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerSettings.cs
index ffe032a47e..a52fdceea2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerSettings.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class KeyboardManagerSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeysDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeysDataModel.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeysDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeysDataModel.cs
index 5085c7fa8a..f19caa4c85 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeysDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeysDataModel.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class KeysDataModel
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj
similarity index 81%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj
index 525be8b769..4deb2dea1e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj
@@ -8,13 +8,14 @@
     <Version>$(Version).0</Version>
     <Authors>Microsoft Corporation</Authors>
     <Product>PowerToys</Product>
-    <Description>PowerToys Settings UI Lib</Description>
+    <Description>PowerToys Settings UI Library</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>
+    <AssemblyName>Microsoft.PowerToys.Settings.UI.Lib</AssemblyName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -41,6 +42,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
+      <Version>3.3.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/OutGoingGeneralSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/OutGoingGeneralSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/OutGoingGeneralSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/OutGoingGeneralSettings.cs
index 2fade3fa24..d040016660 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/OutGoingGeneralSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/OutGoingGeneralSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class OutGoingGeneralSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherProperties.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherProperties.cs
index e590f5da3f..dc96ff0c1a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherProperties.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerLauncherProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherSettings.cs
index 72aaedd9e0..61bf9f3339 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherSettings.cs
@@ -5,9 +5,9 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerLauncherSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewProperties.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewProperties.cs
index 5cdc009e79..6e7e4b4297 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewProperties.cs
@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
 using Microsoft.PowerToys.Settings.Telemetry;
 using Microsoft.PowerToys.Telemetry;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerPreviewProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewSettings.cs
index 0e41d098cf..5cdb94b923 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewSettings.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerPreviewSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameLocalProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameLocalProperties.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameLocalProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameLocalProperties.cs
index 3136edd2a6..2bed187bcd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameLocalProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameLocalProperties.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerRenameLocalProperties : ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameProperties.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameProperties.cs
index dffa50d639..1c64f119d3 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameProperties.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerRenameProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettings.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettings.cs
index 9b89e38f88..be74a62ba1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettings.cs
@@ -4,9 +4,9 @@
 
 using System;
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerRenameSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettingsIPCMessage.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettingsIPCMessage.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettingsIPCMessage.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettingsIPCMessage.cs
index b410a9600e..94e7c37118 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettingsIPCMessage.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettingsIPCMessage.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class PowerRenameSettingsIPCMessage
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/RemapKeysDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/RemapKeysDataModel.cs
similarity index 95%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/RemapKeysDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/RemapKeysDataModel.cs
index 894d97483d..2258fbc4e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/RemapKeysDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/RemapKeysDataModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class RemapKeysDataModel
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsRepository`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs
similarity index 95%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsRepository`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs
index 8930bf23d4..6b387805be 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsRepository`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     // This Singleton class is a wrapper around the settings configurations that are accessed by viewmodels.
     // This class can have only one instance and therefore the settings configurations are common to all.
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsUtils.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsUtils.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs
index b5e1da3968..c37c3a89ad 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsUtils.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs
@@ -6,10 +6,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SettingsUtils : ISettingsUtils
     {
@@ -123,7 +123,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
 #if DEBUG
                 if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
                 {
-                    throw e;
+                    throw;
                 }
 #endif
             }
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideProperties.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideProperties.cs
index 38a46a0cbb..a0981dd797 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideProperties.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ShortcutGuideProperties
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettings.cs
index 343649fd80..174aa4e217 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettings.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ShortcutGuideSettings : BasePTModuleSettings, ISettingsConfig
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettingsIPCMessage.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettingsIPCMessage.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettingsIPCMessage.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettingsIPCMessage.cs
index 348e932f73..4ed1e0f672 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettingsIPCMessage.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettingsIPCMessage.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ShortcutGuideSettingsIPCMessage
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutsKeyDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutsKeyDataModel.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutsKeyDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutsKeyDataModel.cs
index 91db9695db..812f595d65 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutsKeyDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutsKeyDataModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class ShortcutsKeyDataModel
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndFancyZonesSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndFancyZonesSettings.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndFancyZonesSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndFancyZonesSettings.cs
index e644c985a5..aaf391b2c5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndFancyZonesSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndFancyZonesSettings.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SndFancyZonesSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndImageResizerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndImageResizerSettings.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndImageResizerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndImageResizerSettings.cs
index 8092f3dd69..a62fccb21e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndImageResizerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndImageResizerSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SndImageResizerSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndKeyboardManagerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndKeyboardManagerSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndKeyboardManagerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndKeyboardManagerSettings.cs
index 334233a2fd..ba3e7d8e25 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndKeyboardManagerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndKeyboardManagerSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SndKeyboardManagerSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndModuleSettings`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndModuleSettings`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs
index 8f51d25246..463ec535ad 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndModuleSettings`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     // Represents a powertoys module settings setnt to the runner.
     public class SndModuleSettings<T>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerPreviewSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerPreviewSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerPreviewSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerPreviewSettings.cs
index 66101c1e02..b332a26ef0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerPreviewSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerPreviewSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SndPowerPreviewSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerRenameSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerRenameSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerRenameSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerRenameSettings.cs
index 781680f964..3382940668 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerRenameSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerRenameSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SndPowerRenameSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndShortcutGuideSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndShortcutGuideSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndShortcutGuideSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndShortcutGuideSettings.cs
index 19e1ca513f..70ada7f8fa 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndShortcutGuideSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndShortcutGuideSettings.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class SndShortcutGuideSettings
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/StringProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/StringProperty.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/StringProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/StringProperty.cs
index 6165d75448..c138424afb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/StringProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/StringProperty.cs
@@ -5,7 +5,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     // Represents the configuration property of the settings that store string type.
     public class StringProperty
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsBootEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsBootEvent.cs
similarity index 100%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsBootEvent.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsBootEvent.cs
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsEnabledEvent.cs
similarity index 100%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledEvent.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsEnabledEvent.cs
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Helper.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Helper.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Helper.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Helper.cs
index e6b5d723d4..8cce1f2a68 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Helper.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Helper.cs
@@ -7,9 +7,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Microsoft.PowerToys.Settings.UI.Lib.CustomAction;
+using Microsoft.PowerToys.Settings.UI.Library.CustomAction;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
 {
     public static class Helper
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/IIOProvider.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/IIOProvider.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/IIOProvider.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/IIOProvider.cs
index deed5f0fcd..dd448d76f2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/IIOProvider.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/IIOProvider.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
 {
     public interface IIOProvider
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Logger.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Logger.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs
index e90d49b5f8..ebf9dc633c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Logger.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
 {
     public static class Logger
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/NativeMethods.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/NativeMethods.cs
similarity index 88%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/NativeMethods.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/NativeMethods.cs
index efd486abcc..6cc5ec90fa 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/NativeMethods.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/NativeMethods.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
 {
     internal static class NativeMethods
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/SystemIOProvider.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/SystemIOProvider.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs
index bfcb4d55f7..c650c5957e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/SystemIOProvider.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs
@@ -4,7 +4,7 @@
 
 using System.IO;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
 {
     public class SystemIOProvider : IIOProvider
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ColorPickerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ColorPickerViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
index a56ae1c537..ff4f37f612 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ColorPickerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
@@ -5,10 +5,10 @@
 using System;
 using System.Globalization;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class ColorPickerViewModel : Observable
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/ButtonClickCommand.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/ButtonClickCommand.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/ButtonClickCommand.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/ButtonClickCommand.cs
index 9ddf80cfe4..84f37b864a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/ButtonClickCommand.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/ButtonClickCommand.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Windows.Input;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands
 {
     public class ButtonClickCommand : ICommand
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand.cs
index 0c2b5ef79f..2fe0be6692 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Windows.Input;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands
 {
     public class RelayCommand : ICommand
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand`1.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand`1.cs
index 22e2fed201..72bbebeb85 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand`1.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Windows.Input;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands
 {
     public class RelayCommand<T> : ICommand
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/FancyZonesViewModel.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/FancyZonesViewModel.cs
index 21979ed88f..5b13543a58 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/FancyZonesViewModel.cs
@@ -6,12 +6,11 @@ using System;
 using System.Drawing;
 using System.Globalization;
 using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class FancyZonesViewModel : Observable
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs
index 232bbf0be2..b2e94bfce4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs
@@ -5,12 +5,12 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class GeneralViewModel : Observable
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs
index 003c210d4d..fcede542e8 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs
@@ -8,11 +8,11 @@ using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class ImageResizerViewModel : Observable
     {
@@ -49,7 +49,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
 #if DEBUG
                 if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
                 {
-                    throw e;
+                    throw;
                 }
 #endif
                 Settings = new ImageResizerSettings();
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/KeyboardManagerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/KeyboardManagerViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
index efc8855b42..b94836f51a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/KeyboardManagerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
@@ -10,12 +10,12 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class KeyboardManagerViewModel : Observable
     {
@@ -42,6 +42,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
 
         private Func<List<KeysDataModel>, int> FilterRemapKeysList { get; }
 
+        [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exceptions should not crash the program but will be logged until we can understand common exception scenarios")]
         public KeyboardManagerViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc, Func<List<KeysDataModel>, int> filterRemapKeysList)
         {
             if (settingsRepository == null)
@@ -69,7 +70,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
 #if DEBUG
                     if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
                     {
-                        throw e;
+                        throw;
                     }
 #endif
                 }
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerLauncherViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerLauncherViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
index 2fac0e69ec..89fe413ff4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerLauncherViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
@@ -6,10 +6,10 @@ using System;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class PowerLauncherViewModel : Observable
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerPreviewViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerPreviewViewModel.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerPreviewViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerPreviewViewModel.cs
index 5282a0e48c..911620fee1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerPreviewViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerPreviewViewModel.cs
@@ -4,10 +4,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class PowerPreviewViewModel : Observable
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerRenameViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerRenameViewModel.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerRenameViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerRenameViewModel.cs
index 740450d505..99ef38b1a9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerRenameViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerRenameViewModel.cs
@@ -6,11 +6,11 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class PowerRenameViewModel : Observable
     {
@@ -51,7 +51,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
 #if DEBUG
                 if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
                 {
-                    throw e;
+                    throw;
                 }
 #endif
                 PowerRenameLocalProperties localSettings = new PowerRenameLocalProperties();
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ShortcutGuideViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ShortcutGuideViewModel.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ShortcutGuideViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ShortcutGuideViewModel.cs
index bcde5576b7..79072bba66 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ShortcutGuideViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ShortcutGuideViewModel.cs
@@ -4,10 +4,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
 {
     public class ShortcutGuideViewModel : Observable
     {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
index 4b9d97f77e..f102c653e4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
@@ -75,7 +75,7 @@
     <ProjectReference Include="..\..\common\interop\interop.vcxproj" />
     <ProjectReference Include="..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\Telemetry.csproj" />
-    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
     <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj" />
   </ItemGroup>
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
index 15d954881b..28ed4f04bc 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
@@ -1,6 +1,6 @@
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Moq;
 using System;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj
index c3cde6c756..77c03e0bce 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs
index a7c6a4eaf4..9a0b7433ec 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs
@@ -1,4 +1,4 @@
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Moq;
 using System;
 using System.Collections.Generic;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs
index b1c47f15b1..d497dd4da4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs
@@ -1,5 +1,5 @@
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Moq;
 using System;
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs
index 0ea3fe34fa..99555c4649 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.PowerToys.Settings.UnitTest;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs
index 023ee7e851..8d73d2a6ee 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
 namespace Microsoft.PowerToys.Settings.UnitTest
 {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs
index f951bfb43b..dd362e38da 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace CommonLibTest
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs
index 5bb2825755..99501ff2e6 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs
@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs
index 51606154d1..1289f7015d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs
@@ -6,8 +6,8 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.PowerToys.Settings.UnitTest;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs
index 4cadefcba3..cc649c441e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs
@@ -5,8 +5,8 @@
 using System.Globalization;
 using System.IO;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs
index 923fcc7013..8f87d1fe0b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs
@@ -8,8 +8,8 @@ using System.Globalization;
 using System.IO;
 using System.Text.Json;
 using CommonLibTest;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
index 85ff65bdde..bf543c8fcd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
@@ -6,8 +6,8 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
index 74b61e89ea..5ebf32f6e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
@@ -7,9 +7,9 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs
index 75ee9479ea..16fa058dfc 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs
@@ -4,8 +4,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace ViewModelTests
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs
index 7a5c26649a..bd180e830c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Moq;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs
index 4175bff6c0..d66a6839e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs
@@ -5,8 +5,8 @@
 using System;
 using System.IO;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs
index 99559ce12f..794dd1b972 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs
@@ -5,8 +5,8 @@
 using System;
 using System.IO;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs
index 0979abacdf..0e4fb665dd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs
@@ -5,8 +5,8 @@
 using System;
 using System.IO;
 using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
 using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
index 10d39ebfe2..b7540b907e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
@@ -4,7 +4,7 @@
 
 using System;
 using Microsoft.PowerToys.Settings.UI.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -229,7 +229,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         {
             await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
-                KeyEventHandler(key, true, key, Lib.Utilities.Helper.GetKeyName((uint)key));
+                KeyEventHandler(key, true, key, Library.Utilities.Helper.GetKeyName((uint)key));
 
                 // Tab and Shift+Tab are accessible keys and should not be displayed in the hotkey control.
                 if (internalSettings.Code > 0 && !internalSettings.IsAccessibleShortcut())
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs b/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs
index 415fa97ba7..7b1feee775 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index b4c8952141..12e2281d14 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -289,9 +289,9 @@
       <Project>{5d00d290-4016-4cfe-9e41-1e7c724509ba}</Project>
       <Name>Telemetry</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj">
+    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj">
       <Project>{b1bcc8c6-46b5-4bfa-8f22-20f32d99ec6a}</Project>
-      <Name>Microsoft.PowerToys.Settings.UI.Lib</Name>
+      <Name>Microsoft.PowerToys.Settings.UI.Library</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml.cs
index 929fc9398c..e27aeb3aaa 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml.cs
index e022e63fd9..bf96e0880d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
index a96ad730b4..f177989ae4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.ApplicationModel.Resources;
 using Windows.Data.Json;
 using Windows.UI.Xaml;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 180b3e4fd3..069281ccbd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:CustomControls="using:Microsoft.PowerToys.Settings.UI.Controls"    
-    xmlns:models="using:Microsoft.PowerToys.Settings.UI.Lib"
-    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.Lib.ViewModels"
+    xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
+    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.Library.ViewModels"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls" 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml.cs
index b98c2d706d..7f830f1558 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index b1ae6daced..1dfd06a489 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -5,10 +5,10 @@
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModel="using:Microsoft.PowerToys.Settings.UI.Lib.ViewModels"
+    xmlns:viewModel="using:Microsoft.PowerToys.Settings.UI.Library.ViewModels"
     xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
     xmlns:CustomControls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:Lib="using:Microsoft.PowerToys.Settings.UI.Lib"
+    xmlns:Lib="using:Microsoft.PowerToys.Settings.UI.Library"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml.cs
index 2220c43804..5fbb40fec3 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml.cs
@@ -5,9 +5,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
index 681af560bb..59a61ac699 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
@@ -4,9 +4,9 @@
 
 using System;
 using System.Collections.ObjectModel;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml.cs
index e4bfb4cd3c..0e23644bdb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs
index ff1a20be02..dd8bec2564 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs
index 972a1595ca..e7f3d6166c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
 using Windows.Data.Json;
 using Windows.UI.Xaml.Controls;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs
index 2b0dec506d..503b31d8d7 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
index a2daaaccc1..ae47ea9fdc 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
+++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
@@ -246,9 +246,9 @@
       <Project>{5d00d290-4016-4cfe-9e41-1e7c724509ba}</Project>
       <Name>Telemetry</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj">
+    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj">
       <Project>{b1bcc8c6-46b5-4bfa-8f22-20f32d99ec6a}</Project>
-      <Name>Microsoft.PowerToys.Settings.UI.Lib</Name>
+      <Name>Microsoft.PowerToys.Settings.UI.Library</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs
index e9957d107d..9472322986 100644
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Drawing;
 using System.Globalization;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 
 namespace ColorPicker.Helpers
 {
diff --git a/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs b/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
index 5f2f647ab5..db26fea938 100644
--- a/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
@@ -9,7 +9,7 @@ using System.Windows.Input;
 using ColorPicker.Helpers;
 using ColorPicker.Settings;
 using ColorPicker.Telemetry;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Telemetry;
 using static ColorPicker.NativeMethods;
 
diff --git a/src/modules/colorPicker/ColorPickerUI/Settings/IUserSettings.cs b/src/modules/colorPicker/ColorPickerUI/Settings/IUserSettings.cs
index 19d71d3312..b05be4d12e 100644
--- a/src/modules/colorPicker/ColorPickerUI/Settings/IUserSettings.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Settings/IUserSettings.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 
 namespace ColorPicker.Settings
 {
diff --git a/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs b/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
index 815913ea2b..a1e50f5ec7 100644
--- a/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
@@ -6,8 +6,8 @@ using System;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
 namespace ColorPicker.Settings
 {
diff --git a/src/modules/colorPicker/ColorPickerUI/ViewModels/MainViewModel.cs b/src/modules/colorPicker/ColorPickerUI/ViewModels/MainViewModel.cs
index bfba9bdfff..a600471f61 100644
--- a/src/modules/colorPicker/ColorPickerUI/ViewModels/MainViewModel.cs
+++ b/src/modules/colorPicker/ColorPickerUI/ViewModels/MainViewModel.cs
@@ -15,7 +15,7 @@ using ColorPicker.Mouse;
 using ColorPicker.Settings;
 using ColorPicker.Telemetry;
 using ColorPicker.ViewModelContracts;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Telemetry;
 
 namespace ColorPicker.ViewModels
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs
index 3d59271c3f..88f0dea54a 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
 using Microsoft.Plugin.Folder.Sources;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Wox.Infrastructure.Storage;
 using Wox.Plugin;
 
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj
index 115fe556cd..6e0358d7d4 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj
@@ -41,10 +41,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Languages\**" />
-    <EmbeddedResource Remove="Languages\**" />
-    <None Remove="Languages\**" />
+  <ItemGroup>
+    <Compile Remove="Languages\**" />
+    <EmbeddedResource Remove="Languages\**" />
+    <None Remove="Languages\**" />
   </ItemGroup>
   
   <ItemGroup>
@@ -60,16 +60,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
     <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
@@ -106,11 +106,11 @@
     <None Update="Images\user.light.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Images\Warning.dark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="Images\Warning.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Images\Warning.light.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="Images\Warning.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -128,17 +128,17 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
index 93adfb5ac5..4f9f294949 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
@@ -13,7 +13,7 @@ using System.Text.RegularExpressions;
 using System.Windows.Controls;
 using Microsoft.Plugin.Indexer.DriveDetection;
 using Microsoft.Plugin.Indexer.SearchHelper;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.Search.Interop;
 using Wox.Infrastructure.Logger;
 using Wox.Infrastructure.Storage;
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
index c9ec01d371..010b7f4c49 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
     <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
   </ItemGroup>
 
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
index eb90389ffa..f7de0428b6 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
@@ -11,7 +11,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Input;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Wox.Infrastructure.Logger;
 using Wox.Infrastructure.Storage;
 using Wox.Plugin;
diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
index 325be438c3..8ce0e67d6a 100644
--- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
+++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
@@ -122,7 +122,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\interop\interop.vcxproj" />
     <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
     <ProjectReference Include="..\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj" />
     <ProjectReference Include="..\Wox.Core\Wox.Core.csproj" />
     <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
diff --git a/src/modules/launcher/PowerLauncher/SettingsWatcher.cs b/src/modules/launcher/PowerLauncher/SettingsWatcher.cs
index 347fe9ed10..e526623761 100644
--- a/src/modules/launcher/PowerLauncher/SettingsWatcher.cs
+++ b/src/modules/launcher/PowerLauncher/SettingsWatcher.cs
@@ -6,8 +6,8 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Windows.Input;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using PowerLauncher.Helper;
 using Wox.Core.Plugin;
 using Wox.Infrastructure.Hotkey;
@@ -34,7 +34,7 @@ namespace PowerLauncher
             _settings = settings;
 
             // Set up watcher
-            _watcher = Microsoft.PowerToys.Settings.UI.Lib.Utilities.Helper.GetFileWatcher(PowerLauncherSettings.ModuleName, "settings.json", OverloadSettings);
+            _watcher = Microsoft.PowerToys.Settings.UI.Library.Utilities.Helper.GetFileWatcher(PowerLauncherSettings.ModuleName, "settings.json", OverloadSettings);
 
             // Load initial settings file
             OverloadSettings();
diff --git a/src/modules/launcher/Wox.Infrastructure/Storage/StoragePowerToysVersionInfo.cs b/src/modules/launcher/Wox.Infrastructure/Storage/StoragePowerToysVersionInfo.cs
index 0c778f34e9..b17b347f27 100644
--- a/src/modules/launcher/Wox.Infrastructure/Storage/StoragePowerToysVersionInfo.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Storage/StoragePowerToysVersionInfo.cs
@@ -106,7 +106,7 @@ namespace Wox.Infrastructure.Storage
 
             // Get the previous version of PowerToys and cache Storage details from the CacheDetails.json storage file
             string previousVersion = GetPreviousVersion();
-            currentPowerToysVersion = Microsoft.PowerToys.Settings.UI.Lib.Utilities.Helper.GetProductVersion();
+            currentPowerToysVersion = Microsoft.PowerToys.Settings.UI.Library.Utilities.Helper.GetProductVersion();
 
             // If the previous version is below a set threshold, then we want to delete the file
             // However, we do not want to delete the cache if the same version of powerToys is being launched
diff --git a/src/modules/launcher/Wox.Plugin/ISettingProvider.cs b/src/modules/launcher/Wox.Plugin/ISettingProvider.cs
index ddcb6ef351..d4fd3559c1 100644
--- a/src/modules/launcher/Wox.Plugin/ISettingProvider.cs
+++ b/src/modules/launcher/Wox.Plugin/ISettingProvider.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows.Controls;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
 
 namespace Wox.Plugin
 {
diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
index bb04dc8566..09247ccff1 100644
--- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
+++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
@@ -77,7 +77,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\codeAnalysis\GlobalSuppressions.cs">