diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 8eb70b8e5..11a3ac321 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -47,10 +47,11 @@
   </ItemGroup>
   
   <ItemGroup>
+    <Page Remove="Themes\Circle Light.xaml" />
+    <Page Remove="Themes\Circle System.xaml" />
     <Page Remove="Themes\DarkCyan.xaml" />
     <Page Remove="Themes\Gray.xaml" />
     <Page Remove="Themes\Light Bullet.xaml" />
-    <Page Remove="Themes\Light Circle.xaml" />
     <Page Remove="Themes\Midnight.xaml" />
     <Page Remove="Themes\ThemeBuilder\Template.xaml" />
     <Page Remove="Themes\Ubuntu.xaml" />
diff --git a/Flow.Launcher/Themes/Light Bullet.xaml b/Flow.Launcher/Themes/Bullet Light.xaml
similarity index 100%
rename from Flow.Launcher/Themes/Light Bullet.xaml
rename to Flow.Launcher/Themes/Bullet Light.xaml
diff --git a/Flow.Launcher/Themes/Light Circle.xaml b/Flow.Launcher/Themes/Circle Light.xaml
similarity index 100%
rename from Flow.Launcher/Themes/Light Circle.xaml
rename to Flow.Launcher/Themes/Circle Light.xaml
diff --git a/Flow.Launcher/Themes/Atom.xaml b/Flow.Launcher/Themes/Circle System.xaml
similarity index 52%
rename from Flow.Launcher/Themes/Atom.xaml
rename to Flow.Launcher/Themes/Circle System.xaml
index f532c97d5..bc6f9a4d7 100644
--- a/Flow.Launcher/Themes/Atom.xaml
+++ b/Flow.Launcher/Themes/Circle System.xaml	
@@ -1,7 +1,9 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:m="http://schemas.modernwpf.com/2019"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
+
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -9,48 +11,41 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9fb2bf" />
+        <Setter Property="Foreground" Value="#9da1aa" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#515a6b" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="#282c34" />
-        <Setter Property="Foreground" Value="#61afef" />
-        <Setter Property="CaretBrush" Value="#ffb86c" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
     </Style>
+
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#282c34" />
-        <Setter Property="Foreground" Value="#454e61" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlHighlightBaseMediumLowBrush}" />
     </Style>
+
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="BorderBrush" Value="#44475a" />
-        <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Background" Value="#282c34" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
+        <Setter Property="Background" Value="{m:DynamicColor SystemControlBackgroundChromeMediumLowBrush}" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style
         x:Key="WindowStyle"
         BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
+        TargetType="{x:Type Window}" />
     <Style
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
@@ -61,71 +56,47 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9fb2bf" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6272a4 " />
-        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseMediumBrush}" />
     </Style>
     <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6272a4" />
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="{m:DynamicColor SystemControlPageBackgroundListLowBrush}" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
     </Style>
+    <Style x:Key="HighlightStyle" />
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#e5c07b" />
+        <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#c678dd" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#2c313c</SolidColorBrush>
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#e06c75 " />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#6272a4" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#56b6c2" />
+        <Setter Property="Foreground" Value="#ffffff" />
     </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor SystemAccentColorLight1}" />
+
     <!--  button style in the middle of the scrollbar  -->
     <Style
         x:Key="ThumbStyle"
         BasedOn="{StaticResource BaseThumbStyle}"
         TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Width" Value="2" />
-        <Setter Property="Focusable" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#b4b5b7"
+                        Background="#a0a8b5"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -138,33 +109,57 @@
         x:Key="ScrollBarStyle"
         BasedOn="{StaticResource BaseScrollBarStyle}"
         TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#495162" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
-    </Style>
     <Style
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#495162" />
+        <Setter Property="Fill" Value="#9da1aa" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0.8" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#9da1aa" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">8</CornerRadius>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#495162" />
+        <Setter Property="Foreground" Value="#999aa3" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#495162" />
+        <Setter Property="Foreground" Value="#999aa3" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/DarkCyan.xaml b/Flow.Launcher/Themes/Cyan Dark.xaml
similarity index 100%
rename from Flow.Launcher/Themes/DarkCyan.xaml
rename to Flow.Launcher/Themes/Cyan Dark.xaml
diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml
index 3cf7fd123..2ee644498 100644
--- a/Flow.Launcher/Themes/Win11System.xaml
+++ b/Flow.Launcher/Themes/Win11System.xaml
@@ -12,6 +12,12 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
+    <Style
+        x:Key="ItemGlyphSelectedStyle"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+    </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"