diff --git a/ModernFlyouts.Core/Display/BrightnessController.cs b/ModernFlyouts.Core/Display/BrightnessController.cs
index 8ce1afbb..1b463239 100644
--- a/ModernFlyouts.Core/Display/BrightnessController.cs
+++ b/ModernFlyouts.Core/Display/BrightnessController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Management;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using ModernFlyouts.Core.Interop;
 
 namespace ModernFlyouts.Core.Display
diff --git a/ModernFlyouts.Core/Display/DisplayManager.cs b/ModernFlyouts.Core/Display/DisplayManager.cs
index c3fc1779..1a5cb3bb 100644
--- a/ModernFlyouts.Core/Display/DisplayManager.cs
+++ b/ModernFlyouts.Core/Display/DisplayManager.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using ModernFlyouts.Core.Interop;
 using System;
 using System.Collections.Generic;
diff --git a/ModernFlyouts.Core/Display/DisplayMonitor.cs b/ModernFlyouts.Core/Display/DisplayMonitor.cs
index 853421b8..79f9bbeb 100644
--- a/ModernFlyouts.Core/Display/DisplayMonitor.cs
+++ b/ModernFlyouts.Core/Display/DisplayMonitor.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Windows;
 
diff --git a/ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs b/ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs
index 4d2132b1..cc94a90c 100644
--- a/ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs
+++ b/ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows.Interop;
 using System.Windows.Threading;
 using static ModernFlyouts.Core.Interop.NativeMethods;
 
@@ -340,11 +342,31 @@ private static bool IsShellProcess(int id)
 
         private bool GetAllInfos()
         {
-            IntPtr hWndHost;
-            while ((hWndHost = FindWindowEx(IntPtr.Zero, IntPtr.Zero, "NativeHWNDHost", "")) != IntPtr.Zero)
+            IntPtr hWndHost = IntPtr.Zero;
+            IntPtr hWndDUI = IntPtr.Zero;
+
+            String build = RuntimeInformation.OSDescription.Substring(RuntimeInformation.OSDescription.LastIndexOf('.') + 1);
+            int buildNumber = int.Parse(build);
+
+            String outerClass = "";
+            String outerName = "";
+            String innerClass = "";
+            String innerName = "";
+            if (buildNumber >= 22000)
+            {
+                outerClass = "XamlExplorerHostIslandWindow";
+                innerClass = "Windows.UI.Composition.DesktopWindowContentBridge";
+                innerName = "DesktopWindowXamlSource";
+            }
+            else
+            {
+                outerClass = "NativeHWNDHost";
+                innerClass = "DirectUIHWND";
+            }
+
+            while ((hWndHost = FindWindowEx(IntPtr.Zero, hWndHost, outerClass, outerName)) != IntPtr.Zero)
             {
-                IntPtr hWndDUI;
-                if ((hWndDUI = FindWindowEx(hWndHost, IntPtr.Zero, "DirectUIHWND", "")) != IntPtr.Zero)
+                if ((hWndDUI = FindWindowEx(hWndHost, IntPtr.Zero, innerClass, innerName)) != IntPtr.Zero)
                 {
                     GetWindowThreadProcessId(hWndHost, out int pid);
                     if (Process.GetProcessById(pid).ProcessName.ToLower() == "explorer")
diff --git a/ModernFlyouts.Core/Media/Control/GSMTCMediaSession.cs b/ModernFlyouts.Core/Media/Control/GSMTCMediaSession.cs
index 4830819f..931da414 100644
--- a/ModernFlyouts.Core/Media/Control/GSMTCMediaSession.cs
+++ b/ModernFlyouts.Core/Media/Control/GSMTCMediaSession.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ModernFlyouts.Core.AppInformation;
 using ModernFlyouts.Core.Helpers;
 using System;
diff --git a/ModernFlyouts.Core/Media/Control/MediaSession.cs b/ModernFlyouts.Core/Media/Control/MediaSession.cs
index 19be276e..11d81951 100644
--- a/ModernFlyouts.Core/Media/Control/MediaSession.cs
+++ b/ModernFlyouts.Core/Media/Control/MediaSession.cs
@@ -1,5 +1,5 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using System;
 using System.Windows;
 using System.Windows.Input;
diff --git a/ModernFlyouts.Core/Media/Control/MediaSessionManager.cs b/ModernFlyouts.Core/Media/Control/MediaSessionManager.cs
index 5a11a160..4aec8f71 100644
--- a/ModernFlyouts.Core/Media/Control/MediaSessionManager.cs
+++ b/ModernFlyouts.Core/Media/Control/MediaSessionManager.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.ObjectModel;
 
diff --git a/ModernFlyouts.Core/Media/Control/NowPlayingMediaSession.cs b/ModernFlyouts.Core/Media/Control/NowPlayingMediaSession.cs
index e1d76291..6cd37d5e 100644
--- a/ModernFlyouts.Core/Media/Control/NowPlayingMediaSession.cs
+++ b/ModernFlyouts.Core/Media/Control/NowPlayingMediaSession.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ModernFlyouts.Core.AppInformation;
 using ModernFlyouts.Core.Helpers;
 using ModernFlyouts.Core.Threading;
diff --git a/ModernFlyouts.Core/ModernFlyouts.Core.csproj b/ModernFlyouts.Core/ModernFlyouts.Core.csproj
index dfdf80ff..a47c5377 100644
--- a/ModernFlyouts.Core/ModernFlyouts.Core.csproj
+++ b/ModernFlyouts.Core/ModernFlyouts.Core.csproj
@@ -9,7 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.0" />
     <PackageReference Include="NAudio" Version="2.0.1" />
     <PackageReference Include="NPSMLib" Version="0.9.14" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />
diff --git a/ModernFlyouts.Package/ModernFlyouts.Package.wapproj b/ModernFlyouts.Package/ModernFlyouts.Package.wapproj
index 38ef62a1..23488e28 100644
--- a/ModernFlyouts.Package/ModernFlyouts.Package.wapproj
+++ b/ModernFlyouts.Package/ModernFlyouts.Package.wapproj
@@ -43,7 +43,7 @@
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppInstallerUri>https://ModernFlyouts-community.github.io/package.github.io/ModernFlyouts.Package/ModernFlyouts.Package.appinstaller</AppInstallerUri>
     <EntryPointProjectUniqueName>..\ModernFlyouts\ModernFlyouts.csproj</EntryPointProjectUniqueName>
@@ -110,7 +110,9 @@
     <Content Include="Images\Wide310x150Logo.scale-150.png" />
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
-    <PRIResource Include="Strings\en-us\Resources.resw" />
+    <PRIResource Include="Strings\en-us\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
     <None Include="ModernFlyouts.Package_TemporaryKey.pfx" />
     <Content Include="Package.appinstaller" />
     <Content Include="priconfig.default.xml" />
@@ -122,7 +124,6 @@
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
       <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
     </ProjectReference>
-    <ProjectReference Include="..\ModernFlyoutsBridge\ModernFlyoutsBridge.vcxproj" />
   </ItemGroup>
   <Target Name="FlattenPackage" BeforeTargets="_ConvertItems">
     <ItemGroup>
diff --git a/ModernFlyouts/Controls/DisplayMonitorPicker.xaml.cs b/ModernFlyouts/Controls/DisplayMonitorPicker.xaml.cs
index 2c40e1ec..059a66a3 100644
--- a/ModernFlyouts/Controls/DisplayMonitorPicker.xaml.cs
+++ b/ModernFlyouts/Controls/DisplayMonitorPicker.xaml.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ModernFlyouts.Core.Display;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ModernFlyouts/Controls/LockKeysControl.xaml b/ModernFlyouts/Controls/LockKeysControl.xaml
index bbb3ebf2..9eb4caf8 100644
--- a/ModernFlyouts/Controls/LockKeysControl.xaml
+++ b/ModernFlyouts/Controls/LockKeysControl.xaml
@@ -9,12 +9,10 @@
              Height="64" d:DesignWidth="354" DataContext="{x:Static root:FlyoutHandler.Instance}">
 
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-        <ui:FontIcon Glyph="{Binding LockKeysFlyoutHelper.StatusGlyph}"
-                     d:Glyph="{x:Static utils:CommonGlyphs.Lock}" FontSize="24" />
-        <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center"
+        <ui:FontIcon x:Name="LockGlyph" Glyph="{x:Static utils:CommonGlyphs.Lock}" FontSize="24" />
+        <TextBlock x:Name="txt" HorizontalAlignment="Left" VerticalAlignment="Center"
                    Style="{DynamicResource BaseTextBlockStyle}" FontSize="18"
-                   Margin="20" Text="{Binding LockKeysFlyoutHelper.StatusText}"
-                   d:Text="Lock key is on" />
+                   Margin="20" Text="Lock key is on" />
     </StackPanel>
 
 </UserControl>
diff --git a/ModernFlyouts/Flyout Helpers/FlyoutHelperBase.cs b/ModernFlyouts/Flyout Helpers/FlyoutHelperBase.cs
index 2851ca33..3b70a785 100644
--- a/ModernFlyouts/Flyout Helpers/FlyoutHelperBase.cs	
+++ b/ModernFlyouts/Flyout Helpers/FlyoutHelperBase.cs	
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System.Windows;
 
 namespace ModernFlyouts
diff --git a/ModernFlyouts/Flyout Helpers/LockKeysFlyoutHelper.cs b/ModernFlyouts/Flyout Helpers/LockKeysFlyoutHelper.cs
index c5c2b890..eaa975b6 100644
--- a/ModernFlyouts/Flyout Helpers/LockKeysFlyoutHelper.cs	
+++ b/ModernFlyouts/Flyout Helpers/LockKeysFlyoutHelper.cs	
@@ -11,22 +11,6 @@ public class LockKeysFlyoutHelper : FlyoutHelperBase
 
         #region Properties
 
-        private string statusGlyph = string.Empty;
-
-        public string StatusGlyph
-        {
-            get => statusGlyph;
-            private set => SetProperty(ref statusGlyph, value);
-        }
-
-        private string statusText = string.Empty;
-
-        public string StatusText
-        {
-            get => statusText;
-            private set => SetProperty(ref statusText, value);
-        }
-
         private bool capsLockEnabled = DefaultValuesStore.LockKeysModule_CapsLockEnabled;
 
         public bool CapsLockEnabled
@@ -151,7 +135,6 @@ private void KeyReleased(Key key, int virtualKey)
         private void Prepare(LockKeys key, bool islock)
         {
             string msg;
-            string glyph;
 
             if (key != LockKeys.Insert)
             {
@@ -164,16 +147,15 @@ private void Prepare(LockKeys key, bool islock)
                 };
 
                 msg = string.Format(islock ? Properties.Strings.LockKeysFlyoutHelper_KeyIsOn : Properties.Strings.LockKeysFlyoutHelper_KeyIsOff, keyName);
-                glyph = islock ? CommonGlyphs.Lock : CommonGlyphs.Unlock;
+                lockKeysControl.LockGlyph.Glyph = islock ? CommonGlyphs.Lock : CommonGlyphs.Unlock;
             }
             else
             {
                 msg = islock ? Properties.Strings.LockKeysFlyoutHelper_OvertypeMode : Properties.Strings.LockKeysFlyoutHelper_InsertMode;
-                glyph = string.Empty;
+                lockKeysControl.LockGlyph.Glyph = string.Empty;
             }
 
-            StatusGlyph = glyph;
-            StatusText = msg;
+            lockKeysControl.txt.Text = msg;
         }
 
         private enum LockKeys
diff --git a/ModernFlyouts/FlyoutHandler.cs b/ModernFlyouts/FlyoutHandler.cs
index 5c83771a..3f1303d5 100644
--- a/ModernFlyouts/FlyoutHandler.cs
+++ b/ModernFlyouts/FlyoutHandler.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using ModernFlyouts.AppLifecycle;
 using ModernFlyouts.Core.Display;
 using ModernFlyouts.Core.Interop;
diff --git a/ModernFlyouts/ModernFlyouts.csproj b/ModernFlyouts/ModernFlyouts.csproj
index 348f2bd6..d3e38ea0 100644
--- a/ModernFlyouts/ModernFlyouts.csproj
+++ b/ModernFlyouts/ModernFlyouts.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
     <PackageReference Include="ModernWpf.Toolkit.UI.Controls" Version="0.1.0" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
diff --git a/ModernFlyouts/Properties/Strings.es.resx b/ModernFlyouts/Properties/Strings.es.resx
index f677f497..c9522070 100644
--- a/ModernFlyouts/Properties/Strings.es.resx
+++ b/ModernFlyouts/Properties/Strings.es.resx
@@ -87,7 +87,7 @@
     <value>Repetir: desactivado</value>
   </data>
   <data name="SessionControl.RepeatOne" xml:space="preserve">
-    <value>Repetir: una</value>
+    <value>Repetir: bucle</value>
   </data>
   <data name="SessionControl.ShuffleOff" xml:space="preserve">
     <value>Aleatorio: desactivado</value>
@@ -147,7 +147,7 @@
     <value>Teclas de bloqueo</value>
   </data>
   <data name="Settings.RunAtStartup" xml:space="preserve">
-    <value>Ejecutar al inicio</value>
+    <value>Iniciar con Windows</value>
   </data>
   <data name="SettingsItem" xml:space="preserve">
     <value>Configuración</value>
@@ -216,7 +216,7 @@
     <value>Mostrar controles de transporte de medios del sistema global (GSMTC) también conocidos como controles de medios en el control flotante de volumen</value>
   </data>
   <data name="AudioFlyoutHelper.ShowVolumeControlInGSMTCFlyout" xml:space="preserve">
-    <value>Mostrar control de volumen en global system Media Transport Controls (GSMTC) también conocido como control flotante de medios</value>
+    <value>Mostrar control de volumen en transporte de medios del sistema global (GSMTC) también conocido como control flotante de medios</value>
   </data>
   <data name="AudioFlyoutHelper.ThumbnailAlignment" xml:space="preserve">
     <value>Alineación de miniaturas</value>
@@ -249,7 +249,7 @@
     <value>Bloq Despl</value>
   </data>
   <data name="LockKeysFlyoutHelper.SelectKeyDescription" xml:space="preserve">
-    <value>Seleccione las teclas para las que desea mostrar el control flotante</value>
+    <value>Selecciona las teclas para las que desea mostrar el control flotante</value>
   </data>
   <data name="Settings.Appearance" xml:space="preserve">
     <value>Apariencia</value>
@@ -258,13 +258,13 @@
     <value>Activar el control flotante del modo avión</value>
   </data>
   <data name="Settings.EnableModule.Audio" xml:space="preserve">
-    <value>Activar el control flotante del audio</value>
+    <value>Activar control flotante para audio</value>
   </data>
   <data name="Settings.EnableModule.Brightness" xml:space="preserve">
-    <value>Activar el control flotante del brillo</value>
+    <value>Activar control flotante para brillo</value>
   </data>
   <data name="Settings.EnableModule.LockKeys" xml:space="preserve">
-    <value>Activar el control flotante del bloqueo de teclas</value>
+    <value>Activar control flotante para bloqueo de teclas</value>
   </data>
   <data name="Settings.FlyoutTheme" xml:space="preserve">
     <value>Tema del control flotante</value>
@@ -312,56 +312,14 @@
     <value>Alinear control flotante a esta posición</value>
   </data>
   <data name="Settings.RestartRequired" xml:space="preserve">
-    <value>Reinicio necesario para aplicar algunos cambios</value>
+    <value>Reinicia la aplicación para aplicar algunos cambios</value>
   </data>
   <data name="AudioFlyoutHelper.UseThumbnailAsBackground" xml:space="preserve">
     <value>Usar la miniatura multimedia como fondo del control multimedia</value>
   </data>
-  <data name="Enums.FlyoutWindowAlignments.Bottom" xml:space="preserve">
-    <value>Inferior</value>
-  </data>
-  <data name="Enums.FlyoutWindowAlignments.Center" xml:space="preserve">
-    <value>Centro</value>
-  </data>
-  <data name="Enums.FlyoutWindowAlignments.Left" xml:space="preserve">
-    <value>Izquierda</value>
-  </data>
-  <data name="Enums.FlyoutWindowAlignments.Right" xml:space="preserve">
-    <value>Derecha</value>
-  </data>
-  <data name="Enums.FlyoutWindowAlignments.Top" xml:space="preserve">
-    <value>Arriba</value>
-  </data>
-  <data name="Enums.FlyoutWindowExpandDirection.Auto" xml:space="preserve">
-    <value>Automático</value>
-  </data>
-  <data name="Enums.FlyoutWindowExpandDirection.Down" xml:space="preserve">
-    <value>Abajo</value>
-  </data>
-  <data name="Enums.FlyoutWindowExpandDirection.Left" xml:space="preserve">
-    <value>Izquierda</value>
-  </data>
-  <data name="Enums.FlyoutWindowExpandDirection.Right" xml:space="preserve">
-    <value>Derecha</value>
-  </data>
-  <data name="Enums.FlyoutWindowExpandDirection.Up" xml:space="preserve">
-    <value>Arriba</value>
-  </data>
-  <data name="Enums.FlyoutWindowPlacementMode.Auto" xml:space="preserve">
-    <value>Automático</value>
-  </data>
   <data name="Enums.FlyoutWindowPlacementMode.Manual" xml:space="preserve">
     <value>Manualmente</value>
   </data>
-  <data name="Enums.StackingDirection.Ascending" xml:space="preserve">
-    <value>Ascendente</value>
-  </data>
-  <data name="Enums.StackingDirection.Descending" xml:space="preserve">
-    <value>Descendente</value>
-  </data>
-  <data name="Settings.Display" xml:space="preserve">
-    <value>Mostrar</value>
-  </data>
   <data name="Settings.HorizontalAlignment" xml:space="preserve">
     <value>Alineación horizontal</value>
   </data>
diff --git a/ModernFlyouts/Properties/Strings.fr.resx b/ModernFlyouts/Properties/Strings.fr.resx
index a96c5091..8a2f9735 100644
--- a/ModernFlyouts/Properties/Strings.fr.resx
+++ b/ModernFlyouts/Properties/Strings.fr.resx
@@ -309,16 +309,19 @@
     <value>Désépingler la barre supérieure</value>
   </data>
   <data name="Settings.AlignFlyout" xml:space="preserve">
-    <value>Aligner le menu à cette position</value>
+    <value>Aligner le menu volant à cette position</value>
   </data>
   <data name="Settings.RestartRequired" xml:space="preserve">
     <value>Redémarrage requis pour appliquer certaines modifications</value>
   </data>
+  <data name="AudioFlyoutHelper.UseThumbnailAsBackground" xml:space="preserve">
+    <value>Utiliser la miniature du média comme arrière-plan du contrôle du média</value>
+  </data>
   <data name="Enums.FlyoutWindowAlignments.Bottom" xml:space="preserve">
-    <value>Bas</value>
+    <value>En bas</value>
   </data>
   <data name="Enums.FlyoutWindowAlignments.Center" xml:space="preserve">
-    <value>Centre</value>
+    <value>Centré</value>
   </data>
   <data name="Enums.FlyoutWindowAlignments.Left" xml:space="preserve">
     <value>Gauche</value>
@@ -327,7 +330,7 @@
     <value>Droite</value>
   </data>
   <data name="Enums.FlyoutWindowAlignments.Top" xml:space="preserve">
-    <value>Haut</value>
+    <value>En haut</value>
   </data>
   <data name="Enums.FlyoutWindowExpandDirection.Auto" xml:space="preserve">
     <value>Automatique</value>
@@ -351,14 +354,32 @@
     <value>Manuel</value>
   </data>
   <data name="Enums.StackingDirection.Ascending" xml:space="preserve">
-    <value>Croissant</value>
+    <value>Ascendant</value>
   </data>
   <data name="Enums.StackingDirection.Descending" xml:space="preserve">
-    <value>Décroissant</value>
+    <value>Descendant</value>
   </data>
   <data name="Settings.Display" xml:space="preserve">
     <value>Affichage</value>
   </data>
+  <data name="Settings.DisplayDescription" xml:space="preserve">
+    <value>Sélectionnez le moniteur d'affichage préféré pour afficher le menu volant.</value>
+  </data>
+  <data name="Settings.FlyoutAlignment" xml:space="preserve">
+    <value>Alignement du menu volant</value>
+  </data>
+  <data name="Settings.FlyoutContentStackingDirection" xml:space="preserve">
+    <value>Direction d'empilement du contenu du menu volant</value>
+  </data>
+  <data name="Settings.FlyoutExpandDirection" xml:space="preserve">
+    <value>Direction d'extension du menu volant</value>
+  </data>
+  <data name="Settings.FlyoutPlacement" xml:space="preserve">
+    <value>Positionnement du menu volant</value>
+  </data>
+  <data name="Settings.FlyoutPlacementMode" xml:space="preserve">
+    <value>Mode de positionnement</value>
+  </data>
   <data name="Settings.HorizontalAlignment" xml:space="preserve">
     <value>Alignement horizontal</value>
   </data>
@@ -368,4 +389,7 @@
   <data name="Settings.VerticalAlignment" xml:space="preserve">
     <value>Alignement vertical</value>
   </data>
+  <data name="Settings.FlyoutAnimationEnabled" xml:space="preserve">
+    <value>Animation en fondu</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernFlyouts/Properties/Strings.id.resx b/ModernFlyouts/Properties/Strings.id.resx
index 22198c31..71b108e8 100644
--- a/ModernFlyouts/Properties/Strings.id.resx
+++ b/ModernFlyouts/Properties/Strings.id.resx
@@ -285,7 +285,7 @@
     <value>Kanan</value>
   </data>
   <data name="Settings.TopBarVisibility" xml:space="preserve">
-    <value>Keterlihatan Bilah</value>
+    <value>Keterlihatan bilah</value>
   </data>
   <data name="Settings.TrayIconEnabled" xml:space="preserve">
     <value>Tampilkan ikon pada area baki sistem</value>
@@ -389,4 +389,7 @@
   <data name="Settings.VerticalAlignment" xml:space="preserve">
     <value>Perataan vertikal</value>
   </data>
+  <data name="Settings.FlyoutAnimationEnabled" xml:space="preserve">
+    <value>Animasi pudar</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernFlyouts/Properties/Strings.pt.resx b/ModernFlyouts/Properties/Strings.pt.resx
index 4d1a62b9..c930c1aa 100644
--- a/ModernFlyouts/Properties/Strings.pt.resx
+++ b/ModernFlyouts/Properties/Strings.pt.resx
@@ -13,22 +13,22 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
-    <value>Sobre</value>
+    <value>Acerca de</value>
   </data>
   <data name="AirplaneMode.NotAvailable" xml:space="preserve">
     <value>O modo avião não está disponível :(</value>
   </data>
   <data name="AirplaneModeOff" xml:space="preserve">
-    <value>Modo avião desligado</value>
+    <value>Modo de avião desligado</value>
   </data>
   <data name="AirplaneModeOn" xml:space="preserve">
-    <value>Modo avião ligado</value>
+    <value>Modo de avião ligado</value>
   </data>
   <data name="Align" xml:space="preserve">
-    <value>Alinhar à posição padrão</value>
+    <value>Alinhar para a posição padrão</value>
   </data>
   <data name="AudioFlyoutHelper.NoDevices" xml:space="preserve">
-    <value>Sem dispositivos de áudio conectados</value>
+    <value>Sem Dispositivos de Áudio Ligados</value>
   </data>
   <data name="Close" xml:space="preserve">
     <value>Fechar</value>
@@ -37,13 +37,13 @@
     <value>Sair</value>
   </data>
   <data name="ExitItemDescription" xml:space="preserve">
-    <value>Saia do aplicativo com segurança</value>
+    <value>Sair da aplicação em segurança</value>
   </data>
   <data name="GeneralSettings" xml:space="preserve">
     <value>Geral</value>
   </data>
   <data name="LockKeysFlyoutHelper.InsertMode" xml:space="preserve">
-    <value>Modo de inserção</value>
+    <value>Modo de Inserção</value>
   </data>
   <data name="LockKeysFlyoutHelper.KeyIsOff" xml:space="preserve">
     <value>{0} desligado</value>
@@ -54,25 +54,25 @@
     <comment>E.g. Caps lock is on</comment>
   </data>
   <data name="LockKeysFlyoutHelper.OvertypeMode" xml:space="preserve">
-    <value>Modo de substituição</value>
+    <value>Modo de Substituição</value>
   </data>
   <data name="PinTopBar" xml:space="preserve">
-    <value>Fixar barra superior</value>
+    <value>Afixar na Barra Superior</value>
   </data>
   <data name="RestoreDefaultItem" xml:space="preserve">
-    <value>Restaurar padrão</value>
+    <value>Restaurar flyout padrão</value>
   </data>
   <data name="RestoreDefaultItemDescription" xml:space="preserve">
-    <value>Restaura o flyout padrão do Windows e sai com segurança deste aplicativo</value>
+    <value>Restaura o flyout padrão do Windows e sai com segurança desta aplicação</value>
   </data>
   <data name="SessionControl.MoreControls" xml:space="preserve">
-    <value>Mais controles</value>
+    <value>Mais Controlos</value>
   </data>
   <data name="SessionControl.Next" xml:space="preserve">
-    <value>Próximo</value>
+    <value>Seguinte</value>
   </data>
   <data name="SessionControl.Pause" xml:space="preserve">
-    <value>Pausar</value>
+    <value>Pausa</value>
   </data>
   <data name="SessionControl.Play" xml:space="preserve">
     <value>Reproduzir</value>
@@ -99,7 +99,7 @@
     <value>Parar</value>
   </data>
   <data name="SessionControl.TimelineInfo" xml:space="preserve">
-    <value>Informações da linha do tempo</value>
+    <value>Informações da Linha Cronológica</value>
   </data>
   <data name="Settings.Additional" xml:space="preserve">
     <value>Adicional</value>
@@ -108,55 +108,55 @@
     <value>Comportamento</value>
   </data>
   <data name="Settings.DefaultFlyout" xml:space="preserve">
-    <value>Flyout padrão</value>
+    <value>Flyout Padrão</value>
   </data>
   <data name="Settings.DefaultFlyoutDescription" xml:space="preserve">
     <value>Selecione o flyout padrão</value>
   </data>
   <data name="Settings.DefaultFlyoutWarningMessage" xml:space="preserve">
-    <value>Escolher o Windows Default Flyout como padrão não fechará este aplicativo. Este aplicativo ainda continuará em execução em segundo plano. Por favor, saia deste aplicativo com segurança para melhorar o desempenho.</value>
+    <value>Escolher o Windows Default Flyout como padrão não fechará esta aplicação. Esta aplicação ainda continuará em execução em segundo plano. Por favor, saia desta aplicação em segurança para melhorar o desempenho.</value>
   </data>
   <data name="Settings.Disabled" xml:space="preserve">
-    <value>Desabilitado</value>
+    <value>Desativado</value>
   </data>
   <data name="Settings.Enabled" xml:space="preserve">
-    <value>Habilitado</value>
+    <value>Ativado</value>
   </data>
   <data name="Settings.FlyoutBackgroundOpacity" xml:space="preserve">
-    <value>Opacidade de fundo flyout</value>
+    <value>Opacidade do fundo do flyout</value>
   </data>
   <data name="Settings.FlyoutDefaultPosition" xml:space="preserve">
-    <value>Posição padrão de flyout (para botão alinhar)</value>
+    <value>Posição padrão do flyout</value>
   </data>
   <data name="Settings.FlyoutTopBar" xml:space="preserve">
-    <value>Barra superior do Flyout</value>
+    <value>Barra Superior do Flyout</value>
   </data>
   <data name="Settings.Modules" xml:space="preserve">
-    <value>Módulos</value>
+    <value>Módulos do Flyout</value>
   </data>
   <data name="Settings.Modules.Airplane" xml:space="preserve">
-    <value>Módulo do modo avião</value>
+    <value>Modo de avião</value>
   </data>
   <data name="Settings.Modules.Audio" xml:space="preserve">
-    <value>Módulo de áudio</value>
+    <value>Áudio</value>
   </data>
   <data name="Settings.Modules.Brightness" xml:space="preserve">
-    <value>Módulo de brilho</value>
+    <value>Luminosidade</value>
   </data>
   <data name="Settings.Modules.LockKeys" xml:space="preserve">
-    <value>Módulo de teclas de bloqueio</value>
+    <value>Teclas de bloqueio</value>
   </data>
   <data name="Settings.RunAtStartup" xml:space="preserve">
     <value>Executar na inicialização</value>
   </data>
   <data name="SettingsItem" xml:space="preserve">
-    <value>Configurações</value>
+    <value>Definições</value>
   </data>
   <data name="SettingsItemDescription" xml:space="preserve">
-    <value>Abrir janela de configurações</value>
+    <value>Abrir janela das definições</value>
   </data>
   <data name="UnpinTopBar" xml:space="preserve">
-    <value>Desafixar a barra superior</value>
+    <value>Desafixar a Barra Superior</value>
   </data>
   <data name="Enums.DefaultFlyout.ModernFlyouts" xml:space="preserve">
     <value>ModernFlyouts</value>
@@ -168,25 +168,25 @@
     <value>Padrão do Windows</value>
   </data>
   <data name="Enums.Orientation.Horizontal" xml:space="preserve">
-    <value>Horizontais</value>
+    <value>Horizontal</value>
   </data>
   <data name="Enums.Orientation.Vertical" xml:space="preserve">
-    <value>Verticais</value>
+    <value>Vertical</value>
   </data>
   <data name="About.AppDescription" xml:space="preserve">
-    <value>Este aplicativo foi projetado para ser um moderno substituto do Design Fluente para os antigos flyouts temáticos do metrô presentes no Windows desde o Windows 8.</value>
+    <value>Esta aplicação foi projetada para ser uma substituição moderna em Fluent Design para os antigos flyouts metrô presentes no Windows desde o Windows 8.</value>
   </data>
   <data name="About.Contributors" xml:space="preserve">
-    <value>Colaboradores</value>
+    <value>Contribuidores</value>
   </data>
   <data name="About.GitHub" xml:space="preserve">
     <value>Repositório GitHub</value>
   </data>
   <data name="About.OpenNewIssue" xml:space="preserve">
-    <value>Abra uma nova edição</value>
+    <value>Abra uma nova questão</value>
   </data>
   <data name="About.RateAndReview" xml:space="preserve">
-    <value>Taxa e revisão na Microsoft Store</value>
+    <value>Avalie e Reveja na Microsoft Store</value>
   </data>
   <data name="About.Version" xml:space="preserve">
     <value>Versão: </value>
@@ -195,16 +195,16 @@
     <value>Idioma</value>
   </data>
   <data name="Settings.LanguageDescription" xml:space="preserve">
-    <value>Por favor, reinicie o aplicativo para alterar o idioma corretamente</value>
+    <value>Por favor, reinicie a aplicação para alterar o idioma corretamente</value>
   </data>
   <data name="Settings.SystemDefault" xml:space="preserve">
-    <value>Padrão do Sistema</value>
+    <value>Padrão do sistema</value>
   </data>
   <data name="About.Dependencies" xml:space="preserve">
     <value>Dependências</value>
   </data>
   <data name="About.FileABug" xml:space="preserve">
-    <value>Se você encontrar algum bug, por favor abra um novo problema no repositório do github.</value>
+    <value>Se você encontrar algum bug, por favor abra um novo problema no repositório github.</value>
   </data>
   <data name="AudioFlyoutHelper.MaxVerticalSessionControlsCount" xml:space="preserve">
     <value>Número de sessões para mostrar</value>
@@ -213,13 +213,13 @@
     <value>Orientação do painel de sessões de mídia</value>
   </data>
   <data name="AudioFlyoutHelper.ShowGSMTCInVolumeFlyout" xml:space="preserve">
-    <value>Mostrar controles globais de transporte de mídia do sistema (GSMTC) também conhecidos como controles de mídia em flyout de volume</value>
+    <value>Mostrar Controlos Globais de Transporte de Mídia do Sistema (GSMTC) também conhecido como controlos de Mídia no Flyout de volume</value>
   </data>
   <data name="AudioFlyoutHelper.ShowVolumeControlInGSMTCFlyout" xml:space="preserve">
-    <value>Mostrar controle de volume em controles globais de transporte de mídia do sistema (GSMTC) também conhecido como flyout de mídia</value>
+    <value>Mostrar Controlo de volume em Controlos Globais de Transporte de Mídia do Sistema (GSMTC) também conhecido como Flyout de mídia</value>
   </data>
   <data name="AudioFlyoutHelper.ThumbnailAlignment" xml:space="preserve">
-    <value>Alinhamento de miniaturas</value>
+    <value>Alinhamento da miniatura</value>
   </data>
   <data name="Enums.ElementTheme.Dark" xml:space="preserve">
     <value>Escuro</value>
@@ -246,7 +246,7 @@
     <value>Num lock</value>
   </data>
   <data name="LockKeysFlyoutHelper.ScrollLock" xml:space="preserve">
-    <value>Bloqueio de rolagem</value>
+    <value>Scroll lock</value>
   </data>
   <data name="LockKeysFlyoutHelper.SelectKeyDescription" xml:space="preserve">
     <value>Selecione as teclas que deseja mostrar o flyout para</value>
@@ -255,22 +255,22 @@
     <value>Aparência</value>
   </data>
   <data name="Settings.EnableModule.Airplane" xml:space="preserve">
-    <value>Ativar flyout do modo avião</value>
+    <value>Ativar Flyout do Modo de avião</value>
   </data>
   <data name="Settings.EnableModule.Audio" xml:space="preserve">
-    <value>Ativar flyout de áudio</value>
+    <value>Ativar Flyout de Áudio</value>
   </data>
   <data name="Settings.EnableModule.Brightness" xml:space="preserve">
-    <value>Ativar o flyout de brilho</value>
+    <value>Ativar Flyout de Luminosidade</value>
   </data>
   <data name="Settings.EnableModule.LockKeys" xml:space="preserve">
-    <value>Ativar flyout de chaves de bloqueio</value>
+    <value>Ativar Flyout das Teclas de bloqueio</value>
   </data>
   <data name="Settings.FlyoutTheme" xml:space="preserve">
-    <value>Tema de flyout</value>
+    <value>Tema do flyout</value>
   </data>
   <data name="Settings.FlyoutTimeout" xml:space="preserve">
-    <value>Tempo limite de voo (ms)</value>
+    <value>Tempo limite do flyout (ms)</value>
   </data>
   <data name="Settings.Left" xml:space="preserve">
     <value>Esquerda</value>
@@ -279,13 +279,13 @@
     <value>Mídia</value>
   </data>
   <data name="Settings.Modules.Audio.Volume" xml:space="preserve">
-    <value>Quantidade</value>
+    <value>Volume</value>
   </data>
   <data name="Settings.Right" xml:space="preserve">
     <value>Direita</value>
   </data>
   <data name="Settings.TopBarVisibility" xml:space="preserve">
-    <value>Visibilidade topbar</value>
+    <value>Visibilidade da barra superior</value>
   </data>
   <data name="Settings.TrayIconEnabled" xml:space="preserve">
     <value>Mostrar ícone na área da bandeja do sistema</value>
@@ -297,13 +297,13 @@
     <value>Ativado</value>
   </data>
   <data name="Settings.AppTheme" xml:space="preserve">
-    <value>Tema do aplicativo</value>
+    <value>Tema da aplicação</value>
   </data>
   <data name="Settings.UseColoredTrayIcon" xml:space="preserve">
-    <value>Use o ícone da bandeja colorida</value>
+    <value>Usar ícone da bandeja colorida</value>
   </data>
   <data name="Settings.ResetToDefaults" xml:space="preserve">
-    <value>Redefinir todas as configurações para padrões</value>
+    <value>Redefinir todas as definições para padrões</value>
   </data>
   <data name="Settings.Personalization" xml:space="preserve">
     <value>Personalização</value>
@@ -314,6 +314,9 @@
   <data name="Settings.RestartRequired" xml:space="preserve">
     <value>Reinício necessário para aplicar algumas alterações</value>
   </data>
+  <data name="AudioFlyoutHelper.UseThumbnailAsBackground" xml:space="preserve">
+    <value>Usar a miniatura dos mídia como fundo do controlo dos mídias</value>
+  </data>
   <data name="Enums.FlyoutWindowAlignments.Bottom" xml:space="preserve">
     <value>Inferior</value>
   </data>
@@ -348,16 +351,34 @@
     <value>Automático</value>
   </data>
   <data name="Enums.FlyoutWindowPlacementMode.Manual" xml:space="preserve">
-    <value>Manuais</value>
+    <value>Manual</value>
   </data>
   <data name="Enums.StackingDirection.Ascending" xml:space="preserve">
-    <value>Crescente</value>
+    <value>Ascendente</value>
   </data>
   <data name="Enums.StackingDirection.Descending" xml:space="preserve">
-    <value>Decrescente</value>
+    <value>Descendente</value>
   </data>
   <data name="Settings.Display" xml:space="preserve">
-    <value>Exibir</value>
+    <value>Ecrã</value>
+  </data>
+  <data name="Settings.DisplayDescription" xml:space="preserve">
+    <value>Selecione o ecrã preferido para mostrar o flyout em</value>
+  </data>
+  <data name="Settings.FlyoutAlignment" xml:space="preserve">
+    <value>Alinhamento do flyout</value>
+  </data>
+  <data name="Settings.FlyoutContentStackingDirection" xml:space="preserve">
+    <value>Direção do empilhamento de conteúdo do flyout</value>
+  </data>
+  <data name="Settings.FlyoutExpandDirection" xml:space="preserve">
+    <value>Direção de expansão do flyout</value>
+  </data>
+  <data name="Settings.FlyoutPlacement" xml:space="preserve">
+    <value>Colocação do flyout</value>
+  </data>
+  <data name="Settings.FlyoutPlacementMode" xml:space="preserve">
+    <value>Modo de colocação</value>
   </data>
   <data name="Settings.HorizontalAlignment" xml:space="preserve">
     <value>Alinhamento horizontal</value>
@@ -368,4 +389,7 @@
   <data name="Settings.VerticalAlignment" xml:space="preserve">
     <value>Alinhamento vertical</value>
   </data>
+  <data name="Settings.FlyoutAnimationEnabled" xml:space="preserve">
+    <value>Animação fade</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernFlyouts/Properties/Strings.ru.resx b/ModernFlyouts/Properties/Strings.ru.resx
index c3e18952..2e7c228b 100644
--- a/ModernFlyouts/Properties/Strings.ru.resx
+++ b/ModernFlyouts/Properties/Strings.ru.resx
@@ -25,7 +25,7 @@
     <value>Режим полёта включен</value>
   </data>
   <data name="Align" xml:space="preserve">
-    <value>Выравнять к позиции по умолчанию</value>
+    <value>Выровнять к позиции по умолчанию</value>
   </data>
   <data name="AudioFlyoutHelper.NoDevices" xml:space="preserve">
     <value>Нет подключенных аудиоустройств</value>
@@ -63,7 +63,7 @@
     <value>Восстановить значения по умолчанию</value>
   </data>
   <data name="RestoreDefaultItemDescription" xml:space="preserve">
-    <value>Восстанавливает всплывающие окна по умолчанию и безопасно завершает приложение</value>
+    <value>Восстанавливает всплывающие окна по умолчанию и безопасно совершает выход из приложения</value>
   </data>
   <data name="SessionControl.MoreControls" xml:space="preserve">
     <value>Другие элементы</value>
@@ -114,7 +114,7 @@
     <value>Выберите всплывающие окна по умолчанию</value>
   </data>
   <data name="Settings.DefaultFlyoutWarningMessage" xml:space="preserve">
-    <value>При выборе всплывающих окон из Windows по умолчанию, данное приложение будет работать в фоновом режиме.
+    <value>При выборе всплывающих окон из Windows по умолчанию данное приложение будет работать в фоновом режиме.
           Пожалуйста, выйдите безопасно из данного приложения, чтобы улучшить производительность.</value>
   </data>
   <data name="Settings.Disabled" xml:space="preserve">
@@ -148,7 +148,7 @@
     <value>Клавиши блокировки</value>
   </data>
   <data name="Settings.RunAtStartup" xml:space="preserve">
-    <value>Автозагрузка</value>
+    <value>Автозапуск при старте компьютера</value>
   </data>
   <data name="SettingsItem" xml:space="preserve">
     <value>Настройки</value>
@@ -250,7 +250,7 @@
     <value>Scroll Lock</value>
   </data>
   <data name="LockKeysFlyoutHelper.SelectKeyDescription" xml:space="preserve">
-    <value>Выберите клавиши для которых желаете отображать всплывающее окно</value>
+    <value>Выберите клавиши, для которых желаете отображать всплывающее окно</value>
   </data>
   <data name="Settings.Appearance" xml:space="preserve">
     <value>Внешний вид</value>
@@ -313,7 +313,7 @@
     <value>Выровнять положение к этой точке</value>
   </data>
   <data name="Settings.RestartRequired" xml:space="preserve">
-    <value>Перезагрузка необходима для применения некоторых изменений.</value>
+    <value>Для применения некоторых изменений необходима перезагрузка.</value>
   </data>
   <data name="Enums.FlyoutWindowAlignments.Bottom" xml:space="preserve">
     <value>Снизу</value>
@@ -351,12 +351,6 @@
   <data name="Enums.FlyoutWindowPlacementMode.Manual" xml:space="preserve">
     <value>Вручную</value>
   </data>
-  <data name="Enums.StackingDirection.Ascending" xml:space="preserve">
-    <value>По возрастанию</value>
-  </data>
-  <data name="Enums.StackingDirection.Descending" xml:space="preserve">
-    <value>По убыванию</value>
-  </data>
   <data name="Settings.Display" xml:space="preserve">
     <value>Отобразить</value>
   </data>
diff --git a/ModernFlyouts/Properties/Strings.tr.resx b/ModernFlyouts/Properties/Strings.tr.resx
index 01d9620d..b3ca6ad8 100644
--- a/ModernFlyouts/Properties/Strings.tr.resx
+++ b/ModernFlyouts/Properties/Strings.tr.resx
@@ -16,13 +16,13 @@
     <value>Hakkında</value>
   </data>
   <data name="AirplaneMode.NotAvailable" xml:space="preserve">
-    <value>Uçak modu kullanılamıyor :(</value>
+    <value>Uçak Modu kullanılamıyor :(</value>
   </data>
   <data name="AirplaneModeOff" xml:space="preserve">
-    <value>Uçak modu kapalı</value>
+    <value>Uçak Modu kapalı</value>
   </data>
   <data name="AirplaneModeOn" xml:space="preserve">
-    <value>Uçak modu açık</value>
+    <value>Uçak Modu açık</value>
   </data>
   <data name="Align" xml:space="preserve">
     <value>Varsayılan konuma hizala</value>
@@ -135,7 +135,7 @@
     <value>Açılır Pencere Modülleri</value>
   </data>
   <data name="Settings.Modules.Airplane" xml:space="preserve">
-    <value>Uçak modu</value>
+    <value>Uçak Modu</value>
   </data>
   <data name="Settings.Modules.Audio" xml:space="preserve">
     <value>Ses</value>
@@ -144,7 +144,7 @@
     <value>Parlaklık</value>
   </data>
   <data name="Settings.Modules.LockKeys" xml:space="preserve">
-    <value>Kilit tuşları</value>
+    <value>Kilit Tuşları</value>
   </data>
   <data name="Settings.RunAtStartup" xml:space="preserve">
     <value>Başlangıçta çalıştır</value>
@@ -249,13 +249,13 @@
     <value>Scroll Lock</value>
   </data>
   <data name="LockKeysFlyoutHelper.SelectKeyDescription" xml:space="preserve">
-    <value>Açılır pencerede gözükmesini istediğiniz tuşları seçin</value>
+    <value>Açılır pencerede göstermek istediğiniz tuşları seçin</value>
   </data>
   <data name="Settings.Appearance" xml:space="preserve">
     <value>Görünüm</value>
   </data>
   <data name="Settings.EnableModule.Airplane" xml:space="preserve">
-    <value>Uçak modu Açılır Penceresini etkinleştirin</value>
+    <value>Uçak Modu Açılır Penceresini etkinleştirin</value>
   </data>
   <data name="Settings.EnableModule.Audio" xml:space="preserve">
     <value>Ses Açılır Penceresini etkinleştirin</value>
diff --git a/ModernFlyouts/Properties/Strings.zh-Hant.resx b/ModernFlyouts/Properties/Strings.zh-Hant.resx
index 2ccfdc7d..869f0f66 100644
--- a/ModernFlyouts/Properties/Strings.zh-Hant.resx
+++ b/ModernFlyouts/Properties/Strings.zh-Hant.resx
@@ -291,7 +291,7 @@
     <value>解鎖頂部列</value>
   </data>
   <data name="Settings.Off" xml:space="preserve">
-    <value>語法錯誤</value>
+    <value>關閉</value>
   </data>
   <data name="Settings.On" xml:space="preserve">
     <value>開啟</value>
diff --git a/ModernFlyouts/Properties/Strings.zh-TW.resx b/ModernFlyouts/Properties/Strings.zh-TW.resx
index 2ccfdc7d..869f0f66 100644
--- a/ModernFlyouts/Properties/Strings.zh-TW.resx
+++ b/ModernFlyouts/Properties/Strings.zh-TW.resx
@@ -291,7 +291,7 @@
     <value>解鎖頂部列</value>
   </data>
   <data name="Settings.Off" xml:space="preserve">
-    <value>語法錯誤</value>
+    <value>關閉</value>
   </data>
   <data name="Settings.On" xml:space="preserve">
     <value>開啟</value>
diff --git a/ModernFlyouts/UI/UIManager.cs b/ModernFlyouts/UI/UIManager.cs
index f51848b5..bcb4c420 100644
--- a/ModernFlyouts/UI/UIManager.cs
+++ b/ModernFlyouts/UI/UIManager.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using ModernFlyouts.Controls;
 using ModernFlyouts.Core.UI;
 using ModernFlyouts.Helpers;
diff --git a/ModernFlyouts/Utilities/CommonCommands.cs b/ModernFlyouts/Utilities/CommonCommands.cs
index c5ac210f..ae0b9825 100644
--- a/ModernFlyouts/Utilities/CommonCommands.cs
+++ b/ModernFlyouts/Utilities/CommonCommands.cs
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ModernFlyouts.Core.UI;
 using ModernFlyouts.Helpers;
 using System.Threading.Tasks;