diff --git a/src/modules/poweraccent/PowerAccent.UI/App.xaml b/src/modules/poweraccent/PowerAccent.UI/App.xaml
index aabf3459afec..e67322f3718a 100644
--- a/src/modules/poweraccent/PowerAccent.UI/App.xaml
+++ b/src/modules/poweraccent/PowerAccent.UI/App.xaml
@@ -2,16 +2,5 @@
     x:Class="PowerAccent.UI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    StartupUri="Selector.xaml">
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ui:ThemesDictionary Theme="Dark" />
-                <ui:ControlsDictionary />
-            </ResourceDictionary.MergedDictionaries>
-            <!--  Other app resources here  -->
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
\ No newline at end of file
+    StartupUri="Selector.xaml"
+    ThemeMode="System" />
\ No newline at end of file
diff --git a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj
index 30111fbdf7b0..4af77946bba8 100644
--- a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj
+++ b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj
@@ -24,10 +24,6 @@
 		</Resource>
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="WPF-UI" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
 		<ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />
diff --git a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml
index 6345a89fbdc8..792f4141e946 100644
--- a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml
+++ b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml
@@ -1,24 +1,22 @@
-<ui:FluentWindow
+<Window
     x:Class="PowerAccent.UI.Selector"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Title="MainWindow"
     MinWidth="0"
     MinHeight="0"
-    ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
+    AllowsTransparency="True"
+    Background="Transparent"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
-    ExtendsContentIntoTitleBar="True"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     SizeToContent="WidthAndHeight"
     Visibility="Collapsed"
-    WindowBackdropType="None"
     WindowStyle="None"
     mc:Ignorable="d">
-    <ui:FluentWindow.Resources>
+    <Window.Resources>
 
         <DataTemplate x:Key="DefaultKeyTemplate">
             <TextBlock
@@ -38,85 +36,86 @@
                 TextAlignment="Center" />
         </DataTemplate>
 
+    </Window.Resources>
+    <Border
+        Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+        BorderBrush="{DynamicResource SurfaceStrokeColorDefaultBrush}"
+        BorderThickness="1"
+        CornerRadius="8">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <ListBox
+                x:Name="characters"
+                HorizontalAlignment="Center"
+                HorizontalContentAlignment="Stretch"
+                VerticalContentAlignment="Stretch"
+                Background="Transparent"
+                IsHitTestVisible="False">
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="ListBoxItem">
+                        <Setter Property="ContentTemplate" Value="{StaticResource DefaultKeyTemplate}" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Grid
+                                        Width="48"
+                                        Height="48"
+                                        Margin="0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        SnapsToDevicePixels="true">
+                                        <Rectangle
+                                            x:Name="SelectionIndicator"
+                                            Margin="7"
+                                            HorizontalAlignment="Stretch"
+                                            VerticalAlignment="Stretch"
+                                            Fill="{DynamicResource AccentFillColorDefaultBrush}"
+                                            RadiusX="4"
+                                            RadiusY="4"
+                                            Stroke="{DynamicResource AccentControlElevationBorderBrush}"
+                                            StrokeThickness="1"
+                                            Visibility="Collapsed" />
+                                        <ContentPresenter Margin="12" />
+                                    </Grid>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsSelected" Value="true">
+                                            <Setter TargetName="SelectionIndicator" Property="Visibility" Value="Visible" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource SelectedKeyTemplate}" />
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ListBox.ItemContainerStyle>
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel IsItemsHost="False" Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+            </ListBox>
 
-    </ui:FluentWindow.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <ListBox
-            x:Name="characters"
-            HorizontalAlignment="Center"
-            HorizontalContentAlignment="Stretch"
-            VerticalContentAlignment="Stretch"
-            Background="Transparent"
-            IsHitTestVisible="False">
-            <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
-                    <Setter Property="ContentTemplate" Value="{StaticResource DefaultKeyTemplate}" />
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                                <Grid
-                                    Width="48"
-                                    Height="48"
-                                    Margin="0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    SnapsToDevicePixels="true">
-                                    <Rectangle
-                                        x:Name="SelectionIndicator"
-                                        Margin="7"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Stretch"
-                                        RadiusX="4"
-                                        RadiusY="4"
-                                        Stroke="{DynamicResource AccentControlElevationBorderBrush}"
-                                        StrokeThickness="1"
-                                        Visibility="Collapsed">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="{DynamicResource SystemAccentColorPrimary}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <ContentPresenter Margin="12" />
-
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="IsSelected" Value="true">
-                                        <Setter TargetName="SelectionIndicator" Property="Visibility" Value="Visible" />
-                                        <Setter Property="ContentTemplate" Value="{StaticResource SelectedKeyTemplate}" />
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </ListBox.ItemContainerStyle>
-            <ListBox.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <VirtualizingStackPanel IsItemsHost="False" Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-        </ListBox>
-
-        <Grid
-            Grid.Row="1"
-            MinWidth="600"
-            Background="{DynamicResource LayerOnAcrylicFillColorDefaultBrush}"
-            Visibility="{Binding CharacterNameVisibility, UpdateSourceTrigger=PropertyChanged}">
-            <TextBlock
-                x:Name="characterName"
-                Margin="8"
-                FontSize="12"
-                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                Text="(U+0000) A COOL LETTER NAME COMES HERE"
-                TextAlignment="Center" />
-            <Rectangle
-                Height="1"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Top"
-                Fill="{DynamicResource DividerStrokeColorDefaultBrush}" />
+            <Grid
+                Grid.Row="1"
+                MinWidth="600"
+                Background="{DynamicResource LayerOnAcrylicFillColorDefaultBrush}"
+                Visibility="{Binding CharacterNameVisibility, UpdateSourceTrigger=PropertyChanged}">
+                <TextBlock
+                    x:Name="characterName"
+                    Margin="8"
+                    FontSize="12"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                    Text="(U+0000) A COOL LETTER NAME COMES HERE"
+                    TextAlignment="Center" />
+                <Rectangle
+                    Height="1"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Fill="{DynamicResource DividerStrokeColorDefaultBrush}" />
+            </Grid>
         </Grid>
-    </Grid>
-</ui:FluentWindow>
\ No newline at end of file
+    </Border>
+</Window>
\ No newline at end of file
diff --git a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs
index 7eed6a9a1b13..4467571367f0 100644
--- a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs
+++ b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs
@@ -6,14 +6,12 @@
 using System.ComponentModel;
 using System.Windows;
 
-using Wpf.Ui.Controls;
-
 using Point = PowerAccent.Core.Point;
 using Size = PowerAccent.Core.Size;
 
 namespace PowerAccent.UI;
 
-public partial class Selector : FluentWindow, IDisposable, INotifyPropertyChanged
+public partial class Selector : Window, IDisposable, INotifyPropertyChanged
 {
     private readonly Core.PowerAccent _powerAccent = new();
 
@@ -41,8 +39,6 @@ public Selector()
     {
         InitializeComponent();
 
-        Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this);
-
         Application.Current.MainWindow.ShowActivated = false;
     }
 
@@ -92,7 +88,7 @@ private void MenuExit_Click(object sender, RoutedEventArgs e)
 
     private void SetWindowPosition()
     {
-        Size windowSize = new(((System.Windows.Controls.Panel)Application.Current.MainWindow.Content).ActualWidth, ((System.Windows.Controls.Panel)Application.Current.MainWindow.Content).ActualHeight);
+        Size windowSize = new(((FrameworkElement)Application.Current.MainWindow.Content).ActualWidth, ((FrameworkElement)Application.Current.MainWindow.Content).ActualHeight);
         Point position = _powerAccent.GetDisplayCoordinates(windowSize);
         this.Left = position.X;
         this.Top = position.Y;