Merge branch 'master' into dev/crutkas/upgradeNuget

2026-04-05 02:36:19 +02:00 · 2020-11-03 10:57:50 -08:00
parent 1fb31352de 35cf50c796
commit aa1d6f7095
432 changed files with 7397 additions and 3096 deletions
--- a/src/modules/fancyzones/editor/FancyZonesEditor/App.xaml.cs
+++ b/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);
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
+++ b/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"/>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml.cs
+++ b/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;
--- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
+++ b/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"/>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
+++ b/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;
    }
 }
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
+++ b/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"/>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
+++ b/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();
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/CanvasLayoutModel.cs
+++ b/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)
            {
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs
+++ b/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)
            {
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs
+++ b/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)
            {
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/Settings.cs
+++ b/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();
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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" />
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl
+++ b/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>
--- a/src/modules/fancyzones/lib/FancyZones.cpp
+++ b/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);
--- a/src/modules/fancyzones/lib/Resources.resx
+++ b/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>
--- a/src/modules/fancyzones/lib/ZoneWindow.cpp
+++ b/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;
    }
--- a/src/modules/fancyzones/lib/ZoneWindow.h
+++ b/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;
--- a/src/modules/fancyzones/lib/ZoneWindowDrawing.cpp
+++ b/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();
+}
--- a/src/modules/fancyzones/lib/ZoneWindowDrawing.h
+++ b/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);
+};
--- a/src/modules/fancyzones/lib/loc/cs/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/de/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/it/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/ja/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/ko/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/pl/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/sv/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/lib/loc/zh-Hans/src/modules/fancyzones/lib/Resources.resx.lcl
+++ b/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">
--- a/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp
+++ b/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);