Merge branch 'master' into dev/crutkas/upgradeNuget

src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj

@@ -225,6 +225,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.IO.Abstractions">
+      <Version>12.2.5</Version>
+    </PackageReference>
     <PackageReference Include="System.Windows.Interactivity.WPF">
       <Version>2.0.20525</Version>
     </PackageReference>

src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs

@@ -66,6 +66,7 @@ namespace ColorPicker.Helpers
             saturation = Math.Round(saturation * 100);
             lightness = Math.Round(lightness * 100);
 
+            // Using InvariantCulture since this is used for color representation
             return $"hsl({hue.ToString(CultureInfo.InvariantCulture)}"
                  + $", {saturation.ToString(CultureInfo.InvariantCulture)}%"
                  + $", {lightness.ToString(CultureInfo.InvariantCulture)}%)";
@@ -84,6 +85,7 @@ namespace ColorPicker.Helpers
             saturation = Math.Round(saturation * 100);
             value = Math.Round(value * 100);
 
+            // Using InvariantCulture since this is used for color representation
             return $"hsv({hue.ToString(CultureInfo.InvariantCulture)}"
                  + $", {saturation.ToString(CultureInfo.InvariantCulture)}%"
                  + $", {value.ToString(CultureInfo.InvariantCulture)}%)";
@@ -103,6 +105,7 @@ namespace ColorPicker.Helpers
             yellow = Math.Round(yellow * 100);
             blackKey = Math.Round(blackKey * 100);
 
+            // Using InvariantCulture since this is used for color representation
             return $"cmyk({cyan.ToString(CultureInfo.InvariantCulture)}%"
                  + $", {magenta.ToString(CultureInfo.InvariantCulture)}%"
                  + $", {yellow.ToString(CultureInfo.InvariantCulture)}%"

src/modules/colorPicker/ColorPickerUI/Helpers/Logger.cs

@@ -5,22 +5,24 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 
 namespace ColorPicker.Helpers
 {
     public static class Logger
     {
-        private static readonly string ApplicationLogPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "ColorPicker");
+        private static readonly IFileSystem _fileSystem = new FileSystem();
+        private static readonly string ApplicationLogPath = _fileSystem.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "ColorPicker");
 
         static Logger()
         {
-            if (!Directory.Exists(ApplicationLogPath))
+            if (!_fileSystem.Directory.Exists(ApplicationLogPath))
             {
-                Directory.CreateDirectory(ApplicationLogPath);
+                _fileSystem.Directory.CreateDirectory(ApplicationLogPath);
             }
 
-            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.CurrentCulture) + ".txt");
+            // Using InvariantCulture since this is used for a log file name
+            var logFilePath = _fileSystem.Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 

src/modules/colorPicker/ColorPickerUI/Mouse/CursorManager.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.IO;
+using System.IO.Abstractions;
 using ColorPicker.Helpers;
 using Microsoft.Win32;
 
@@ -28,11 +28,13 @@ namespace ColorPicker.Mouse
         [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Interop object")]
         private const int SPIF_SENDCHANGE = 0x02;
 
+        private static readonly IFileSystem _fileSystem = new FileSystem();
+
         public static void SetColorPickerCursor()
         {
             BackupOriginalCursors();
 
-            var colorPickerCursorPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ColorPickerCursorName);
+            var colorPickerCursorPath = _fileSystem.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ColorPickerCursorName);
             ChangeCursor(colorPickerCursorPath, ArrowRegistryName);
             ChangeCursor(colorPickerCursorPath, IBeamRegistryName);
         }

src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs

@@ -5,6 +5,7 @@
 using System;
 using System.ComponentModel.Composition;
 using System.IO;
+using System.IO.Abstractions;
 using System.Threading;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
@@ -20,14 +21,14 @@ namespace ColorPicker.Settings
         private const int MaxNumberOfRetry = 5;
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Actually, call back is LoadSettingsFromJson")]
-        private readonly FileSystemWatcher _watcher;
+        private readonly IFileSystemWatcher _watcher;
 
         private readonly object _loadingSettingsLock = new object();
 
         [ImportingConstructor]
         public UserSettings()
         {
-            _settingsUtils = new SettingsUtils(new SystemIOProvider());
+            _settingsUtils = new SettingsUtils();
             ChangeCursor = new SettingItem<bool>(true);
             ActivationShortcut = new SettingItem<string>(DefaultActivationShortcut);
             CopiedColorRepresentation = new SettingItem<ColorRepresentationType>(ColorRepresentationType.HEX);

src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorHelperTest.cs

@@ -167,7 +167,7 @@ namespace UnitTest_ColorPickerUI.Helpers
                     {
                         var color = Color.FromArgb(red, green, blue);
 
-                        Exception? exception = null;
+                        Exception exception = null;
 
                         try
                         {

src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj

@@ -2,20 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>UnitTest_ColorPickerUI</RootNamespace>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
-    <LangVersion>8.0</LangVersion>
-    <OutputType>Library</OutputType>
+    <Platforms>x64</Platforms>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
     <OutputPath>..\..\..\..\x64\Debug\modules\ColorPicker\UnitTest-ColorPickerUI\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
     <OutputPath>..\..\..\..\x64\Release\modules\ColorPicker\UnitTest-ColorPickerUI\</OutputPath>
   </PropertyGroup>
 

src/modules/fancyzones/editor/FancyZonesEditor/App.xaml.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -41,6 +42,8 @@ namespace FancyZonesEditor
         private const string CrashReportDynamicAssemblyTag = "dynamic assembly doesn't have location";
         private const string CrashReportLocationNullTag = "location is null or empty";
 
+        private readonly IFileSystem _fileSystem = new FileSystem();
+
         public Settings ZoneSettings { get; }
 
         public App()
@@ -157,6 +160,8 @@ namespace FancyZonesEditor
 
             sb.AppendLine("## " + CrashReportEnvironmentTag);
             sb.AppendLine(CrashReportCommandLineTag + Environment.CommandLine);
+
+            // Using InvariantCulture since this is used for a timestamp internally
             sb.AppendLine(CrashReportTimestampTag + DateTime.Now.ToString(CultureInfo.InvariantCulture));
             sb.AppendLine(CrashReportOSVersionTag + Environment.OSVersion.VersionString);
             sb.AppendLine(CrashReportIntPtrLengthTag + IntPtr.Size);

src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml

@@ -66,11 +66,11 @@
         <Style x:Key="secondaryButton" TargetType="Button">
             <Setter Property="FontFamily" Value="Segoe UI" />
             <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="Foreground" Value="White"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="0,5,0,5"/>
             <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Background" Value="#F2F2F2"/>
+            <Setter Property="Background" Value="#767676"/>
             <Setter Property="Margin" Value="16,10,0,0" />
             <Setter Property="Width" Value="239"/>
             <Setter Property="Height" Value="32"/>
@@ -85,7 +85,7 @@
             </Setter>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#BCBCBD"/>
+                    <Setter Property="Background" Value="#5D5D5D"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -154,7 +154,7 @@
             <Setter Property="Margin" Value="16,12,0,0"/>
         </Style>
         <Style x:Key="textBox" TargetType="TextBox">
-            <Setter Property="BorderBrush" Value="#cccccc"/>
+            <Setter Property="BorderBrush" Value="#949494"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="FontFamily" Value="SegoeUI"/>
             <Setter Property="FontWeight" Value="Regular"/>

src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows;
+using System.Windows.Input;
 using FancyZonesEditor.Models;
 
 namespace FancyZonesEditor
@@ -15,6 +16,9 @@ namespace FancyZonesEditor
         public CanvasEditorWindow()
         {
             InitializeComponent();
+
+            KeyUp += CanvasEditorWindow_KeyUp;
+
             _model = EditorOverlay.Current.DataContext as CanvasLayoutModel;
             _stashedModel = (CanvasLayoutModel)_model.Clone();
         }
@@ -41,6 +45,14 @@ namespace FancyZonesEditor
             _stashedModel.RestoreTo(_model);
         }
 
+        private void CanvasEditorWindow_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                OnCancel(sender, null);
+            }
+        }
+
         private int _offset = 100;
         private CanvasLayoutModel _model;
         private CanvasLayoutModel _stashedModel;

src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj

@@ -250,6 +250,9 @@
     <PackageReference Include="MahApps.Metro">
       <Version>2.3.2</Version>
     </PackageReference>
+    <PackageReference Include="System.IO.Abstractions">
+      <Version>12.2.5</Version>
+    </PackageReference>
     <PackageReference Include="System.Text.Json">
       <Version>4.7.2</Version>
     </PackageReference>

src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml

@@ -64,11 +64,11 @@
         <Style x:Key="secondaryButton" TargetType="Button">
             <Setter Property="FontFamily" Value="Segoe UI" />
             <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="Foreground" Value="White"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="0,5,0,5"/>
             <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Background" Value="#F2F2F2"/>
+            <Setter Property="Background" Value="#767676"/>
             <Setter Property="Width" Value="239"/>
             <Setter Property="Height" Value="32"/>
             <Setter Property="Template">
@@ -82,7 +82,7 @@
             </Setter>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#BCBCBD"/>
+                    <Setter Property="Background" Value="#5D5D5D"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -151,7 +151,7 @@
             <Setter Property="Margin" Value="0,12,0,0"/>
         </Style>
         <Style x:Key="textBox" TargetType="TextBox">
-            <Setter Property="BorderBrush" Value="#cccccc"/>
+            <Setter Property="BorderBrush" Value="#949494"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="FontFamily" Value="SegoeUI"/>
             <Setter Property="FontWeight" Value="Regular"/>
@@ -166,8 +166,8 @@
         <TextBlock Name="windowEditorDialogTitle" Text="{x:Static props:Resources.Custom_Table_Layout}" Style="{StaticResource titleText}"  />
 
         <TextBlock Text="{x:Static props:Resources.Note_Custom_Table}" Style="{StaticResource textLabel}" TextWrapping="Wrap" />
-        <TextBlock Text="{x:Static props:Resources.Name}" Style="{StaticResource textLabel}" />
-        <TextBox Text="{Binding Name}" Style="{StaticResource textBox}" />
+        <TextBlock x:Name="customLayoutName" Text="{x:Static props:Resources.Name}" Style="{StaticResource textLabel}" />
+        <TextBox Text="{Binding Name}" AutomationProperties.LabeledBy="{Binding ElementName=customLayoutName}" Style="{StaticResource textBox}" />
 <!--        
         <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
             <CheckBox x:Name="showGridSetting" VerticalAlignment="Center" HorizontalAlignment="Center" IsChecked="True" Margin="21,4,0,0"/>

src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows;
+using System.Windows.Input;
 using FancyZonesEditor.Models;
 
 namespace FancyZonesEditor
@@ -15,6 +16,9 @@ namespace FancyZonesEditor
         public GridEditorWindow()
         {
             InitializeComponent();
+
+            KeyUp += GridEditorWindow_KeyUp;
+
             _stashedModel = (GridLayoutModel)(EditorOverlay.Current.DataContext as GridLayoutModel).Clone();
         }
 
@@ -25,6 +29,14 @@ namespace FancyZonesEditor
             _stashedModel.RestoreTo(model);
         }
 
+        private void GridEditorWindow_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                OnCancel(sender, null);
+            }
+        }
+
         private GridLayoutModel _stashedModel;
     }
 }

src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml

@@ -42,7 +42,7 @@
         <Style x:Key="tabText" TargetType="TextBlock">
             <Setter Property="FontFamily" Value="Segoe UI" />
             <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="Foreground" Value="#C4C4C4"/>
+            <Setter Property="Foreground" Value="#767676"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="LineHeight" Value="20" />
             <Setter Property="Margin" Value="24,20,0,0" />
@@ -54,7 +54,7 @@
             <Setter Property="Foreground" Value="Black"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="LineHeight" Value="20" />
-            <Setter Property="Margin" Value="40,10,0,0" />
+            <Setter Property="Margin" Value="7,10,0,0" />
             <Setter Property="TextAlignment" Value="Left" />
         </Style>
         <Style x:Key="settingCheckBoxText" TargetType="CheckBox">
@@ -75,11 +75,11 @@
         <Style x:Key="secondaryButton" TargetType="Button">
             <Setter Property="FontFamily" Value="Segoe UI" />
             <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="Foreground" Value="White"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="0,5,0,5"/>
             <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Background" Value="#F2F2F2"/>
+            <Setter Property="Background" Value="#767676"/>
             <Setter Property="Margin" Value="16,0,0,0" />
             <Setter Property="Width" Value="378"/>
             <Setter Property="Height" Value="32"/>
@@ -94,7 +94,7 @@
             </Setter>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#BCBCBD"/>
+                    <Setter Property="Background" Value="#5D5D5D"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -258,13 +258,37 @@
             </TabItem>
         </TabControl>
 
-		<StackPanel Orientation="Horizontal" Margin="10,4,0,8">
-			<CheckBox x:Name="spaceAroundSetting" Content="{x:Static props:Resources.Show_Space_Zones}" Style="{StaticResource settingCheckBoxText}" IsChecked="{Binding ShowSpacing}"/>
-            <TextBlock x:Name="paddingValue" Text="{x:Static props:Resources.Space_Around_Zones}" Style="{StaticResource settingText}" IsEnabled="{Binding ShowSpacing}" />
-			<TextBox AutomationProperties.LabeledBy="{Binding ElementName=paddingValue}" Text="{Binding Path=Spacing,Mode=TwoWay}" Style="{StaticResource textBox}" MinWidth="32" IsEnabled="{Binding ShowSpacing}"/>
-            <TextBlock x:Name="sensitivityRadiusValue"  Text="{x:Static props:Resources.Distance_adjacent_zones}" Style="{StaticResource settingText}"/>
-			<TextBox AutomationProperties.LabeledBy="{Binding ElementName=sensitivityRadiusValue}" Text="{Binding Path=SensitivityRadius,Mode=TwoWay}" Style="{StaticResource textBox}" MinWidth="40"/>
-		</StackPanel>
+		<Grid Margin="10,4,10,8" >
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*" />
+                <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+            
+            <CheckBox x:Name="spaceAroundSetting" Content="{x:Static props:Resources.Show_Space_Zones}" Style="{StaticResource settingCheckBoxText}" IsChecked="{Binding ShowSpacing}" Grid.Row="0" Grid.Column="0"/>
+
+            <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
+                <TextBlock x:Name="paddingValue" 
+                           Text="{x:Static props:Resources.Space_Around_Zones}" 
+                           Style="{StaticResource settingText}" 
+                           IsEnabled="{Binding ShowSpacing}" 
+                           MaxWidth="{Binding Path=SettingsTextMaxWidth, ElementName=MainWindow1}" 
+                           TextWrapping="Wrap"/>
+                <TextBox AutomationProperties.LabeledBy="{Binding ElementName=paddingValue}" Text="{Binding Path=Spacing,Mode=TwoWay}" Style="{StaticResource textBox}" MinWidth="32" IsEnabled="{Binding ShowSpacing}" />
+            </StackPanel>
+
+            <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
+                <TextBlock x:Name="sensitivityRadiusValue"
+                           Text="{x:Static props:Resources.Distance_adjacent_zones}" 
+                           Style="{StaticResource settingText}" 
+                           MaxWidth="{Binding Path=SettingsTextMaxWidth, ElementName=MainWindow1}" 
+                           TextWrapping="Wrap"/>
+			    <TextBox AutomationProperties.LabeledBy="{Binding ElementName=sensitivityRadiusValue}" Text="{Binding Path=SensitivityRadius,Mode=TwoWay}" Style="{StaticResource textBox}" MinWidth="40"/>
+            </StackPanel>
+        </Grid>
 
 		<StackPanel Orientation="Horizontal" Margin="0,10,0,16">
 			<Button x:Name="EditCustomButton" Content="{x:Static props:Resources.Edit_Selected_Layout}" Padding="8" Style="{StaticResource secondaryButton}" Click="EditLayout_Click"/>

src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs

@@ -26,6 +26,14 @@ namespace FancyZonesEditor
 
         public int WrapPanelItemSize { get; set; } = 262;
 
+        public double SettingsTextMaxWidth
+        {
+            get
+            {
+                return (Width / 2) - 60;
+            }
+        }
+
         public MainWindow()
         {
             InitializeComponent();

src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs

@@ -4,7 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.IO.Abstractions;
 using System.Text.Json;
 using System.Windows;
 
@@ -201,7 +201,7 @@ namespace FancyZonesEditor.Models
             try
             {
                 string jsonString = JsonSerializer.Serialize(jsonObj, options);
-                File.WriteAllText(Settings.AppliedZoneSetTmpFile, jsonString);
+                FileSystem.File.WriteAllText(Settings.AppliedZoneSetTmpFile, jsonString);
             }
             catch (Exception ex)
             {

src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Windows;
 
@@ -237,7 +236,7 @@ namespace FancyZonesEditor.Models
             try
             {
                 string jsonString = JsonSerializer.Serialize(jsonObj, options);
-                File.WriteAllText(Settings.AppliedZoneSetTmpFile, jsonString);
+                FileSystem.File.WriteAllText(Settings.AppliedZoneSetTmpFile, jsonString);
             }
             catch (Exception ex)
             {

src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
@@ -29,6 +30,8 @@ namespace FancyZonesEditor.Models
     //  Manages common properties and base persistence
     public abstract class LayoutModel : INotifyPropertyChanged
     {
+        protected static readonly IFileSystem FileSystem = new FileSystem();
+
         // Localizable strings
         private const string ErrorMessageBoxTitle = "FancyZones Editor Exception Handler";
         private const string ErrorMessageBoxMessage = "Please report the bug to ";
@@ -194,7 +197,7 @@ namespace FancyZonesEditor.Models
             try
             {
                 string jsonString = JsonSerializer.Serialize(deletedLayouts, options);
-                File.WriteAllText(Settings.DeletedCustomZoneSetsTmpFile, jsonString);
+                FileSystem.File.WriteAllText(Settings.DeletedCustomZoneSetsTmpFile, jsonString);
             }
             catch (Exception ex)
             {
@@ -209,7 +212,7 @@ namespace FancyZonesEditor.Models
 
             try
             {
-                FileStream inputStream = File.Open(Settings.FancyZonesSettingsFile, FileMode.Open);
+                Stream inputStream = FileSystem.File.Open(Settings.FancyZonesSettingsFile, FileMode.Open);
                 JsonDocument jsonObject = JsonDocument.Parse(inputStream, options: default);
                 JsonElement.ArrayEnumerator customZoneSetsEnumerator = jsonObject.RootElement.GetProperty(CustomZoneSetsJsonTag).EnumerateArray();
 
@@ -437,7 +440,7 @@ namespace FancyZonesEditor.Models
             try
             {
                 string jsonString = JsonSerializer.Serialize(zoneSet, options);
-                File.WriteAllText(Settings.ActiveZoneSetTmpFile, jsonString);
+                FileSystem.File.WriteAllText(Settings.ActiveZoneSetTmpFile, jsonString);
             }
             catch (Exception ex)
             {

src/modules/fancyzones/editor/FancyZonesEditor/Models/Settings.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
+using System.IO.Abstractions;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Windows;
@@ -39,6 +40,8 @@ namespace FancyZonesEditor
             Debug,
         }
 
+        private static readonly IFileSystem _fileSystem = new FileSystem();
+
         private static CanvasLayoutModel _blankCustomModel;
         private readonly CanvasLayoutModel _focusModel;
         private readonly GridLayoutModel _rowsModel;
@@ -137,7 +140,7 @@ namespace FancyZonesEditor
 
         public Settings()
         {
-            string tmpDirPath = Path.GetTempPath();
+            string tmpDirPath = _fileSystem.Path.GetTempPath();
 
             ActiveZoneSetTmpFile = tmpDirPath + ActiveZoneSetsTmpFileName;
             AppliedZoneSetTmpFile = tmpDirPath + AppliedZoneSetsTmpFileName;
@@ -441,9 +444,9 @@ namespace FancyZonesEditor
                 ActiveZoneSetUUid = NullUuidStr;
                 JsonElement jsonObject = default(JsonElement);
 
-                if (File.Exists(Settings.ActiveZoneSetTmpFile))
+                if (_fileSystem.File.Exists(Settings.ActiveZoneSetTmpFile))
                 {
-                    FileStream inputStream = File.Open(Settings.ActiveZoneSetTmpFile, FileMode.Open);
+                    Stream inputStream = _fileSystem.File.Open(Settings.ActiveZoneSetTmpFile, FileMode.Open);
                     jsonObject = JsonDocument.Parse(inputStream, options: default).RootElement;
                     inputStream.Close();
                     UniqueKey = jsonObject.GetProperty(DeviceIdJsonTag).GetString();

src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -131,7 +131,7 @@
         <Str Cat="Text">
           <Val><![CDATA[FancyZones main editor]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Editor principal de FancyZones]]></Val>
+            <Val><![CDATA[Editor principal de Diseños sofisticados]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Vászon elrendezése – szerkesztő]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Ablakzónák – fő szerkesztő]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Editor layout area di disegno]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Editor principale FancyZones]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[キャンバス レイアウト エディター]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[FancyZones メイン エディター]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[캔버스 레이아웃 편집기]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[FancyZones 주 편집기]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Edytor układu kanwy]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Główny edytor Fantazyjnych stref]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Editor de esquema de tela]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Editor principal de Esquemas de Zonas]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Редактор макета холста]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Главный редактор FancyZones]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Redigeringsprogram för arbetsytelayout]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[FancyZones huvudredigeringsprogram]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[画布布局编辑器]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[FancyZones 主编辑器]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -37,6 +37,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Canvas_Layout_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Canvas layout editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[畫布版面配置編輯器]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Choose_Layout" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Choose your layout for this desktop]]></Val>
@@ -118,6 +127,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Fancy_Zones_Main_Editor" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[FancyZones main editor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[FancyZones 主編輯器]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Name" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Name]]></Val>

src/modules/fancyzones/lib/FancyZones.cpp

@@ -937,17 +937,13 @@ void FancyZones::AddZoneWindow(HMONITOR monitor, const std::wstring& deviceId) n
                 uniqueId = ZoneWindowUtils::GenerateUniqueIdAllMonitorsArea(virtualDesktopId.get());
             }
 
-            // "Turning FLASHING_ZONE option off"
-            //const bool flash = m_settings->GetSettings()->zoneSetChange_flashZones;
-            const bool flash = false;
-
             std::wstring parentId{};
             auto parentArea = m_workAreaHandler.GetWorkArea(m_previousDesktopId, monitor);
             if (parentArea)
             {
                 parentId = parentArea->UniqueId();
             }
-            auto workArea = MakeZoneWindow(this, m_hinstance, monitor, uniqueId, parentId, flash);
+            auto workArea = MakeZoneWindow(this, m_hinstance, monitor, uniqueId, parentId);
             if (workArea)
             {
                 m_workAreaHandler.AddWorkArea(m_currentDesktopId, monitor, workArea);

src/modules/fancyzones/lib/Resources.resx

@@ -119,30 +119,38 @@
   </resheader>
   <data name="Setting_Description" xml:space="preserve">
     <value>Create window layouts to help make multi-tasking easy</value>
+    <comment>this is NOT referring to the operating system.</comment>
   </data>
   <data name="Setting_Description_ShiftDrag" xml:space="preserve">
     <value>Hold Shift key to activate zones while dragging</value>
+    <comment>SHIFT is referring to keyboard key.</comment>
   </data>
   <data name="Setting_Description_MouseSwitch" xml:space="preserve">
     <value>Use a non-primary mouse button to toggle zone activation</value>
   </data>
   <data name="Setting_Description_Override_Snap_Hotkeys" xml:space="preserve">
     <value>Override Windows Snap hotkeys (Win + Arrow) to move windows between zones</value>
+    <comment>Windows is referring to OS. Win is referring to Windows Key, "Arrow" is referring to keyboard key.</comment>
   </data>
   <data name="Setting_Description_Move_Window_Across_Monitors" xml:space="preserve">
     <value>Move windows between zones across all monitors when snapping with (Win + Arrow)</value>
+    <comment>windows is referring to the display surfaces like applications, not the OS.  Win is referring to Windows Key, "Arrow" is referring to keyboard key.</comment>
   </data>
   <data name="Setting_Description_Move_Windows_Based_On_Position" xml:space="preserve">
     <value>Move windows based on their position when snapping with (Win + Arrow)</value>
+    <comment>windows is referring to the display surfaces like applications, not the OS.  Win is referring to Windows Key, "Arrow" is referring to keyboard key.</comment>
   </data>
   <data name="Setting_Description_DisplayChange_MoveWindows" xml:space="preserve">
     <value>Keep windows in their zones when the screen resolution changes</value>
+    <comment>windows is referring to the display surfaces like applications, not the OS.</comment>
   </data>
   <data name="Setting_Description_ZoneSetChange_MoveWindows" xml:space="preserve">
     <value>During zone layout changes, windows assigned to a zone will match new size/positions</value>
+    <comment>windows is referring to the display surfaces like applications, not the OS.</comment>
   </data>
   <data name="Setting_Description_ZoneSetChange_FlashZones" xml:space="preserve">
     <value>Flash zones when the active FancyZones layout changes</value>
+    <comment>Flash refers to blinking the zone so it appears/disappears.  FancyZones is the product name</comment>
   </data>
   <data name="Setting_Description_Show_Fancy_Zones_On_All_Monitors" xml:space="preserve">
     <value>Show zones on all monitors while dragging a window</value>
@@ -163,10 +171,11 @@
     <value>Zone highlight color (Default #008CFF)</value>
   </data>
   <data name="Setting_Description_Use_CursorPos_Editor_StartupScreen" xml:space="preserve">
-    <value>Follow mouse cursor instead of focus when launching editor in a multi screen environment</value>
+    <value>Follow mouse cursor instead of focus when launching editor in a multi-screen environment</value>
   </data>
   <data name="Setting_Description_AppLastZone_MoveWindows" xml:space="preserve">
     <value>Move newly created windows to their last known zone</value>
+    <comment>windows is referring to the display surfaces like applications, not the OS.</comment>
   </data>
   <data name="Setting_Description_Open_Window_On_Active_Monitor" xml:space="preserve">
     <value>Move newly created windows to the current active monitor [EXPERIMENTAL]</value>
@@ -182,18 +191,22 @@
   </data>
   <data name="Setting_Launch_Editor_Description" xml:space="preserve">
     <value>To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime</value>
+    <comment>"Edit zones" must match value from Setting_Launch_Editor_Button value</comment>
   </data>
   <data name="Setting_Launch_Editor_Hotkey_Label" xml:space="preserve">
     <value>Configure the zone editor hotkey</value>
   </data>
   <data name="Setting_Excluded_Apps_Description" xml:space="preserve">
     <value>To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.</value>
+    <comment>Windows refers to the Operating system</comment>
   </data>
   <data name="Settings_Highlight_Opacity" xml:space="preserve">
     <value>Zone opacity (%)</value>
+    <comment>a zone is a snapping region and can be transparent</comment>
   </data>
   <data name="FancyZones" xml:space="preserve">
     <value>FancyZones</value>
+    <comment>FancyZone is a product name, keep as is.</comment>
   </data>
   <data name="Cant_Drag_Elevated" xml:space="preserve">
     <value>We've detected an application running with administrator privileges. This blocks some functionality in PowerToys. Visit our wiki page to learn more.</value>
@@ -209,23 +222,29 @@
   </data>
   <data name="Window_Event_Listener_Error" xml:space="preserve">
     <value>Failed to install Windows event listener.</value>
+    <comment>Windows refers to the Operating system</comment>
   </data>
   <data name="Powertoys_FancyZones" xml:space="preserve">
     <value>PowerToys - FancyZones</value>
+    <comment>do not loc.  Both are product names</comment>
   </data>
   <data name="Span_Across_Zones_Warning" xml:space="preserve">
     <value>The 'Allow zones to span across monitors' option requires all monitors to have the same DPI scaling to work properly.</value>
   </data>
   <data name="FancyZones_Data_Error" xml:space="preserve">
     <value>FancyZones persisted data path not found. Please report the bug to</value>
+    <comment>"Report bug to" will have a URL after. FancyZone is a product name, keep as is.</comment>
   </data>
   <data name="FancyZones_Editor_Launch_Error" xml:space="preserve">
     <value>The FancyZones editor failed to start. Please report the bug to</value>
+    <comment>"Report bug to" will have a URL after. FancyZone is a product name, keep as is.</comment>
   </data>
   <data name="FancyZones_Settings_Load_Error" xml:space="preserve">
     <value>Failed to load the FancyZones settings. Default settings will be used.</value>
+    <comment>FancyZone is a product name, keep as is.</comment>
   </data>
   <data name="FancyZones_Settings_Save_Error" xml:space="preserve">
     <value>Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to</value>
+    <comment>"Report bug to" will have a URL after. FancyZone is a product name, keep as is.</comment>
   </data>
 </root>

src/modules/fancyzones/lib/ZoneWindow.cpp

@@ -61,54 +61,6 @@ namespace ZoneWindowUtils
 
         return result;
     }
-
-    void PaintZoneWindow(HDC hdc,
-                         HWND window,
-                         bool hasActiveZoneSet,
-                         COLORREF hostZoneColor,
-                         COLORREF hostZoneBorderColor,
-                         COLORREF hostZoneHighlightColor,
-                         int hostZoneHighlightOpacity,
-                         IZoneSet::ZonesMap zones,
-                         std::vector<size_t> highlightZone,
-                         bool flashMode)
-    {
-        PAINTSTRUCT ps;
-        HDC oldHdc = hdc;
-        if (!hdc)
-        {
-            hdc = BeginPaint(window, &ps);
-        }
-
-        RECT clientRect;
-        GetClientRect(window, &clientRect);
-
-        wil::unique_hdc hdcMem;
-        HPAINTBUFFER bufferedPaint = BeginBufferedPaint(hdc, &clientRect, BPBF_TOPDOWNDIB, nullptr, &hdcMem);
-        if (bufferedPaint)
-        {
-            ZoneWindowDrawing::DrawBackdrop(hdcMem, clientRect);
-
-            if (hasActiveZoneSet)
-            {
-                ZoneWindowDrawing::DrawActiveZoneSet(hdcMem,
-                                                     hostZoneColor,
-                                                     hostZoneBorderColor,
-                                                     hostZoneHighlightColor,
-                                                     hostZoneHighlightOpacity,
-                                                     zones,
-                                                     highlightZone,
-                                                     flashMode);
-            }
-
-            EndBufferedPaint(bufferedPaint, TRUE);
-        }
-
-        if (!oldHdc)
-        {
-            EndPaint(window, &ps);
-        }
-    }
 }
 
 struct ZoneWindow : public winrt::implements<ZoneWindow, IZoneWindow>
@@ -117,7 +69,7 @@ public:
     ZoneWindow(HINSTANCE hinstance);
     ~ZoneWindow();
 
-    bool Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones);
+    bool Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId);
 
     IFACEMETHODIMP MoveSizeEnter(HWND window) noexcept;
     IFACEMETHODIMP MoveSizeUpdate(POINT const& ptScreen, bool dragEnabled, bool selectManyZones) noexcept;
@@ -157,18 +109,15 @@ private:
     void CalculateZoneSet() noexcept;
     void UpdateActiveZoneSet(_In_opt_ IZoneSet* zoneSet) noexcept;
     LRESULT WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept;
-    void OnPaint(HDC hdc) noexcept;
     void OnKeyUp(WPARAM wparam) noexcept;
     std::vector<size_t> ZonesFromPoint(POINT pt) noexcept;
     void CycleActiveZoneSetInternal(DWORD wparam, Trace::ZoneWindow::InputMode mode) noexcept;
-    void FlashZones() noexcept;
 
     winrt::com_ptr<IZoneWindowHost> m_host;
     HMONITOR m_monitor{};
     std::wstring m_uniqueId; // Parsed deviceId + resolution + virtualDesktopId
     wil::unique_hwnd m_window{}; // Hidden tool window used to represent current monitor desktop work area.
     HWND m_windowMoveSize{};
-    bool m_flashMode{};
     winrt::com_ptr<IZoneSet> m_activeZoneSet;
     std::vector<winrt::com_ptr<IZoneSet>> m_zoneSets;
     std::vector<size_t> m_initialHighlightZone;
@@ -177,10 +126,7 @@ private:
     size_t m_keyCycle{};
     static const UINT m_showAnimationDuration = 200; // ms
     static const UINT m_flashDuration = 700; // ms
-    
-    std::atomic<bool> m_animating;
-    OnThreadExecutor m_paintExecutor;
-    ULONG_PTR gdiplusToken;
+    std::unique_ptr<ZoneWindowDrawing> m_zoneWindowDrawing;
 };
 
 ZoneWindow::ZoneWindow(HINSTANCE hinstance)
@@ -192,19 +138,13 @@ ZoneWindow::ZoneWindow(HINSTANCE hinstance)
     wcex.lpszClassName = NonLocalizable::ToolWindowClassName;
     wcex.hCursor = LoadCursorW(nullptr, IDC_ARROW);
     RegisterClassExW(&wcex);
-
-    Gdiplus::GdiplusStartupInput gdiplusStartupInput;
-    Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
-    m_paintExecutor.submit(OnThreadExecutor::task_t{ []() { BufferedPaintInit(); } });
 }
 
 ZoneWindow::~ZoneWindow()
 {
-    Gdiplus::GdiplusShutdown(gdiplusToken);
-    m_paintExecutor.submit(OnThreadExecutor::task_t{ []() { BufferedPaintUnInit(); } });
 }
 
-bool ZoneWindow::Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones)
+bool ZoneWindow::Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId)
 {
     m_host.copy_from(host);
 
@@ -240,22 +180,7 @@ bool ZoneWindow::Init(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monit
 
     MakeWindowTransparent(m_window.get());
 
-    // Ignore flashZones
-    /*
-    if (flashZones)
-    {
-        // Don't flash if the foreground window is in full screen mode
-        RECT windowRect;
-        if (!(GetWindowRect(GetForegroundWindow(), &windowRect) &&
-              windowRect.left == mi.rcMonitor.left &&
-              windowRect.top == mi.rcMonitor.top &&
-              windowRect.right == mi.rcMonitor.right &&
-              windowRect.bottom == mi.rcMonitor.bottom))
-        {
-            FlashZones();
-        }
-    }
-    */
+    m_zoneWindowDrawing = std::make_unique<ZoneWindowDrawing>(m_window.get());
 
     return true;
 }
@@ -307,8 +232,9 @@ IFACEMETHODIMP ZoneWindow::MoveSizeUpdate(POINT const& ptScreen, bool dragEnable
 
     if (redraw)
     {
-        InvalidateRect(m_window.get(), nullptr, true);
+        m_zoneWindowDrawing->DrawActiveZoneSet(m_activeZoneSet->GetZones(), m_highlightZone, m_host);
     }
+    
     return S_OK;
 }
 
@@ -406,10 +332,6 @@ ZoneWindow::CycleActiveZoneSet(DWORD wparam) noexcept
     {
         InvalidateRect(m_window.get(), nullptr, true);
     }
-    else
-    {
-        FlashZones();
-    }
 }
 
 IFACEMETHODIMP_(void)
@@ -440,8 +362,6 @@ ZoneWindow::ShowZoneWindow() noexcept
         return;
     }
 
-    m_flashMode = false;
-
     UINT flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE;
 
     HWND windowInsertAfter = m_windowMoveSize;
@@ -451,18 +371,8 @@ ZoneWindow::ShowZoneWindow() noexcept
     }
 
     SetWindowPos(window, windowInsertAfter, 0, 0, 0, 0, flags);
-
-    std::thread{ [this, strong_this{ get_strong() }]() {
-        m_animating = true;
-        auto window = m_window.get();
-        AnimateWindow(window, m_showAnimationDuration, AW_BLEND);
-        InvalidateRect(window, nullptr, true);
-        if (!m_host->InMoveSize())
-        {
-            HideZoneWindow();
-        }
-        m_animating = false;
-    } }.detach();
+    m_zoneWindowDrawing->Show(m_showAnimationDuration);
+    m_zoneWindowDrawing->DrawActiveZoneSet(m_activeZoneSet->GetZones(), m_highlightZone, m_host);
 }
 
 IFACEMETHODIMP_(void)
@@ -470,7 +380,7 @@ ZoneWindow::HideZoneWindow() noexcept
 {
     if (m_window)
     {
-        ShowWindow(m_window.get(), SW_HIDE);
+        m_zoneWindowDrawing->Hide();
         m_keyLast = 0;
         m_windowMoveSize = nullptr;
         m_highlightZone = {};
@@ -489,7 +399,7 @@ ZoneWindow::ClearSelectedZones() noexcept
     if (m_highlightZone.size())
     {
         m_highlightZone.clear();
-        InvalidateRect(m_window.get(), nullptr, true);
+        m_zoneWindowDrawing->DrawActiveZoneSet(m_activeZoneSet->GetZones(), m_highlightZone, m_host);
     }
 }
 
@@ -533,7 +443,7 @@ void ZoneWindow::CalculateZoneSet() noexcept
             activeZoneSet.type,
             m_monitor,
             sensitivityRadius));
-        
+
         RECT workArea;
         if (m_monitor)
         {
@@ -556,9 +466,9 @@ void ZoneWindow::CalculateZoneSet() noexcept
         bool showSpacing = deviceInfoData->showSpacing;
         int spacing = showSpacing ? deviceInfoData->spacing : 0;
         int zoneCount = deviceInfoData->zoneCount;
-        
+
         zoneSet->CalculateZones(workArea, zoneCount, spacing);
-        UpdateActiveZoneSet(zoneSet.get());        
+        UpdateActiveZoneSet(zoneSet.get());
     }
 }
 
@@ -594,16 +504,11 @@ LRESULT ZoneWindow::WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept
     case WM_ERASEBKGND:
         return 1;
 
-    case WM_PRINTCLIENT:
-    {
-        OnPaint(reinterpret_cast<HDC>(wparam));
-    }
-    break;
     case WM_PAINT:
     {
-        OnPaint(NULL);
+        m_zoneWindowDrawing->ForceRender();
+        break;
     }
-    break;
 
     default:
     {
@@ -613,52 +518,6 @@ LRESULT ZoneWindow::WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexcept
     return 0;
 }
 
-void ZoneWindow::OnPaint(HDC hdc) noexcept
-{
-    HWND window = m_window.get();
-    bool hasActiveZoneSet = m_activeZoneSet && m_host;
-    COLORREF hostZoneColor{};
-    COLORREF hostZoneBorderColor{};
-    COLORREF hostZoneHighlightColor{};
-    int hostZoneHighlightOpacity{};
-    IZoneSet::ZonesMap zones;
-    std::vector<size_t> highlightZone = m_highlightZone;
-    bool flashMode = m_flashMode;
-
-    if (hasActiveZoneSet)
-    {
-        hostZoneColor = m_host->GetZoneColor();
-        hostZoneBorderColor = m_host->GetZoneBorderColor();
-        hostZoneHighlightColor = m_host->GetZoneHighlightColor();
-        hostZoneHighlightOpacity = m_host->GetZoneHighlightOpacity();
-        zones = m_activeZoneSet->GetZones();
-    }
-
-    OnThreadExecutor::task_t task{
-        [=]() {
-        ZoneWindowUtils::PaintZoneWindow(hdc,
-                                         window,
-                                         hasActiveZoneSet,
-                                         hostZoneColor,
-                                         hostZoneBorderColor,
-                                         hostZoneHighlightColor,
-                                         hostZoneHighlightOpacity,
-                                         zones,
-                                         highlightZone,
-                                         flashMode);
-        } };
-
-    if (m_animating)
-    {
-        task();
-    }
-    else
-    {
-        m_paintExecutor.cancel();
-        m_paintExecutor.submit(std::move(task));
-    }
-}
-
 void ZoneWindow::OnKeyUp(WPARAM wparam) noexcept
 {
     bool fRedraw = false;
@@ -667,7 +526,7 @@ void ZoneWindow::OnKeyUp(WPARAM wparam) noexcept
     if ((wparam >= '0') && (wparam <= '9'))
     {
         CycleActiveZoneSetInternal(static_cast<DWORD>(wparam), Trace::ZoneWindow::InputMode::Keyboard);
-        InvalidateRect(m_window.get(), nullptr, true);
+        m_zoneWindowDrawing->DrawActiveZoneSet(m_activeZoneSet->GetZones(), m_highlightZone, m_host);
     }
 }
 
@@ -728,21 +587,6 @@ void ZoneWindow::CycleActiveZoneSetInternal(DWORD wparam, Trace::ZoneWindow::Inp
     m_highlightZone = {};
 }
 
-void ZoneWindow::FlashZones() noexcept
-{
-    // "Turning FLASHING_ZONE option off"
-    if (true)
-    {
-        return;
-    }
-
-    m_flashMode = true;
-
-    ShowWindow(m_window.get(), SW_SHOWNA);
-    std::thread([window = m_window.get()]() {
-        AnimateWindow(window, m_flashDuration, AW_HIDE | AW_BLEND);
-    }).detach();
-}
 #pragma endregion
 
 LRESULT CALLBACK ZoneWindow::s_WndProc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) noexcept
@@ -759,10 +603,10 @@ LRESULT CALLBACK ZoneWindow::s_WndProc(HWND window, UINT message, WPARAM wparam,
                                   DefWindowProc(window, message, wparam, lparam);
 }
 
-winrt::com_ptr<IZoneWindow> MakeZoneWindow(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones) noexcept
+winrt::com_ptr<IZoneWindow> MakeZoneWindow(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor, const std::wstring& uniqueId, const std::wstring& parentUniqueId) noexcept
 {
     auto self = winrt::make_self<ZoneWindow>(hinstance);
-    if (self->Init(host, hinstance, monitor, uniqueId, parentUniqueId, flashZones))
+    if (self->Init(host, hinstance, monitor, uniqueId, parentUniqueId))
     {
         return self;
     }

src/modules/fancyzones/lib/ZoneWindow.h

@@ -127,4 +127,4 @@ interface __declspec(uuid("{7F017528-8110-4FB3-BE41-F472969C2560}")) IZoneWindow
 };
 
 winrt::com_ptr<IZoneWindow> MakeZoneWindow(IZoneWindowHost* host, HINSTANCE hinstance, HMONITOR monitor,
-    const std::wstring& uniqueId, const std::wstring& parentUniqueId, bool flashZones) noexcept;
+    const std::wstring& uniqueId, const std::wstring& parentUniqueId) noexcept;

src/modules/fancyzones/lib/ZoneWindowDrawing.cpp

@@ -11,155 +11,303 @@ namespace NonLocalizable
     const wchar_t SegoeUiFont[] = L"Segoe ui";
 }
 
-namespace
+float ZoneWindowDrawing::GetAnimationAlpha()
 {
-    void InitRGB(_Out_ RGBQUAD* quad, BYTE alpha, COLORREF color)
+    // Lock is being held
+    if (!m_animation)
     {
-        ZeroMemory(quad, sizeof(*quad));
-        quad->rgbReserved = alpha;
-        quad->rgbRed = GetRValue(color) * alpha / 255;
-        quad->rgbGreen = GetGValue(color) * alpha / 255;
-        quad->rgbBlue = GetBValue(color) * alpha / 255;
+        return 1.f;
     }
 
-    void FillRectARGB(wil::unique_hdc& hdc, RECT const* prcFill, BYTE alpha, COLORREF color, bool blendAlpha)
+    auto tNow = std::chrono::steady_clock().now();
+    auto alpha = (tNow - m_animation->tStart).count() / (1e6f * m_animation->duration);
+    if (alpha < 1.f)
     {
-        BITMAPINFO bi;
-        ZeroMemory(&bi, sizeof(bi));
-        bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-        bi.bmiHeader.biWidth = 1;
-        bi.bmiHeader.biHeight = 1;
-        bi.bmiHeader.biPlanes = 1;
-        bi.bmiHeader.biBitCount = 32;
-        bi.bmiHeader.biCompression = BI_RGB;
-
-        RECT fillRect;
-        CopyRect(&fillRect, prcFill);
-
-        RGBQUAD bitmapBits;
-        InitRGB(&bitmapBits, alpha, color);
-        StretchDIBits(
-            hdc.get(),
-            fillRect.left,
-            fillRect.top,
-            fillRect.right - fillRect.left,
-            fillRect.bottom - fillRect.top,
-            0,
-            0,
-            1,
-            1,
-            &bitmapBits,
-            &bi,
-            DIB_RGB_COLORS,
-            SRCCOPY);
+        return alpha;
     }
-
-    BYTE OpacitySettingToAlpha(int opacity)
+    else
     {
-        return static_cast<BYTE>(opacity * 2.55);
-    }
-
-    void DrawIndex(wil::unique_hdc& hdc, FancyZonesUtils::Rect rect, size_t index)
-    {
-        Gdiplus::Graphics g(hdc.get());
-
-        Gdiplus::FontFamily fontFamily(NonLocalizable::SegoeUiFont);
-        Gdiplus::Font font(&fontFamily, 80, Gdiplus::FontStyleRegular, Gdiplus::UnitPixel);
-        Gdiplus::SolidBrush solidBrush(Gdiplus::Color(255, 0, 0, 0));
-
-        std::wstring text = std::to_wstring(index);
-
-        g.SetTextRenderingHint(Gdiplus::TextRenderingHintAntiAlias);
-        Gdiplus::StringFormat stringFormat = new Gdiplus::StringFormat();
-        stringFormat.SetAlignment(Gdiplus::StringAlignmentCenter);
-        stringFormat.SetLineAlignment(Gdiplus::StringAlignmentCenter);
-
-        Gdiplus::RectF gdiRect(static_cast<Gdiplus::REAL>(rect.left()),
-                               static_cast<Gdiplus::REAL>(rect.top()),
-                               static_cast<Gdiplus::REAL>(rect.width()),
-                               static_cast<Gdiplus::REAL>(rect.height()));
-
-        g.DrawString(text.c_str(), -1, &font, gdiRect, &stringFormat, &solidBrush);
-    }
-
-    void DrawZone(wil::unique_hdc& hdc, ZoneWindowDrawing::ColorSetting const& colorSetting, winrt::com_ptr<IZone> zone, bool flashMode)noexcept
-    {
-        RECT zoneRect = zone->GetZoneRect();
-
-        Gdiplus::Graphics g(hdc.get());
-        Gdiplus::Color fillColor(colorSetting.fillAlpha, GetRValue(colorSetting.fill), GetGValue(colorSetting.fill), GetBValue(colorSetting.fill));
-        Gdiplus::Color borderColor(colorSetting.borderAlpha, GetRValue(colorSetting.border), GetGValue(colorSetting.border), GetBValue(colorSetting.border));
-
-        Gdiplus::Rect rectangle(zoneRect.left, zoneRect.top, zoneRect.right - zoneRect.left - 1, zoneRect.bottom - zoneRect.top - 1);
-
-        Gdiplus::Pen pen(borderColor, static_cast<Gdiplus::REAL>(colorSetting.thickness));
-        g.FillRectangle(new Gdiplus::SolidBrush(fillColor), rectangle);
-        g.DrawRectangle(&pen, rectangle);
-
-        if (!flashMode)
-        {
-            DrawIndex(hdc, zoneRect, zone->Id() + 1);
-        }
+        return 1.f;
     }
 }
 
-namespace ZoneWindowDrawing
+ID2D1Factory* ZoneWindowDrawing::GetD2DFactory()
 {
-    void DrawBackdrop(wil::unique_hdc& hdc, RECT const& clientRect) noexcept
+    static auto pD2DFactory = [] {
+        ID2D1Factory* res = nullptr;
+        D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &res);
+        return res;
+    }();
+    return pD2DFactory;
+}
+
+IDWriteFactory* ZoneWindowDrawing::GetWriteFactory()
+{
+    static auto pDWriteFactory = [] {
+        IUnknown* res = nullptr;
+        DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), &res);
+        return reinterpret_cast<IDWriteFactory*>(res);
+    }();
+    return pDWriteFactory;
+}
+
+D2D1_COLOR_F ZoneWindowDrawing::ConvertColor(COLORREF color)
+{
+    return D2D1::ColorF(GetRValue(color) / 255.f,
+                        GetGValue(color) / 255.f,
+                        GetBValue(color) / 255.f,
+                        1.f);
+}
+
+D2D1_RECT_F ZoneWindowDrawing::ConvertRect(RECT rect)
+{
+    return D2D1::RectF((float)rect.left + 0.5f, (float)rect.top + 0.5f, (float)rect.right - 0.5f, (float)rect.bottom - 0.5f);
+}
+
+ZoneWindowDrawing::ZoneWindowDrawing(HWND window)
+{
+    m_window = window;
+    m_renderTarget = nullptr;
+    m_shouldRender = false;
+
+    // Obtain the size of the drawing area.
+    if (!GetClientRect(window, &m_clientRect))
     {
-        FillRectARGB(hdc, &clientRect, 0, RGB(0, 0, 0), false);
+        return;
     }
 
-    void DrawActiveZoneSet(wil::unique_hdc& hdc,
-                           COLORREF zoneColor,
-                           COLORREF zoneBorderColor,
-                           COLORREF highlightColor,
-                           int zoneOpacity,
-                           const IZoneSet::ZonesMap& zones,
-                           const std::vector<size_t>& highlightZones,
-                           bool flashMode) noexcept
+    // Create a Direct2D render target
+    // We should always use the DPI value of 96 since we're running in DPI aware mode
+    GetD2DFactory()->CreateHwndRenderTarget(
+        D2D1::RenderTargetProperties(
+            D2D1_RENDER_TARGET_TYPE_DEFAULT,
+            D2D1::PixelFormat(DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED),
+            96.f,
+            96.f),
+        D2D1::HwndRenderTargetProperties(
+            window,
+            D2D1::SizeU(
+                m_clientRect.right - m_clientRect.left,
+                m_clientRect.bottom - m_clientRect.top)),
+        &m_renderTarget);
+
+    m_renderThread = std::thread([this]() {
+        while (!m_abortThread)
+        {
+            // Force repeated rendering while in the animation loop.
+            // Yield if low latency locking was requested
+            if (!m_lowLatencyLock)
+            {
+                float animationAlpha;
+                {
+                    std::unique_lock lock(m_mutex);
+                    animationAlpha = GetAnimationAlpha();
+                }
+
+                if (animationAlpha < 1.f)
+                {
+                    m_shouldRender = true;
+                }
+            }
+
+            Render();
+        }
+    });
+}
+
+void ZoneWindowDrawing::Render()
+{
+    std::unique_lock lock(m_mutex);
+
+    if (!m_renderTarget)
     {
-        //                                 { fillAlpha, fill, borderAlpha, border, thickness }
-        ColorSetting colorViewer{ OpacitySettingToAlpha(zoneOpacity), 0, 255, RGB(40, 50, 60), -2 };
-        ColorSetting colorHighlight{ OpacitySettingToAlpha(zoneOpacity), 0, 255, 0, -2 };
-        ColorSetting const colorFlash{ OpacitySettingToAlpha(zoneOpacity), RGB(81, 92, 107), 200, RGB(104, 118, 138), -2 };
+        return;
+    }
 
-        // First draw the inactive zones
-        for (auto iter = zones.begin(); iter != zones.end(); iter++)
+    m_cv.wait(lock, [this]() { return (bool)m_shouldRender; });
+
+    m_renderTarget->BeginDraw();
+    
+    float animationAlpha = GetAnimationAlpha();
+
+    // Draw backdrop
+    m_renderTarget->Clear(D2D1::ColorF(0.f, 0.f, 0.f, 0.f));
+
+    ID2D1SolidColorBrush* textBrush = nullptr;
+    IDWriteTextFormat* textFormat = nullptr;
+
+    m_renderTarget->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::Black, animationAlpha), &textBrush);
+    auto writeFactory = GetWriteFactory();
+
+    if (writeFactory)
+    {
+        writeFactory->CreateTextFormat(NonLocalizable::SegoeUiFont, nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 80.f, L"en-US", &textFormat);
+    }
+
+    for (auto drawableRect : m_sceneRects)
+    {
+        ID2D1SolidColorBrush* borderBrush = nullptr;
+        ID2D1SolidColorBrush* fillBrush = nullptr;
+
+        // Need to copy the rect from m_sceneRects
+        drawableRect.borderColor.a *= animationAlpha;
+        drawableRect.fillColor.a *= animationAlpha;
+
+        m_renderTarget->CreateSolidColorBrush(drawableRect.borderColor, &borderBrush);
+        m_renderTarget->CreateSolidColorBrush(drawableRect.fillColor, &fillBrush);
+
+        if (fillBrush)
         {
-            winrt::com_ptr<IZone> zone = iter->second;
-            size_t zoneId = zone->Id();
-            if (!zone)
-            {
-                continue;
-            }
-
-            auto zoneIt = std::find(highlightZones.begin(), highlightZones.end(), zoneId);
-            if (zoneIt == highlightZones.end())
-            {
-                if (flashMode)
-                {
-                    DrawZone(hdc, colorFlash, zone, flashMode);
-                }
-                else
-                {
-                    colorViewer.fill = zoneColor;
-                    colorViewer.border = zoneBorderColor;
-                    DrawZone(hdc, colorViewer, zone, flashMode);
-                }
-            }
+            m_renderTarget->FillRectangle(drawableRect.rect, fillBrush);
+            fillBrush->Release();
         }
 
-        // Draw the active zones on top of the inactive zones
-        for (const auto& zoneId : highlightZones)
+        if (borderBrush)
         {
-            colorHighlight.fill = highlightColor;
-            colorHighlight.border = zoneBorderColor;
-
-            if (zones.contains(zoneId))
-            {
-                DrawZone(hdc, colorHighlight, zones.at(zoneId), flashMode);
-            }
+            m_renderTarget->DrawRectangle(drawableRect.rect, borderBrush);
+            borderBrush->Release();
         }
+
+        std::wstring idStr = std::to_wstring(drawableRect.id + 1);
+
+        if (textFormat && textBrush)
+        {
+            textFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER);
+            textFormat->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER);
+            m_renderTarget->DrawTextW(idStr.c_str(), (UINT32)idStr.size(), textFormat, drawableRect.rect, textBrush);
+        }
+    }
+
+    if (textFormat)
+    {
+        textFormat->Release();
+    }
+
+    if (textBrush)
+    {
+        textBrush->Release();
+    }
+
+    m_renderTarget->EndDraw();
+    m_shouldRender = false;
+}
+
+void ZoneWindowDrawing::Hide()
+{
+    m_lowLatencyLock = true;
+    std::unique_lock lock(m_mutex);
+    m_lowLatencyLock = false;
+
+    if (m_animation)
+    {
+        m_animation.reset();
+        ShowWindow(m_window, SW_HIDE);
     }
 }
+
+void ZoneWindowDrawing::Show(unsigned animationMillis)
+{
+    m_lowLatencyLock = true;
+    std::unique_lock lock(m_mutex);
+    m_lowLatencyLock = false;
+
+    if (!m_animation)
+    {
+        ShowWindow(m_window, SW_SHOWDEFAULT);
+        if (animationMillis > 0)
+        {
+            m_animation.emplace(AnimationInfo{ std::chrono::steady_clock().now(), animationMillis });
+        }
+        m_shouldRender = true;
+        m_cv.notify_all();
+    }
+}
+
+void ZoneWindowDrawing::DrawActiveZoneSet(const IZoneSet::ZonesMap& zones,
+                       const std::vector<size_t>& highlightZones,
+                       winrt::com_ptr<IZoneWindowHost> host)
+{
+    m_lowLatencyLock = true;
+    std::unique_lock lock(m_mutex);
+    m_lowLatencyLock = false;
+
+    m_sceneRects = {};
+
+    auto borderColor = ConvertColor(host->GetZoneBorderColor());
+    auto inactiveColor = ConvertColor(host->GetZoneColor());
+    auto highlightColor = ConvertColor(host->GetZoneHighlightColor());
+
+    inactiveColor.a = host->GetZoneHighlightOpacity() / 100.f;
+    highlightColor.a = host->GetZoneHighlightOpacity() / 100.f;
+
+    std::vector<bool> isHighlighted(zones.size() + 1, false);
+    for (size_t x : highlightZones)
+    {
+        isHighlighted[x] = true;
+    }
+
+    // First draw the inactive zones
+    for (const auto& [zoneId, zone] : zones)
+    {
+        if (!zone)
+        {
+            continue;
+        }
+
+        if (!isHighlighted[zoneId])
+        {
+            DrawableRect drawableRect{
+                .rect = ConvertRect(zone->GetZoneRect()),
+                .borderColor = borderColor,
+                .fillColor = inactiveColor,
+                .id = zone->Id()
+            };
+
+            m_sceneRects.push_back(drawableRect);
+        }
+    }
+
+    // Draw the active zones on top of the inactive zones
+    for (const auto& [zoneId, zone] : zones)
+    {
+        if (!zone)
+        {
+            continue;
+        }
+
+        if (isHighlighted[zoneId])
+        {
+            DrawableRect drawableRect{
+                .rect = ConvertRect(zone->GetZoneRect()),
+                .borderColor = borderColor,
+                .fillColor = highlightColor,
+                .id = zone->Id()
+            };
+
+            m_sceneRects.push_back(drawableRect);
+        }
+    }
+
+    m_shouldRender = true;
+    m_cv.notify_all();
+}
+
+void ZoneWindowDrawing::ForceRender()
+{
+    m_lowLatencyLock = true;
+    std::unique_lock lock(m_mutex);
+    m_lowLatencyLock = false;
+    m_shouldRender = true;
+    m_cv.notify_all();
+}
+
+ZoneWindowDrawing::~ZoneWindowDrawing()
+{
+    {
+        std::unique_lock lock(m_mutex);
+        m_abortThread = true;
+        m_shouldRender = true;
+    }
+    m_cv.notify_all();
+    m_renderThread.join();
+}

src/modules/fancyzones/lib/ZoneWindowDrawing.h

@@ -4,29 +4,59 @@
 #include <vector>
 #include <wil\resource.h>
 #include <winrt/base.h>
+#include <d2d1.h>
+#include <dwrite.h>
 
 #include "util.h"
 #include "Zone.h"
 #include "ZoneSet.h"
+#include "FancyZones.h"
 
-namespace ZoneWindowDrawing
+class ZoneWindowDrawing
 {
-    struct ColorSetting
+    struct DrawableRect
     {
-        BYTE fillAlpha{};
-        COLORREF fill{};
-        BYTE borderAlpha{};
-        COLORREF border{};
-        int thickness{};
+        D2D1_RECT_F rect;
+        D2D1_COLOR_F borderColor;
+        D2D1_COLOR_F fillColor;
+        size_t id;
     };
 
-    void DrawBackdrop(wil::unique_hdc& hdc, RECT const& clientRect) noexcept;
-    void DrawActiveZoneSet(wil::unique_hdc& hdc,
-                           COLORREF zoneColor,
-                           COLORREF zoneBorderColor,
-                           COLORREF highlightColor,
-                           int zoneOpacity,
-                           const IZoneSet::ZonesMap& zones,
+    struct AnimationInfo
+    {
+        std::chrono::steady_clock::time_point tStart;
+        unsigned duration;
+    };
+
+    HWND m_window;
+    RECT m_clientRect;
+    ID2D1HwndRenderTarget* m_renderTarget;
+    std::optional<AnimationInfo> m_animation;
+
+    std::mutex m_mutex;
+    std::vector<DrawableRect> m_sceneRects;
+
+    float GetAnimationAlpha();
+    static ID2D1Factory* GetD2DFactory();
+    static IDWriteFactory* GetWriteFactory();
+    static D2D1_COLOR_F ConvertColor(COLORREF color);
+    static D2D1_RECT_F ConvertRect(RECT rect);
+    void Render();
+
+    std::atomic<bool> m_shouldRender;
+    std::atomic<bool> m_abortThread;
+    std::atomic<bool> m_lowLatencyLock;
+    std::condition_variable m_cv;
+    std::thread m_renderThread;
+
+public:
+
+    ~ZoneWindowDrawing();
+    ZoneWindowDrawing(HWND window);
+    void Hide();
+    void Show(unsigned animationMillis);
+    void ForceRender();
+    void DrawActiveZoneSet(const IZoneSet::ZonesMap& zones,
                            const std::vector<size_t>& highlightZones,
-                           bool flashMode) noexcept;
-}
+                           winrt::com_ptr<IZoneWindowHost> host);
+};

src/modules/fancyzones/lib/loc/cs/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[Při spouštění editoru v prostředí s více obrazovkami sledovat ukazatel myši místo fokusu]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/de/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[Beim Start des Editors in einer Umgebung mit mehreren Monitoren Mauszeiger statt Fokus folgen]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/it/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Segui puntatore del mouse anziché lo stato attivo all'avvio dell'editor in un ambiente multischermo]]></Val>
+            <Val><![CDATA[Consente di seguire il puntatore del mouse anziché lo stato attivo all'avvio dell'editor in un ambiente multischermo]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/ja/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[マルチスクリーン環境でエディターを起動するときに、フォーカスする代わりにマウス カーソルの動きを追います]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/ko/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다중 화면 환경에서 편집기를 시작할 때 포커스 대신 마우스 커서를 따름]]></Val>
+            <Val><![CDATA[멀티스크린 환경에서 편집기를 시작할 때 포커스 대신 마우스 커서를 따름]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/pl/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[Podążaj za kursorem myszy zamiast fokusu podczas uruchamiania edytora w środowisku wieloekranowym]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/sv/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Följ musmarkören i stället för fokus när du startar redigeringsprogrammet i en flerskärmsmiljö]]></Val>
+            <Val><![CDATA[Följ musmarkören i stället för fokusmarkören när du startar redigeringsprogrammet i en flerskärmsmiljö]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/lib/loc/zh-Hans/src/modules/fancyzones/lib/Resources.resx.lcl

@@ -37,7 +37,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -46,7 +46,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Data_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[FancyZones persisted data path not found. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -55,7 +55,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Editor_Launch_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The FancyZones editor failed to start. Please report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -64,7 +64,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Load_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to load the FancyZones settings. Default settings will be used.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -73,7 +73,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";FancyZones_Settings_Save_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the FancyZones settings. Please retry again later, if the problem persists report the bug to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -91,7 +91,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Powertoys_FancyZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[PowerToys - FancyZones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -100,7 +100,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Create window layouts to help make multi-tasking easy]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -109,7 +109,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_AppLastZone_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move newly created windows to their last known zone]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -118,7 +118,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_DisplayChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Keep windows in their zones when the screen resolution changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -145,7 +145,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Window_Across_Monitors" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows between zones across all monitors when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -154,7 +154,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Move_Windows_Based_On_Position" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Move windows based on their position when snapping with (Win + Arrow)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -172,7 +172,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_Override_Snap_Hotkeys" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Override Windows Snap hotkeys (Win + Arrow) to move windows between zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -190,7 +190,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ShiftDrag" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Hold Shift key to activate zones while dragging]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -219,10 +219,13 @@
       </Item>
       <Item ItemId=";Setting_Description_Use_CursorPos_Editor_StartupScreen" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi-screen environment]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[在多屏环境中启动编辑器时，跟随鼠标光标，而不是焦点]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Follow mouse cursor instead of focus when launching editor in a multi screen environment]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -244,7 +247,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_FlashZones" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Flash zones when the active FancyZones layout changes]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -253,7 +256,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Description_ZoneSetChange_MoveWindows" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[During zone layout changes, windows assigned to a zone will match new size/positions]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -271,7 +274,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Excluded_Apps_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -289,7 +292,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Setting_Launch_Editor_Description" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -316,7 +319,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Settings_Highlight_Opacity" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Zone opacity (%)]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -334,7 +337,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Window_Event_Listener_Error" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Failed to install Windows event listener.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp

@@ -114,7 +114,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(CreateZoneWindow)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             testZoneWindow(zoneWindow);
 
             auto* activeZoneSet{ zoneWindow->ActiveZoneSet() };
@@ -125,7 +125,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(CreateZoneWindowNoHinst)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), {}, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), {}, m_monitor, m_uniqueId.str(), {});
             testZoneWindow(zoneWindow);
 
             auto* activeZoneSet{ zoneWindow->ActiveZoneSet() };
@@ -136,7 +136,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(CreateZoneWindowNoHinstFlashZones)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), {}, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), {}, m_monitor, m_uniqueId.str(), {});
             testZoneWindow(zoneWindow);
 
             auto* activeZoneSet{ zoneWindow->ActiveZoneSet() };
@@ -147,13 +147,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(CreateZoneWindowNoMonitor)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, {}, m_uniqueId.str(), {}, false);
-            testZoneWindow(zoneWindow);
-        }
-
-        TEST_METHOD(CreateZoneWindowNoMonitorFlashZones)
-        {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, {}, m_uniqueId.str(), {}, true);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, {}, m_uniqueId.str(), {});
             testZoneWindow(zoneWindow);
         }
 
@@ -161,7 +155,7 @@ namespace FancyZonesUnitTests
         {
             // Generate unique id without device id
             std::wstring uniqueId = ZoneWindowUtils::GenerateUniqueId(m_monitor, {}, m_virtualDesktopId);
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, uniqueId, {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, uniqueId, {});
 
             const std::wstring expectedWorkArea = std::to_wstring(m_monitorInfo.rcMonitor.right) + L"_" + std::to_wstring(m_monitorInfo.rcMonitor.bottom);
             const std::wstring expectedUniqueId = L"FallbackDevice_" + std::to_wstring(m_monitorInfo.rcMonitor.right) + L"_" + std::to_wstring(m_monitorInfo.rcMonitor.bottom) + L"_" + m_virtualDesktopId;
@@ -179,7 +173,7 @@ namespace FancyZonesUnitTests
         {
             // Generate unique id without virtual desktop id
             std::wstring uniqueId = ZoneWindowUtils::GenerateUniqueId(m_monitor, m_deviceId, {});
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, uniqueId, {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, uniqueId, {});
 
             const std::wstring expectedWorkArea = std::to_wstring(m_monitorInfo.rcMonitor.right) + L"_" + std::to_wstring(m_monitorInfo.rcMonitor.bottom);
             Assert::IsNotNull(zoneWindow.get());
@@ -208,7 +202,7 @@ namespace FancyZonesUnitTests
                 m_fancyZonesData.ParseDeviceInfoFromTmpFile(activeZoneSetTempPath);
 
                 //temp file read on initialization
-                auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+                auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
                 testZoneWindow(actual);
 
@@ -232,7 +226,7 @@ namespace FancyZonesUnitTests
             m_fancyZonesData.ParseDeviceInfoFromTmpFile(activeZoneSetTempPath);
 
             //temp file read on initialization
-            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             testZoneWindow(actual);
 
@@ -268,7 +262,7 @@ namespace FancyZonesUnitTests
             m_fancyZonesData.ParseCustomZoneSetFromTmpFile(appliedZoneSetTempPath);
 
             //temp file read on initialization
-            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             testZoneWindow(actual);
 
@@ -315,7 +309,7 @@ namespace FancyZonesUnitTests
             m_fancyZonesData.ParseCustomZoneSetFromTmpFile(appliedZoneSetTempPath);
 
             //temp file read on initialization
-            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             testZoneWindow(actual);
 
@@ -362,7 +356,7 @@ namespace FancyZonesUnitTests
             m_fancyZonesData.ParseCustomZoneSetFromTmpFile(appliedZoneSetTempPath);
 
             //temp file read on initialization
-            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto actual = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             testZoneWindow(actual);
 
@@ -384,11 +378,11 @@ namespace FancyZonesUnitTests
             m_fancyZonesData.SetDeviceInfo(m_parentUniqueId.str(), parentDeviceInfo);
 
             winrt::com_ptr<MockZoneWindowHost> zoneWindowHost = winrt::make_self<MockZoneWindowHost>();
-            auto parentZoneWindow = MakeZoneWindow(zoneWindowHost.get(), m_hInst, m_monitor, m_parentUniqueId.str(), {}, false);
+            auto parentZoneWindow = MakeZoneWindow(zoneWindowHost.get(), m_hInst, m_monitor, m_parentUniqueId.str(), {});
             zoneWindowHost->m_zoneWindow = parentZoneWindow.get();
 
             // newWorkArea = true - zoneWindow will be cloned from parent
-            auto actualZoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), m_parentUniqueId.str(), false);
+            auto actualZoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), m_parentUniqueId.str());
 
             Assert::IsNotNull(actualZoneWindow->ActiveZoneSet());
             const auto actualZoneSet = actualZoneWindow->ActiveZoneSet()->GetZones();
@@ -414,11 +408,11 @@ namespace FancyZonesUnitTests
             m_fancyZonesData.SetDeviceInfo(m_parentUniqueId.str(), parentDeviceInfo);
 
             winrt::com_ptr<MockZoneWindowHost> zoneWindowHost = winrt::make_self<MockZoneWindowHost>();
-            auto parentZoneWindow = MakeZoneWindow(zoneWindowHost.get(), m_hInst, m_monitor, m_parentUniqueId.str(), {}, false);
+            auto parentZoneWindow = MakeZoneWindow(zoneWindowHost.get(), m_hInst, m_monitor, m_parentUniqueId.str(), {});
             zoneWindowHost->m_zoneWindow = parentZoneWindow.get();
 
             // newWorkArea = false - zoneWindow won't be cloned from parent
-            auto actualZoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto actualZoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             Assert::IsNotNull(actualZoneWindow->ActiveZoneSet());
 
@@ -475,7 +469,7 @@ namespace FancyZonesUnitTests
     public:
         TEST_METHOD(MoveSizeEnter)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto expected = S_OK;
             const auto actual = zoneWindow->MoveSizeEnter(Mocks::Window());
@@ -485,7 +479,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeEnterTwice)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto expected = S_OK;
 
@@ -497,7 +491,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeUpdate)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto expected = S_OK;
             const auto actual = zoneWindow->MoveSizeUpdate(POINT{ 0, 0 }, true, false);
@@ -507,7 +501,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeUpdatePointNegativeCoordinates)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto expected = S_OK;
             const auto actual = zoneWindow->MoveSizeUpdate(POINT{ -10, -10 }, true, false);
@@ -517,7 +511,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeUpdatePointBigCoordinates)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto expected = S_OK;
             const auto actual = zoneWindow->MoveSizeUpdate(POINT{ m_monitorInfo.rcMonitor.right + 1, m_monitorInfo.rcMonitor.bottom + 1 }, true, false);
@@ -527,7 +521,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeEnd)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto window = Mocks::Window();
             zoneWindow->MoveSizeEnter(window);
@@ -544,7 +538,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeEndWindowNotAdded)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto window = Mocks::Window();
             zoneWindow->MoveSizeEnter(window);
@@ -560,7 +554,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeEndDifferentWindows)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto window = Mocks::Window();
             zoneWindow->MoveSizeEnter(window);
@@ -573,7 +567,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeEndWindowNotSet)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto expected = E_INVALIDARG;
             const auto actual = zoneWindow->MoveSizeEnd(Mocks::Window(), POINT{ 0, 0 });
@@ -583,7 +577,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveSizeEndInvalidPoint)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
 
             const auto window = Mocks::Window();
             zoneWindow->MoveSizeEnter(window);
@@ -600,7 +594,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveWindowIntoZoneByIndex)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             zoneWindow->MoveWindowIntoZoneByIndex(Mocks::Window(), 0);
@@ -610,7 +604,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveWindowIntoZoneByDirectionAndIndex)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             const auto window = Mocks::WindowCreate(m_hInst);
@@ -625,7 +619,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(MoveWindowIntoZoneByDirectionManyTimes)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             const auto window = Mocks::WindowCreate(m_hInst);
@@ -642,7 +636,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(SaveWindowProcessToZoneIndexNullptrWindow)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             zoneWindow->SaveWindowProcessToZoneIndex(nullptr);
@@ -653,7 +647,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(SaveWindowProcessToZoneIndexNoWindowAdded)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             auto window = Mocks::WindowCreate(m_hInst);
@@ -668,7 +662,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(SaveWindowProcessToZoneIndexNoWindowAddedWithFilledAppZoneHistory)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             const auto window = Mocks::WindowCreate(m_hInst);
@@ -696,7 +690,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(SaveWindowProcessToZoneIndexWindowAdded)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             auto window = Mocks::WindowCreate(m_hInst);
@@ -726,7 +720,7 @@ namespace FancyZonesUnitTests
 
         TEST_METHOD(WhenWindowIsNotResizablePlacingItIntoTheZoneShouldNotResizeIt)
         {
-            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {}, false);
+            auto zoneWindow = MakeZoneWindow(winrt::make_self<MockZoneWindowHost>().get(), m_hInst, m_monitor, m_uniqueId.str(), {});
             Assert::IsNotNull(zoneWindow->ActiveZoneSet());
 
             auto window = Mocks::WindowCreate(m_hInst);

src/modules/imageresizer/dll/loc/zh-Hant/src/modules/imageresizer/dll/Resources.resx.lcl

@@ -14,7 +14,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Image Resizer]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[影像大小調整器]]></Val>
+            <Val><![CDATA[圖像大小調整器]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -50,7 +50,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Settings can be accessed from within Image Resizer.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[這些設定可以從影像大小調整器中存取。]]></Val>
+            <Val><![CDATA[這些設定可以從圖像大小調整器中存取。]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -59,7 +59,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Settings header for Image Resizer]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[影像大小調整器的設定標題]]></Val>
+            <Val><![CDATA[圖像大小調整器的設定標題]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/modules/imageresizer/tests/ImageResizerUITest.csproj

@@ -69,6 +69,7 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

src/modules/imageresizer/tests/Models/ResizeBatchTests.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;

src/modules/imageresizer/tests/Properties/SettingsTests.cs

@@ -170,6 +170,7 @@ namespace ImageResizer.Properties
 
             var result = ((IDataErrorInfo)settings)["JpegQualityLevel"];
 
+            // Using InvariantCulture since this is used internally
             Assert.Equal(
                 string.Format(CultureInfo.InvariantCulture, Resources.ValueMustBeBetween, 1, 100),
                 result);

src/modules/imageresizer/tests/Test/AssertEx.cs

@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.IO;
+using System.IO.Abstractions;
 using System.Windows.Media.Imaging;
 using Xunit;
 
@@ -14,6 +14,8 @@ namespace ImageResizer.Test
 {
     internal static class AssertEx
     {
+        private static readonly IFileSystem _fileSystem = new FileSystem();
+
         public static void All<T>(IEnumerable<T> collection, Action<T> action)
         {
             foreach (var item in collection)
@@ -24,7 +26,7 @@ namespace ImageResizer.Test
 
         public static void Image(string path, Action<BitmapDecoder> action)
         {
-            using (var stream = File.OpenRead(path))
+            using (var stream = _fileSystem.File.OpenRead(path))
             {
                 var image = BitmapDecoder.Create(
                     stream,

src/modules/imageresizer/tests/Views/TimeRemainingConverterTests.cs

@@ -28,6 +28,7 @@ namespace ImageResizer.Views
             var timeRemaining = new TimeSpan(hours, minutes, seconds);
             var converter = new TimeRemainingConverter();
 
+            // Using InvariantCulture since these are internal
             var result = converter.Convert(
                 timeRemaining,
                 targetType: null,

src/modules/imageresizer/ui/App.xaml

@@ -23,13 +23,54 @@
         <v:EnumValueConverter x:Key="EnumValueConverter"/>
         <v:AutoDoubleConverter x:Key="AutoDoubleConverter"/>
         <v:BoolValueConverter x:Key="BoolValueConverter"/>
+        <v:VisibilityBoolConverter x:Key="VisibilityBoolConverter"/>
         <Style x:Key="MainInstructionTextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="12pt"/>
-            <Setter Property="Foreground" Value="#039"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HotTrackColor}}"/>
         </Style>
         <Style TargetType="TextBox">
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
+        <Style x:Key="AccessibleComboBoxStyle" TargetType="ComboBoxItem">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                        <Border Name="SelectedItemBorder"
+                                Padding="2"
+                                SnapsToDevicePixels="true">
+                            <ContentPresenter />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsSelected" Value="true">
+                                <Setter TargetName="SelectedItemBorder"
+                                        Property="Background"
+                                        Value="#FF91b9d8"/>
+                                <Setter Property="Foreground"
+                                        Value="Black" />
+                            </Trigger>
+                            <Trigger Property="IsHighlighted" Value="true">
+                                <Setter TargetName="SelectedItemBorder"
+                                        Property="Background"
+                                        Value="#FFdadada" />
+                                <Setter Property="Foreground"
+                                        Value="Black" />
+                            </Trigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsSelected" Value="true" />
+                                    <Condition Property="IsHighlighted" Value="true" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="SelectedItemBorder"
+                                        Property="Background"
+                                        Value="#FF619ccb"/>
+                                <Setter Property="Foreground"
+                                        Value="Black" />
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Application.Resources>
 
 </Application>

src/modules/imageresizer/ui/ImageResizerUI.csproj

@@ -69,6 +69,9 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.IO.Abstractions">
+      <Version>12.2.5</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\interop\interop.vcxproj" />

src/modules/imageresizer/ui/Models/ResizeBatch.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Abstractions;
 using System.Threading;
 using System.Threading.Tasks;
 using ImageResizer.Properties;
@@ -14,6 +15,8 @@ namespace ImageResizer.Models
 {
     public class ResizeBatch
     {
+        private readonly IFileSystem _fileSystem = new FileSystem();
+
         public string DestinationDirectory { get; set; }
 
         public ICollection<string> Files { get; } = new List<string>();
@@ -71,7 +74,7 @@ namespace ImageResizer.Models
                     catch (Exception ex)
 #pragma warning restore CA1031 // Do not catch general exception types
                     {
-                        errors.Add(new ResizeError { File = Path.GetFileName(file), Error = ex.Message });
+                        errors.Add(new ResizeError { File = _fileSystem.Path.GetFileName(file), Error = ex.Message });
                     }
 
                     Interlocked.Increment(ref completed);

src/modules/imageresizer/ui/Models/ResizeOperation.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
@@ -12,11 +13,14 @@ using System.Windows.Media.Imaging;
 using ImageResizer.Properties;
 using ImageResizer.Utilities;
 using Microsoft.VisualBasic.FileIO;
+using FileSystem = Microsoft.VisualBasic.FileIO.FileSystem;
 
 namespace ImageResizer.Models
 {
     internal class ResizeOperation
     {
+        private readonly IFileSystem _fileSystem = new System.IO.Abstractions.FileSystem();
+
         private readonly string _file;
         private readonly string _destinationDirectory;
         private readonly Settings _settings;
@@ -31,7 +35,7 @@ namespace ImageResizer.Models
         public void Execute()
         {
             string path;
-            using (var inputStream = File.OpenRead(_file))
+            using (var inputStream = _fileSystem.File.OpenRead(_file))
             {
                 var decoder = BitmapDecoder.Create(
                     inputStream,
@@ -87,8 +91,8 @@ namespace ImageResizer.Models
                 }
 
                 path = GetDestinationPath(encoder);
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-                using (var outputStream = File.Open(path, FileMode.CreateNew, FileAccess.Write))
+                _fileSystem.Directory.CreateDirectory(_fileSystem.Path.GetDirectoryName(path));
+                using (var outputStream = _fileSystem.File.Open(path, FileMode.CreateNew, FileAccess.Write))
                 {
                     encoder.Save(outputStream);
                 }
@@ -96,13 +100,13 @@ namespace ImageResizer.Models
 
             if (_settings.KeepDateModified)
             {
-                File.SetLastWriteTimeUtc(path, File.GetLastWriteTimeUtc(_file));
+                _fileSystem.File.SetLastWriteTimeUtc(path, _fileSystem.File.GetLastWriteTimeUtc(_file));
             }
 
             if (_settings.Replace)
             {
                 var backup = GetBackupPath();
-                File.Replace(path, _file, backup, ignoreMetadataErrors: true);
+                _fileSystem.File.Replace(path, _file, backup, ignoreMetadataErrors: true);
                 FileSystem.DeleteFile(backup, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
             }
         }
@@ -179,16 +183,17 @@ namespace ImageResizer.Models
 
         private string GetDestinationPath(BitmapEncoder encoder)
         {
-            var directory = _destinationDirectory ?? Path.GetDirectoryName(_file);
-            var originalFileName = Path.GetFileNameWithoutExtension(_file);
+            var directory = _destinationDirectory ?? _fileSystem.Path.GetDirectoryName(_file);
+            var originalFileName = _fileSystem.Path.GetFileNameWithoutExtension(_file);
 
             var supportedExtensions = encoder.CodecInfo.FileExtensions.Split(',');
-            var extension = Path.GetExtension(_file);
+            var extension = _fileSystem.Path.GetExtension(_file);
             if (!supportedExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
             {
                 extension = supportedExtensions.FirstOrDefault();
             }
 
+            // Using CurrentCulture since this is user facing
             var fileName = string.Format(
                 CultureInfo.CurrentCulture,
                 _settings.FileNameFormat,
@@ -198,11 +203,11 @@ namespace ImageResizer.Models
                 _settings.SelectedSize.Height,
                 encoder.Frames[0].PixelWidth,
                 encoder.Frames[0].PixelHeight);
-            var path = Path.Combine(directory, fileName + extension);
+            var path = _fileSystem.Path.Combine(directory, fileName + extension);
             var uniquifier = 1;
-            while (File.Exists(path))
+            while (_fileSystem.File.Exists(path))
             {
-                path = Path.Combine(directory, fileName + " (" + uniquifier++ + ")" + extension);
+                path = _fileSystem.Path.Combine(directory, fileName + " (" + uniquifier++ + ")" + extension);
             }
 
             return path;
@@ -210,15 +215,15 @@ namespace ImageResizer.Models
 
         private string GetBackupPath()
         {
-            var directory = Path.GetDirectoryName(_file);
-            var fileName = Path.GetFileNameWithoutExtension(_file);
-            var extension = Path.GetExtension(_file);
+            var directory = _fileSystem.Path.GetDirectoryName(_file);
+            var fileName = _fileSystem.Path.GetFileNameWithoutExtension(_file);
+            var extension = _fileSystem.Path.GetExtension(_file);
 
-            var path = Path.Combine(directory, fileName + ".bak" + extension);
+            var path = _fileSystem.Path.Combine(directory, fileName + ".bak" + extension);
             var uniquifier = 1;
-            while (File.Exists(path))
+            while (_fileSystem.File.Exists(path))
             {
-                path = Path.Combine(directory, fileName + " (" + uniquifier++ + ")" + ".bak" + extension);
+                path = _fileSystem.Path.Combine(directory, fileName + " (" + uniquifier++ + ")" + ".bak" + extension);
             }
 
             return path;

src/modules/imageresizer/ui/Properties/Settings.cs

@@ -9,7 +9,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 using System.Threading;
 using System.Windows.Media.Imaging;
 using ImageResizer.Models;
@@ -22,9 +22,11 @@ namespace ImageResizer.Properties
     [JsonObject(MemberSerialization.OptIn)]
     public sealed partial class Settings : IDataErrorInfo, INotifyPropertyChanged
     {
+        private static readonly IFileSystem _fileSystem = new FileSystem();
+
         // Used to synchronize access to the settings.json file
         private static Mutex _jsonMutex = new Mutex();
-        private static string _settingsPath = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData), "Microsoft", "PowerToys", "ImageResizer", "settings.json");
+        private static string _settingsPath = _fileSystem.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData), "Microsoft", "PowerToys", "ImageResizer", "settings.json");
         private string _fileNameFormat;
         private bool _shrinkOnly;
         private int _selectedSizeIndex;
@@ -63,6 +65,7 @@ namespace ImageResizer.Properties
 
         public IEnumerable<ResizeSize> AllSizes { get; set; }
 
+        // Using OrdinalIgnoreCase since this is internal and used for comparison with symbols
         public string FileNameFormat
             => _fileNameFormat
                 ?? (_fileNameFormat = FileName
@@ -111,6 +114,7 @@ namespace ImageResizer.Properties
 
                 if (JpegQualityLevel < 1 || JpegQualityLevel > 100)
                 {
+                    // Using CurrentCulture since this is user facing
                     return string.Format(CultureInfo.CurrentCulture, Resources.ValueMustBeBetween, 1, 100);
                 }
 
@@ -382,25 +386,25 @@ namespace ImageResizer.Properties
             jsonData += "}";
 
             // Create directory if it doesn't exist
-            FileInfo file = new FileInfo(SettingsPath);
+            IFileInfo file = _fileSystem.FileInfo.FromFileName(SettingsPath);
             file.Directory.Create();
 
             // write string to file
-            File.WriteAllText(SettingsPath, jsonData);
+            _fileSystem.File.WriteAllText(SettingsPath, jsonData);
             _jsonMutex.ReleaseMutex();
         }
 
         public void Reload()
         {
             _jsonMutex.WaitOne();
-            if (!File.Exists(SettingsPath))
+            if (!_fileSystem.File.Exists(SettingsPath))
             {
                 _jsonMutex.ReleaseMutex();
                 Save();
                 return;
             }
 
-            string jsonData = File.ReadAllText(SettingsPath);
+            string jsonData = _fileSystem.File.ReadAllText(SettingsPath);
             JObject imageResizerSettings = JObject.Parse(jsonData);
 
             // Replace the { "value": <Value> } with <Value> to match the Settings object format

src/modules/imageresizer/ui/Views/AccessibleHyperlink.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Automation.Peers;
+using System.Windows.Documents;
+
+namespace ImageResizer.Views
+{
+    public class AccessibleHyperlink : Hyperlink
+    {
+        public AutomationControlType ControlType { get; set; }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            var peer = new CustomizableHyperlinkAutomationPeer(this);
+
+            peer.ControlType = ControlType;
+            return peer;
+        }
+    }
+}

src/modules/imageresizer/ui/Views/AdvancedWindow.xaml

@@ -114,18 +114,18 @@
                                         </ComboBox.ItemTemplate>
                                     </ComboBox>
                                     <TextBlock Grid.Column="6" Margin="5,0,0,0" VerticalAlignment="Center">
-                                        <Hyperlink Command="{Binding DataContext.RemoveSizeCommand,ElementName=_this}" CommandParameter="{Binding}">
+                                        <local:AccessibleHyperlink ControlType="Button"  Command="{Binding DataContext.RemoveSizeCommand,ElementName=_this}" CommandParameter="{Binding}">
                                             <Run Text="{x:Static p:Resources.Advanced_DeleteSize}"/>
-                                        </Hyperlink>
+                                        </local:AccessibleHyperlink>
                                     </TextBlock>
                                 </Grid>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                     <TextBlock>
-                        <Hyperlink Command="{Binding AddSizeCommand}">
+                        <local:AccessibleHyperlink ControlType="Button" Command="{Binding AddSizeCommand}">
                             <Run Text="{x:Static p:Resources.Advanced_CreateSize}"/>
-                        </Hyperlink>
+                        </local:AccessibleHyperlink>
                     </TextBlock>
                 </StackPanel>
             </TabItem>

src/modules/imageresizer/ui/Views/BoolValueConverter.cs

@@ -16,6 +16,6 @@ namespace ImageResizer.Views
             => (bool)value ? Visibility.Visible : Visibility.Collapsed;
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => throw new NotImplementedException();
+            => (Visibility)value == Visibility.Visible;
     }
 }

src/modules/imageresizer/ui/Views/CustomizableHyperlinkAutomationPeer.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Windows.Automation.Peers;
+using System.Windows.Documents;
+
+namespace ImageResizer.Views
+{
+    public class CustomizableHyperlinkAutomationPeer : HyperlinkAutomationPeer
+    {
+        public CustomizableHyperlinkAutomationPeer(Hyperlink owner)
+            : base(owner)
+        {
+        }
+
+        public AutomationControlType ControlType { get; set; }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return ControlType;
+        }
+    }
+}

src/modules/imageresizer/ui/Views/InputPage.xaml

@@ -55,7 +55,8 @@
                         <ComboBox Height="23"
                                   Margin="5,0,0,0"
                                   ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
-                                  SelectedItem="{Binding Fit}">
+                                  SelectedItem="{Binding Fit}"
+                                  ItemContainerStyle="{StaticResource AccessibleComboBoxStyle}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate DataType="{x:Type m:ResizeFit}">
                                     <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>
@@ -97,7 +98,8 @@
                         <ComboBox Height="23"
                                   Margin="7,0,0,0"
                                   ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
-                                  SelectedItem="{Binding Unit}">
+                                  SelectedItem="{Binding Unit}"
+                                  ItemContainerStyle="{StaticResource AccessibleComboBoxStyle}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate DataType="{x:Type m:ResizeUnit}">
                                     <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>
@@ -130,12 +132,15 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                
-                <TextBlock VerticalAlignment="Center"
-                           Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}">
-                    <Hyperlink Command="{Binding ShowAdvancedCommand}">
+
+                <TextBlock x:Name="AdvancedSettingsTextBlock"
+                           VerticalAlignment="Center"
+                           Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}"
+                           IsEnabled="{Binding Visibility,ElementName=AdvancedSettingsTextBlock, Converter={StaticResource VisibilityBoolConverter}}"
+                           Focusable="{Binding Visibility,ElementName=AdvancedSettingsTextBlock, Converter={StaticResource VisibilityBoolConverter}}">
+                    <local:AccessibleHyperlink ControlType="Button" Command="{Binding ShowAdvancedCommand}">
                         <Run Text="{x:Static p:Resources.Input_ShowAdvanced}"/>
-                    </Hyperlink>
+                    </local:AccessibleHyperlink>
                 </TextBlock>
                 
                 <Button Grid.Column="1"

src/modules/imageresizer/ui/Views/VisibilityBoolConverter.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Brice Lambson
+// The Brice Lambson licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace ImageResizer.Views
+{
+    [ValueConversion(typeof(Visibility), typeof(bool))]
+    internal class VisibilityBoolConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            => (Visibility)value == Visibility.Visible;
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => (bool)value ? Visibility.Visible : Visibility.Collapsed;
+    }
+}

src/modules/imageresizer/ui/loc/es/src/modules/imageresizer/ui/Properties/Resources.resx.lcl

@@ -500,7 +500,7 @@
         <Str Cat="Text">
           <Val><![CDATA[fills]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[rellena]]></Val>
+            <Val><![CDATA[llena]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/modules/imageresizer/ui/loc/ko/src/modules/imageresizer/ui/Properties/Resources.resx.lcl

@@ -491,7 +491,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Fill]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[채우기]]></Val>
+            <Val><![CDATA[늘이기]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -500,7 +500,7 @@
         <Str Cat="Text">
           <Val><![CDATA[fills]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[채우기]]></Val>
+            <Val><![CDATA[늘이기]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/modules/imageresizer/ui/loc/nl/src/modules/imageresizer/ui/Properties/Resources.resx.lcl

@@ -527,7 +527,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Stretch]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Spreiden]]></Val>
+            <Val><![CDATA[Uitrekken]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -536,7 +536,7 @@
         <Str Cat="Text">
           <Val><![CDATA[stretches to]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[strekt zich uit tot]]></Val>
+            <Val><![CDATA[uitgerekt tot]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/modules/imageresizer/ui/loc/zh-Hant/src/modules/imageresizer/ui/Properties/Resources.resx.lcl

@@ -221,7 +221,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Image Resizer]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[影像大小調整器]]></Val>
+            <Val><![CDATA[圖像大小調整器]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -518,7 +518,7 @@
         <Str Cat="Text">
           <Val><![CDATA[fits within]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[調整大小]]></Val>
+            <Val><![CDATA[最適大小]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/modules/keyboardmanager/dll/Resources.resx

@@ -131,6 +131,7 @@
   </data>
   <data name="RegisterClassFailed_ErrorMessage" xml:space="preserve">
     <value>Windows registration failed!</value>
+    <comment>This refers to an application window</comment>
   </data>
   <data name="RegisterClassFailed_ErrorTitle" xml:space="preserve">
     <value>Error</value>
@@ -188,6 +189,7 @@
   </data>
   <data name="Type_Button" xml:space="preserve">
     <value>Type</value>
+    <comment>As in type a key</comment>
   </data>
   <data name="TypeKey_Title" xml:space="preserve">
     <value>Press a key on selected keyboard:</value>
@@ -266,9 +268,11 @@
   </data>
   <data name="Key_DropDown_Combobox" xml:space="preserve">
     <value>Key</value>
+    <comment>Key on a keyboard</comment>
   </data>
   <data name="Add_Key_Remap_Button" xml:space="preserve">
     <value>Add Key Remap</value>
+    <comment>Key on a keyboard</comment>
   </data>
   <data name="Add_Shortcut_Button" xml:space="preserve">
     <value>Add Shortcut Remapping</value>
@@ -282,4 +286,4 @@
   <data name="ERRORMESSAGE_DISABLEASACTIONKEY" xml:space="preserve">
     <value>Disable can not be an action or a modifier key</value>
   </data>
-</root>
+</root>

src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl

@@ -10,11 +10,11 @@
     <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
     <Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
       <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Add_Key_Remap_Button" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Add_Key_Remap_Button" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add Key Remap]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieuwe toewijzing van toets toevoegen]]></Val>
+            <Val><![CDATA[Item voor opnieuw toewijzen van toets toevoegen]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -394,7 +394,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Key_DropDown_Combobox" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Key_DropDown_Combobox" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Key]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -410,7 +410,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Keyboard Manager]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Toetsenbordbeheer]]></Val>
+            <Val><![CDATA[Keyboard Manager]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -424,7 +424,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";RegisterClassFailed_ErrorMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";RegisterClassFailed_ErrorMessage" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Windows registration failed!]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -487,7 +487,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Type_Button" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Type_Button" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl

@@ -10,11 +10,11 @@
     <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
     <Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
       <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Add_Key_Remap_Button" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Add_Key_Remap_Button" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add Key Remap]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dodaj ponowne mapowanie klawiszy]]></Val>
+            <Val><![CDATA[Dodaj mapowanie ponowne klawisza]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -23,7 +23,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Add Shortcut Remapping]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dodaj ponowne mapowanie skrótu]]></Val>
+            <Val><![CDATA[Dodaj mapowanie ponowne skrótu]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -77,7 +77,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Delete Remapping]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Usuń ponowne mapowanie]]></Val>
+            <Val><![CDATA[Usuń mapowanie ponowne]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -125,7 +125,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Some of the keys could not be remapped. Do you want to continue anyway?]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować niektórych klawiszy. Czy mimo to chcesz kontynuować?]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie niektórych klawiszy. Czy mimo to chcesz kontynuować?]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -152,7 +152,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Remap keys]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ponowne mapowanie kluczy]]></Val>
+            <Val><![CDATA[Mapowanie ponowne kluczy]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -191,7 +191,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Some of the shortcuts could not be remapped. Do you want to continue anyway?]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować niektórych skrótów. Czy mimo to chcesz kontynuować?]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie niektórych skrótów. Czy mimo to chcesz kontynuować?]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -227,7 +227,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Remap shortcuts]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ponowne mapowanie skrótów]]></Val>
+            <Val><![CDATA[Mapowanie ponowne skrótów]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -236,7 +236,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap this key as it conflicts with another remapped key]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować tego klawisza, ponieważ powoduje to konflikt z innym ponownie zamapowanym klawiszem]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie tego klawisza, ponieważ powoduje to konflikt z innym ponownie zamapowanym klawiszem]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -245,7 +245,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap this shortcut as it conflicts with another remapped shortcut]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować tego skrótu, ponieważ powoduje to konflikt z innym ponownie zamapowanym skrótem]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie tego skrótu, ponieważ powoduje to konflikt z innym zamapowanym ponownie skrótem]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -254,7 +254,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap from/to Ctrl Alt Del]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować z/na Ctrl Alt Del]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie z/na Ctrl Alt Del]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -272,7 +272,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap a shortcut to itself]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować skrótu na niego samego]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie skrótu na niego samego]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -281,7 +281,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap a key to itself]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować klawisza na niego samego]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie klawisza na niego samego]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -299,7 +299,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Remapping successful]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ponowne mapowanie powiodło się]]></Val>
+            <Val><![CDATA[Mapowanie ponowne powiodło się]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -308,7 +308,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Some remappings were not applied]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niektóre ponowne mapowania nie zostały zastosowane]]></Val>
+            <Val><![CDATA[Niektóre mapowania ponowne nie zostały zastosowane]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -317,7 +317,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap a key more than once]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować klawisza więcej niż raz]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie klawisza więcej niż raz]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -326,7 +326,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap a shortcut more than once for the same target app]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować skrótu więcej niż raz dla tej samej aplikacji docelowej]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie skrótu więcej niż raz dla tej samej aplikacji docelowej]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -335,7 +335,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Failed to save the remappings]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można zapisać ponownych mapowań]]></Val>
+            <Val><![CDATA[Nie można zapisać mapowań ponownych]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -389,12 +389,12 @@
         <Str Cat="Text">
           <Val><![CDATA[Cannot remap from/to Win L]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można ponownie zamapować z/na Win L]]></Val>
+            <Val><![CDATA[Nie można zamapować ponownie z/na Win L]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Key_DropDown_Combobox" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Key_DropDown_Combobox" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Key]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -424,7 +424,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";RegisterClassFailed_ErrorMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";RegisterClassFailed_ErrorMessage" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Windows registration failed!]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -487,7 +487,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Type_Button" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";Type_Button" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">

src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp

@@ -15,6 +15,7 @@
 #include "keyboardmanager/common/KeyboardManagerState.h"
 #include "common/common.h"
 #include "LoadingAndSavingRemappingHelper.h"
+#include "UIHelpers.h"
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 using namespace winrt::Windows::Foundation;
@@ -304,8 +305,12 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
     addRemapKey.Margin({ 10, 10, 0, 25 });
     addRemapKey.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
         SingleKeyRemapControl::AddNewControlKeyRemapRow(keyRemapTable, keyboardRemapControlObjects);
+
         // Whenever a remap is added move to the bottom of the screen
         scrollViewer.ChangeView(nullptr, scrollViewer.ScrollableHeight(), nullptr);
+
+        // Set focus to the first Type Button in the newly added row
+        UIHelpers::SetFocusOnTypeButtonInLastRow(keyRemapTable, KeyboardManagerConstants::RemapTableColCount);
     });
 
     // Set accessible name for the addRemapKey button

src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp

@@ -13,6 +13,7 @@
 #include <keyboardmanager/common/KeyboardManagerState.h>
 #include "common/common.h"
 #include "LoadingAndSavingRemappingHelper.h"
+#include "UIHelpers.h"
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 using namespace winrt::Windows::Foundation;
@@ -291,8 +292,12 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
     addShortcut.Margin({ 10, 0, 0, 25 });
     addShortcut.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
         ShortcutControl::AddNewShortcutControlRow(shortcutTable, keyboardRemapControlObjects);
+
         // Whenever a remap is added move to the bottom of the screen
         scrollViewer.ChangeView(nullptr, scrollViewer.ScrollableHeight(), nullptr);
+
+        // Set focus to the first Type Button in the newly added row
+        UIHelpers::SetFocusOnTypeButtonInLastRow(shortcutTable, KeyboardManagerConstants::ShortcutTableColCount);
     });
 
     // Set accessible name for the add shortcut button

src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj

@@ -124,6 +124,7 @@
     <ClCompile Include="ShortcutControl.cpp" />
     <ClCompile Include="SingleKeyRemapControl.cpp" />
     <ClCompile Include="Styles.cpp" />
+    <ClCompile Include="UIHelpers.cpp" />
     <ClCompile Include="XamlBridge.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -137,6 +138,7 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="ShortcutControl.h" />
     <ClInclude Include="SingleKeyRemapControl.h" />
+    <ClInclude Include="UIHelpers.h" />
     <ClInclude Include="XamlBridge.h" />
   </ItemGroup>
   <ItemGroup>

src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj.filters

@@ -34,6 +34,9 @@
     <ClCompile Include="BufferValidationHelpers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="UIHelpers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Dialog.h">
@@ -69,6 +72,9 @@
     <ClInclude Include="BufferValidationHelpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="UIHelpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">

src/modules/keyboardmanager/ui/UIHelpers.cpp

@@ -0,0 +1,18 @@
+#include "pch.h"
+#include "UIHelpers.h"
+
+namespace UIHelpers
+{
+    // This method sets focus to the first Type button on the last row of the Grid
+    void SetFocusOnTypeButtonInLastRow(Grid& parent, long colCount)
+    {
+        // First element in the last row (StackPanel)
+        StackPanel firstElementInLastRow = parent.Children().GetAt(parent.Children().Size() - colCount).as<StackPanel>();
+
+        // Type button is the first child in the StackPanel
+        Button firstTypeButtonInLastRow = firstElementInLastRow.Children().GetAt(0).as<Button>();
+
+        // Set programmatic focus on the button
+        firstTypeButtonInLastRow.Focus(FocusState::Programmatic);
+    }
+}

src/modules/keyboardmanager/ui/UIHelpers.h

@@ -0,0 +1,8 @@
+#pragma once
+
+// This namespace contains UI methods that are to be used for both KBM windows
+namespace UIHelpers
+{
+    // This method sets focus to the first Type button on the last row of the Grid
+    void SetFocusOnTypeButtonInLastRow(Grid& parent, long colCount);
+}

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs

@@ -68,6 +68,7 @@ namespace Microsoft.Plugin.Calculator.UnitTests
             var engine = new CalculateEngine();
 
             // Act
+            // Using InvariantCulture since this is internal
             var result = engine.Interpret(input, CultureInfo.InvariantCulture);
 
             // Assert
@@ -84,6 +85,7 @@ namespace Microsoft.Plugin.Calculator.UnitTests
             var engine = new CalculateEngine();
 
             // Act
+            // Using InvariantCulture since this is internal
             var result = engine.Interpret(input, CultureInfo.InvariantCulture);
 
             // Assert
@@ -140,6 +142,7 @@ namespace Microsoft.Plugin.Calculator.UnitTests
             var engine = new CalculateEngine();
 
             // Act
+            // Using InvariantCulture since this is internal
             var result = engine.Interpret(input, CultureInfo.InvariantCulture);
 
             // Assert
@@ -158,6 +161,7 @@ namespace Microsoft.Plugin.Calculator.UnitTests
             var engine = new CalculateEngine();
 
             // Act
+            // Using InvariantCulture since this is internal
             var result = engine.Interpret(input, CultureInfo.InvariantCulture);
 
             // Assert

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs

@@ -15,6 +15,7 @@ namespace Microsoft.Plugin.Calculator
 
         public CalculateResult Interpret(string input)
         {
+            // Using CurrentCulture this is user facing
             return Interpret(input, CultureInfo.CurrentCulture);
         }
 

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs

@@ -35,6 +35,7 @@ namespace Microsoft.Plugin.Calculator
 
             try
             {
+                // Using CurrentUICulture since this is user facing
                 var result = CalculateEngine.Interpret(query.Search, CultureInfo.CurrentUICulture);
 
                 // This could happen for some incorrect queries, like pi(2)

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj

@@ -55,8 +55,12 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
-    <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
+    <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
+      <Private>false</Private>
+    </ProjectReference>
   </ItemGroup>
   
   <ItemGroup>

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/ResultHelper.cs

@@ -27,6 +27,7 @@ namespace Microsoft.Plugin.Calculator
 
             return new Result
             {
+                // Using CurrentCulture since this is user facing
                 Title = roundedResult?.ToString(CultureInfo.CurrentCulture),
                 IcoPath = iconPath,
                 Score = 300,
@@ -45,6 +46,7 @@ namespace Microsoft.Plugin.Calculator
                 {
                     try
                     {
+                        // Using CurrentUICulture since this is user facing
                         Clipboard.SetText(roundedResult?.ToString(CultureInfo.CurrentUICulture.NumberFormat));
                         ret = true;
                     }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/DriveOrSharedFolderTests.cs

@@ -69,8 +69,10 @@ namespace Microsoft.Plugin.Folder.UnitTests
         {
             // Setup
             var folderHelperMock = new Mock<IFolderHelper>();
+
+            // Using Ordinal since this is used with paths
             folderHelperMock.Setup(r => r.IsDriveOrSharedFolder(It.IsAny<string>()))
-                .Returns<string>(s => s.StartsWith("C:", StringComparison.CurrentCultureIgnoreCase));
+                .Returns<string>(s => s.StartsWith("C:", StringComparison.Ordinal));
 
             var itemResultMock = new Mock<IItemResult>();
 

src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/InternalQueryFolderTests.cs

@@ -5,11 +5,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Abstractions.TestingHelpers;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Microsoft.Plugin.Folder.Sources;
 using Microsoft.Plugin.Folder.Sources.Result;
-using Moq;
 using NUnit.Framework;
 
 namespace Microsoft.Plugin.Folder.UnitTests
@@ -17,115 +16,45 @@ namespace Microsoft.Plugin.Folder.UnitTests
     [TestFixture]
     public class InternalQueryFolderTests
     {
-        private static readonly HashSet<string> DirectoryExist = new HashSet<string>()
-        {
-            @"c:",
-            @"c:\",
-            @"c:\Test\",
-            @"c:\Test\A\",
-            @"c:\Test\b\",
-        };
-
-        private static readonly HashSet<string> FilesExist = new HashSet<string>()
-        {
-            @"c:\bla.txt",
-            @"c:\Test\test.txt",
-            @"c:\Test\more-test.png",
-        };
-
-        private static Mock<IQueryFileSystemInfo> _queryFileSystemInfoMock;
+        private static IQueryFileSystemInfo _queryFileSystemInfoMock;
+        private static MockFileSystem _fileSystem;
 
         [SetUp]
         public void SetupMock()
         {
-            var queryFileSystemInfoMock = new Mock<IQueryFileSystemInfo>();
-            queryFileSystemInfoMock.Setup(r => r.Exists(It.IsAny<string>()))
-                .Returns<string>(path => ContainsDirectory(path));
-
-            queryFileSystemInfoMock.Setup(r => r.MatchFileSystemInfo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
-                .Returns<string, string, bool>(MatchFileSystemInfo);
-
-            _queryFileSystemInfoMock = queryFileSystemInfoMock;
-        }
-
-        // Windows supports C:\\\\\ => C:\
-        private static bool ContainsDirectory(string path)
-        {
-            return DirectoryExist.Contains(TrimDirectoryEnd(path));
-        }
-
-        private static string TrimDirectoryEnd(string path)
-        {
-            var trimEnd = path.TrimEnd('\\');
-
-            if (path.EndsWith('\\'))
+            // Note: This mock filesystem adds a 'c:\temp' directory.
+            _fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>()
             {
-                trimEnd += '\\';
-            }
+                { @"c:\bla.txt", new MockFileData(string.Empty) },
+                { @"c:\Test\test.txt", new MockFileData(string.Empty) },
+                { @"c:\Test\more-test.png", new MockFileData(string.Empty) },
+                { @"c:\Test\A\deep-nested.png", new MockFileData(string.Empty) },
+                { @"c:\Test\b\", new MockDirectoryData() },
+            });
 
-            return trimEnd;
-        }
-
-        private static IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive)
-        {
-            Func<string, bool> folderSearchFunc;
-            Func<string, bool> fileSearchFunc;
-            switch (isRecursive)
-            {
-                case false:
-                    folderSearchFunc = s => s.Equals(search, StringComparison.CurrentCultureIgnoreCase);
-
-                    var regexSearch = TrimDirectoryEnd(search);
-
-                    fileSearchFunc = s => Regex.IsMatch(s, $"^{Regex.Escape(regexSearch)}[^\\\\]*$");
-                    break;
-                case true:
-                    folderSearchFunc = s => s.StartsWith(search, StringComparison.CurrentCultureIgnoreCase);
-                    fileSearchFunc = s => s.StartsWith(search, StringComparison.CurrentCultureIgnoreCase);
-                    break;
-            }
-
-            var directories = DirectoryExist.Where(s => folderSearchFunc(s))
-                .Select(dir => new DisplayFileInfo()
-                {
-                    Type = DisplayType.Directory,
-                    FullName = dir,
-                });
-
-            var files = FilesExist.Where(s => fileSearchFunc(s))
-                .Select(file => new DisplayFileInfo()
-                {
-                    Type = DisplayType.File,
-                    FullName = file,
-                });
-
-            return directories.Concat(files);
+            _queryFileSystemInfoMock = new QueryFileSystemInfo(_fileSystem.DirectoryInfo);
         }
 
         [Test]
         public void Query_ThrowsException_WhenCalledNull()
         {
             // Setup
-            var queryInternalDirectory = new QueryInternalDirectory(new FolderSettings(), _queryFileSystemInfoMock.Object);
+            var queryInternalDirectory = new QueryInternalDirectory(new FolderSettings(), _queryFileSystemInfoMock, _fileSystem.Directory);
 
             // Act & Assert
             Assert.Throws<ArgumentNullException>(() => queryInternalDirectory.Query(null).ToArray());
         }
 
         [TestCase(@"c", 0, 0, false, Reason = "String empty is nothing")]
-        [TestCase(@"c:", 1, 1, false, Reason = "Root without \\")]
-        [TestCase(@"c:\", 1, 1, false, Reason = "Normal root")]
-        [TestCase(@"c:\Test", 1, 2, false, Reason = "Select yourself")]
-        [TestCase(@"c:\>", 2, 2, true, Reason = "Max Folder test recursive")]
-        [TestCase(@"c:\Test>", 2, 2, true, Reason = "2 Folders recursive")]
-        [TestCase(@"c:\not-exist", 1, 1, false, Reason = "Folder not exist, return root")]
-        [TestCase(@"c:\not-exist>", 2, 2, true, Reason = "Folder not exist, return root recursive")]
+        [TestCase(@"c:", 2, 1, false, Reason = "Root without \\")]
+        [TestCase(@"c:\", 2, 1, false, Reason = "Normal root")]
+        [TestCase(@"c:\Test", 2, 2, false, Reason = "Select yourself")]
+        [TestCase(@"c:\not-exist", 2, 1, false, Reason = "Folder not exist, return root")]
         [TestCase(@"c:\not-exist\not-exist2", 0, 0, false, Reason = "Folder not exist, return root")]
-        [TestCase(@"c:\not-exist\not-exist2>", 0, 0, false, Reason = "Folder not exist, return root recursive")]
-        [TestCase(@"c:\bla.t", 1, 1, false, Reason = "Partial match file")]
+        [TestCase(@"c:\bla.t", 2, 1, false, Reason = "Partial match file")]
         public void Query_WhenCalled(string search, int folders, int files, bool truncated)
         {
-            const int maxFolderSetting = 2;
+            const int maxFolderSetting = 3;
 
             // Setup
             var folderSettings = new FolderSettings()
@@ -134,7 +63,42 @@ namespace Microsoft.Plugin.Folder.UnitTests
                 MaxFolderResults = maxFolderSetting,
             };
 
-            var queryInternalDirectory = new QueryInternalDirectory(folderSettings, _queryFileSystemInfoMock.Object);
+            var queryInternalDirectory = new QueryInternalDirectory(folderSettings, _queryFileSystemInfoMock, _fileSystem.Directory);
+
+            // Act
+            var isDriveOrSharedFolder = queryInternalDirectory.Query(search)
+                .ToLookup(r => r.GetType());
+
+            // Assert
+            Assert.AreEqual(files, isDriveOrSharedFolder[typeof(FileItemResult)].Count(), "File count doesn't match");
+            Assert.AreEqual(folders, isDriveOrSharedFolder[typeof(FolderItemResult)].Count(), "folder count doesn't match");
+
+            // Always check if there is less than max folders
+            Assert.LessOrEqual(isDriveOrSharedFolder[typeof(FileItemResult)].Count(), maxFolderSetting, "Files are not limited");
+            Assert.LessOrEqual(isDriveOrSharedFolder[typeof(FolderItemResult)].Count(), maxFolderSetting, "Folders are not limited");
+
+            // Checks if CreateOpenCurrentFolder is displayed
+            Assert.AreEqual(Math.Min(folders + files, 1), isDriveOrSharedFolder[typeof(CreateOpenCurrentFolderResult)].Count(), "CreateOpenCurrentFolder displaying is incorrect");
+
+            Assert.AreEqual(truncated, isDriveOrSharedFolder[typeof(TruncatedItemResult)].Count() == 1, "CreateOpenCurrentFolder displaying is incorrect");
+        }
+
+        [TestCase(@"c:\>", 3, 3, true, Reason = "Max Folder test recursive")]
+        [TestCase(@"c:\Test>", 3, 3, true, Reason = "2 Folders recursive")]
+        [TestCase(@"c:\not-exist>", 3, 3, true, Reason = "Folder not exist, return root recursive")]
+        [TestCase(@"c:\not-exist\not-exist2>", 0, 0, false, Reason = "Folder not exist, return root recursive")]
+        public void Query_Recursive_WhenCalled(string search, int folders, int files, bool truncated)
+        {
+            const int maxFolderSetting = 3;
+
+            // Setup
+            var folderSettings = new FolderSettings()
+            {
+                MaxFileResults = maxFolderSetting,
+                MaxFolderResults = maxFolderSetting,
+            };
+
+            var queryInternalDirectory = new QueryInternalDirectory(folderSettings, _queryFileSystemInfoMock, _fileSystem.Directory);
 
             // Act
             var isDriveOrSharedFolder = queryInternalDirectory.Query(search)

src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj

@@ -14,6 +14,7 @@
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="12.2.3" />
   </ItemGroup>
 
   <ItemGroup>

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
+using System.IO.Abstractions;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
@@ -17,6 +17,7 @@ namespace Microsoft.Plugin.Folder
 {
     internal class ContextMenuLoader : IContextMenu
     {
+        private readonly IFileSystem _fileSystem = new FileSystem();
         private readonly PluginInitContext _context;
 
         public ContextMenuLoader(PluginInitContext context)
@@ -76,7 +77,7 @@ namespace Microsoft.Plugin.Folder
                         {
                             if (record.Type == ResultType.File)
                             {
-                                Helper.OpenInConsole(Path.GetDirectoryName(record.FullPath));
+                                Helper.OpenInConsole(_fileSystem.Path.GetDirectoryName(record.FullPath));
                             }
                             else
                             {

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO.Abstractions;
 using System.Linq;
 using System.Windows.Controls;
 using ManagedCommon;
@@ -21,9 +22,10 @@ namespace Microsoft.Plugin.Folder
         public const string DeleteFileFolderImagePath = "Images\\delete.dark.png";
         public const string CopyImagePath = "Images\\copy.dark.png";
 
+        private static readonly IFileSystem _fileSystem = new FileSystem();
         private static readonly PluginJsonStorage<FolderSettings> _storage = new PluginJsonStorage<FolderSettings>();
         private static readonly FolderSettings _settings = _storage.Load();
-        private static readonly IQueryInternalDirectory _internalDirectory = new QueryInternalDirectory(_settings, new QueryFileSystemInfo());
+        private static readonly IQueryInternalDirectory _internalDirectory = new QueryInternalDirectory(_settings, new QueryFileSystemInfo(_fileSystem.DirectoryInfo), _fileSystem.Directory);
         private static readonly FolderHelper _folderHelper = new FolderHelper(new DriveInformation(), new FolderLinksSettings(_settings));
 
         private static readonly ICollection<IFolderProcessor> _processors = new IFolderProcessor[]

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj

@@ -60,9 +60,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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" />
+    <ProjectReference Include="..\..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" >
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" >
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" >
+      <Private>false</Private>
+    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -72,6 +78,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Properties/Resources.resx

@@ -137,6 +137,7 @@
   </data>
   <data name="Microsoft_plugin_folder_truncation_warning_subtitle" xml:space="preserve">
     <value>Showing {0:N0} of {1:N0} results</value>
+    <comment>Example: showing 25 of 540 results</comment>
   </data>
   <data name="Microsoft_plugin_folder_clipboard_failed" xml:space="preserve">
     <value>Fail to set text in clipboard</value>
@@ -149,14 +150,17 @@
   </data>
   <data name="wox_plugin_folder_select_folder_first_result_title" xml:space="preserve">
     <value>Open</value>
+    <comment>Open as a verb.  Open this folder.</comment>
   </data>
   <data name="wox_plugin_folder_select_folder_OpenFileOrFolder_error_message" xml:space="preserve">
     <value>Could not start</value>
   </data>
   <data name="wox_plugin_folder_select_file_result_subtitle" xml:space="preserve">
     <value>File: {0}</value>
+    <comment>the arg following is file path</comment>
   </data>
   <data name="wox_plugin_folder_select_folder_result_subtitle" xml:space="preserve">
     <value>Folder: {0}</value>
+    <comment>the arg following is the folder path</comment>
   </data>
 </root>

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/SearchResult.cs

@@ -2,17 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Input;
-using Wox.Infrastructure;
-using Wox.Plugin;
-using Wox.Plugin.Logger;
-
 namespace Microsoft.Plugin.Folder
 {
     public class SearchResult

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/IQueryFileSystemInfo.cs

@@ -3,12 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.IO;
-using Wox.Infrastructure.FileSystemHelper;
 
 namespace Microsoft.Plugin.Folder.Sources
 {
-    public interface IQueryFileSystemInfo : IDirectoryWrapper
+    public interface IQueryFileSystemInfo
     {
         IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive);
     }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/DriveInformation.cs

@@ -4,20 +4,22 @@
 
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 
 namespace Microsoft.Plugin.Folder.Sources
 {
     internal class DriveInformation : IDriveInformation
     {
+        private static readonly IFileSystem _fileSystem = new FileSystem();
         private static readonly List<string> DriverNames = InitialDriverList().ToList();
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase", Justification = "Do not want to change the behavior of the application, but want to enforce static analysis")]
         private static IEnumerable<string> InitialDriverList()
         {
-            var directorySeparatorChar = System.IO.Path.DirectorySeparatorChar;
-            return DriveInfo.GetDrives()
+            // Using InvariantCulture since this is internal
+            var directorySeparatorChar = _fileSystem.Path.DirectorySeparatorChar;
+            return _fileSystem.DriveInfo.GetDrives()
                 .Select(driver => driver.Name.ToLower(CultureInfo.InvariantCulture).TrimEnd(directorySeparatorChar));
         }
 

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.IO;
 using System.Linq;
 
 namespace Microsoft.Plugin.Folder.Sources
@@ -27,6 +28,7 @@ namespace Microsoft.Plugin.Folder.Sources
                 throw new ArgumentNullException(paramName: nameof(query));
             }
 
+            // Using OrdinalIgnoreCase since this is internal
             return _folderLinks.FolderLinks()
                 .Where(x => x.Nickname.StartsWith(query, StringComparison.OrdinalIgnoreCase));
         }
@@ -38,7 +40,8 @@ namespace Microsoft.Plugin.Folder.Sources
                 throw new ArgumentNullException(nameof(search));
             }
 
-            if (search.StartsWith(@"\\", StringComparison.InvariantCulture))
+            // Using Ordinal this is internal and we're comparing symbols
+            if (search.StartsWith(@"\\", StringComparison.Ordinal))
             { // share folder
                 return true;
             }
@@ -48,6 +51,7 @@ namespace Microsoft.Plugin.Folder.Sources
 
             if (driverNames.Any())
             {
+                // Using InvariantCultureIgnoreCase since this is searching for drive names
                 if (driverNames.Any(dn => search.StartsWith(dn, StringComparison.InvariantCultureIgnoreCase)))
                 {
                     // normal drive letter
@@ -75,6 +79,17 @@ namespace Microsoft.Plugin.Folder.Sources
 
         public static string Expand(string search)
         {
+            if (search == null)
+            {
+                throw new ArgumentNullException(nameof(search));
+            }
+
+            // Absolute path of system drive: \Windows\System32
+            if (search[0] == '\\' && (search.Length == 1 || search[1] != '\\'))
+            {
+                search = Path.Combine(Path.GetPathRoot(Environment.SystemDirectory), search.Substring(1));
+            }
+
             return Environment.ExpandEnvironmentVariables(search);
         }
     }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryFileSystemInfo.cs

@@ -2,20 +2,26 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
-using Wox.Infrastructure.FileSystemHelper;
 
 namespace Microsoft.Plugin.Folder.Sources
 {
-    public class QueryFileSystemInfo : DirectoryWrapper,  IQueryFileSystemInfo
+    public class QueryFileSystemInfo : IQueryFileSystemInfo
     {
+        private readonly IDirectoryInfoFactory _directoryInfoFactory;
+
+        public QueryFileSystemInfo(IDirectoryInfoFactory directoryInfoFactory)
+        {
+            _directoryInfoFactory = directoryInfoFactory;
+        }
+
         public IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive)
         {
             // search folder and add results
-            var directoryInfo = new DirectoryInfo(search);
+            var directoryInfo = _directoryInfoFactory.FromDirectoryName(search);
             var fileSystemInfos = directoryInfo.EnumerateFileSystemInfos(incompleteName, new EnumerationOptions()
             {
                 MatchType = MatchType.Win32,
@@ -30,7 +36,7 @@ namespace Microsoft.Plugin.Folder.Sources
                 .Select(CreateDisplayFileInfo);
         }
 
-        private static DisplayFileInfo CreateDisplayFileInfo(FileSystemInfo fileSystemInfo)
+        private static DisplayFileInfo CreateDisplayFileInfo(IFileSystemInfo fileSystemInfo)
         {
             return new DisplayFileInfo()
             {
@@ -40,9 +46,9 @@ namespace Microsoft.Plugin.Folder.Sources
             };
         }
 
-        private static DisplayType GetDisplayType(FileSystemInfo fileSystemInfo)
+        private static DisplayType GetDisplayType(IFileSystemInfo fileSystemInfo)
         {
-            if (fileSystemInfo is DirectoryInfo)
+            if (fileSystemInfo is IDirectoryInfo)
             {
                 return DisplayType.Directory;
             }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryInternalDirectory.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
 using System.IO;
+using System.IO.Abstractions;
 using System.Linq;
 using ManagedCommon;
 using Microsoft.Plugin.Folder.Sources.Result;
@@ -18,6 +19,7 @@ namespace Microsoft.Plugin.Folder.Sources
     {
         private readonly FolderSettings _settings;
         private readonly IQueryFileSystemInfo _queryFileSystemInfo;
+        private readonly IDirectory _directory;
 
         private static readonly HashSet<char> SpecialSearchChars = new HashSet<char>
         {
@@ -26,10 +28,11 @@ namespace Microsoft.Plugin.Folder.Sources
 
         private static string _warningIconPath;
 
-        public QueryInternalDirectory(FolderSettings folderSettings, IQueryFileSystemInfo queryFileSystemInfo)
+        public QueryInternalDirectory(FolderSettings folderSettings, IQueryFileSystemInfo queryFileSystemInfo, IDirectory directory)
         {
             _settings = folderSettings;
             _queryFileSystemInfo = queryFileSystemInfo;
+            _directory = directory;
         }
 
         private static bool HasSpecialChars(string search)
@@ -47,7 +50,7 @@ namespace Microsoft.Plugin.Folder.Sources
         private (string search, string incompleteName) Process(string search)
         {
             string incompleteName = string.Empty;
-            if (HasSpecialChars(search) || !_queryFileSystemInfo.Exists($@"{search}\"))
+            if (HasSpecialChars(search) || !_directory.Exists($@"{search}\"))
             {
                 // if folder doesn't exist, we want to take the last part and use it afterwards to help the user
                 // find the right folder.
@@ -60,10 +63,11 @@ namespace Microsoft.Plugin.Folder.Sources
                 }
 
                 // Remove everything after the last \ and add *
+                // Using InvariantCulture since this is internal
                 incompleteName = search.Substring(index + 1)
                     .ToLower(CultureInfo.InvariantCulture) + "*";
                 search = search.Substring(0, index + 1);
-                if (!_queryFileSystemInfo.Exists(search))
+                if (!_directory.Exists(search))
                 {
                     return default;
                 }
@@ -71,7 +75,8 @@ namespace Microsoft.Plugin.Folder.Sources
             else
             {
                 // folder exist, add \ at the end of doesn't exist
-                if (!search.EndsWith(@"\", StringComparison.InvariantCulture))
+                // Using Ordinal since this is internal and is used for a symbol
+                if (!search.EndsWith(@"\", StringComparison.Ordinal))
                 {
                     search += @"\";
                 }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Result/FileItemResult.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 using Wox.Infrastructure;
 using Wox.Plugin;
 
@@ -13,17 +13,31 @@ namespace Microsoft.Plugin.Folder.Sources.Result
     {
         private static readonly IShellAction ShellAction = new ShellAction();
 
+        private readonly IPath _path;
+
+        public FileItemResult()
+            : this(new FileSystem().Path)
+        {
+        }
+
+        private FileItemResult(IPath path)
+        {
+            _path = path;
+        }
+
         public string FilePath { get; set; }
 
-        public string Title => Path.GetFileName(FilePath);
+        public string Title => _path.GetFileName(FilePath);
 
         public string Search { get; set; }
 
         public Wox.Plugin.Result Create(IPublicAPI contextApi)
         {
-            var result = new Wox.Plugin.Result(StringMatcher.FuzzySearch(Search, Path.GetFileName(FilePath)).MatchData)
+            var result = new Wox.Plugin.Result(StringMatcher.FuzzySearch(Search, _path.GetFileName(FilePath)).MatchData)
             {
                 Title = Title,
+
+                // Using CurrentCulture since this is user facing
                 SubTitle = string.Format(CultureInfo.CurrentCulture, Properties.Resources.wox_plugin_folder_select_file_result_subtitle, FilePath),
                 IcoPath = FilePath,
                 Action = c => ShellAction.Execute(FilePath, contextApi),

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Result/FolderItemResult.cs

@@ -37,6 +37,8 @@ namespace Microsoft.Plugin.Folder.Sources.Result
             {
                 Title = Title,
                 IcoPath = Path,
+
+                // Using CurrentCulture since this is user facing
                 SubTitle = string.Format(CultureInfo.CurrentCulture, Properties.Resources.wox_plugin_folder_select_folder_result_subtitle, Subtitle),
                 QueryTextDisplay = Path,
                 ContextData = new SearchResult { Type = ResultType.Folder, FullPath = Path },

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Result/TruncatedItemResult.cs

@@ -23,6 +23,8 @@ namespace Microsoft.Plugin.Folder.Sources.Result
             {
                 Title = Properties.Resources.Microsoft_plugin_folder_truncation_warning_title,
                 QueryTextDisplay = Search,
+
+                // Using CurrentCulture since this is user facing
                 SubTitle = string.Format(CultureInfo.CurrentCulture, Properties.Resources.Microsoft_plugin_folder_truncation_warning_subtitle, PostTruncationCount, PreTruncationCount),
                 IcoPath = WarningIconPath,
             };

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/ShellAction.cs

@@ -39,7 +39,8 @@ namespace Microsoft.Plugin.Folder.Sources
             var sanitizedPath = Regex.Replace(search, @"[\/\\]+", "\\");
 
             // A network path must start with \\
-            if (!sanitizedPath.StartsWith("\\", StringComparison.InvariantCulture))
+            // Using Ordinal since this is internal and used with a symbol
+            if (!sanitizedPath.StartsWith("\\", StringComparison.Ordinal))
             {
                 return sanitizedPath;
             }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/UserFolderResult.cs

@@ -28,6 +28,8 @@ namespace Microsoft.Plugin.Folder
             {
                 Title = Title,
                 IcoPath = Path,
+
+                // Using CurrentCulture since this is user facing
                 SubTitle = string.Format(CultureInfo.CurrentCulture, Properties.Resources.wox_plugin_folder_select_folder_result_subtitle, Subtitle),
                 QueryTextDisplay = Path,
                 ContextData = new SearchResult { Type = ResultType.Folder, FullPath = Path },

src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
+using System.IO.Abstractions;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
@@ -19,6 +19,8 @@ namespace Microsoft.Plugin.Indexer
 {
     internal class ContextMenuLoader : IContextMenu
     {
+        private readonly IPath _path = new FileSystem().Path;
+
         private readonly PluginInitContext _context;
 
         public enum ResultType
@@ -41,7 +43,7 @@ namespace Microsoft.Plugin.Indexer
             var contextMenus = new List<ContextMenuResult>();
             if (selectedResult.ContextData is SearchResult record)
             {
-                ResultType type = Path.HasExtension(record.Path) ? ResultType.File : ResultType.Folder;
+                ResultType type = _path.HasExtension(record.Path) ? ResultType.File : ResultType.Folder;
 
                 if (type == ResultType.File)
                 {
@@ -95,7 +97,7 @@ namespace Microsoft.Plugin.Indexer
                         {
                             if (type == ResultType.File)
                             {
-                                Helper.OpenInConsole(Path.GetDirectoryName(record.Path));
+                                Helper.OpenInConsole(_path.GetDirectoryName(record.Path));
                             }
                             else
                             {
@@ -147,9 +149,10 @@ namespace Microsoft.Plugin.Indexer
         // Function to test if the file can be run as admin
         private bool CanFileBeRunAsAdmin(string path)
         {
-            string fileExtension = Path.GetExtension(path);
+            string fileExtension = _path.GetExtension(path);
             foreach (string extension in appExtensions)
             {
+                // Using OrdinalIgnoreCase since this is internal
                 if (extension.Equals(fileExtension, StringComparison.OrdinalIgnoreCase))
                 {
                     return true;

src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/DriveDetection/DriveInfoWrapper.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.Plugin.Indexer.DriveDetection
+{
+    public class DriveInfoWrapper : IDriveInfoWrapper
+    {
+        private static readonly int DriveCount = GetDriveInfo();
+
+        private static int GetDriveInfo()
+        {
+            // To ignore removable type drives, CD ROMS, no root partitions which may not be formatted and only return the fixed drives in the system.
+            return DriveInfo.GetDrives().Where(d => d.DriveType == DriveType.Fixed).Count();
+        }
+
+        public int GetDriveCount() => DriveCount;
+    }
+}