diff --git a/Core/Core.csproj b/Core/Core.csproj
index ceb718b..1a7fd9f 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -10,6 +10,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <AvaloniaVersion>11.2.999-cibuild0050044-alpha</AvaloniaVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -30,12 +31,12 @@
     </ItemGroup>-->
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.1.0-rc2"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc2"/>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc2"/>
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2"/>
-        <PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
+        <PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview4"/>
         <PackageReference Include="log4net" Version="2.0.17"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1"/>
         <PackageReference Include="SharpHook" Version="5.3.7"/>
diff --git a/KitopiaAvalonia/Controls/HotKeyShowItme.axaml b/KitopiaAvalonia/Controls/HotKeyShowItme.axaml
index a6e134c..413264f 100644
--- a/KitopiaAvalonia/Controls/HotKeyShowItme.axaml
+++ b/KitopiaAvalonia/Controls/HotKeyShowItme.axaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:KitopiaAvalonia.Controls"
-        xmlns:controls1="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
+        xmlns:controls="using:KitopiaAvalonia.Controls">
     <Design.PreviewWith>
         <controls:HotKeyShowItme Content="Ctrl" />
     </Design.PreviewWith>
@@ -10,57 +9,51 @@
         <!-- Set Defaults -->
         <Setter Property="Template">
             <ControlTemplate>
-                <controls1:FABorder Background="{DynamicResource AccentButtonBackground}"
-                             BorderBrush="{DynamicResource AccentButtonBorderBrush}"
-                             BorderThickness="{DynamicResource ButtonBorderThemeThickness}"
-                             CornerRadius="{DynamicResource ControlCornerRadius}"
-                             Name="Root">
-                    <controls1:FABorder.Styles>
-                        <Style Selector="controls1|FABorder:disabled">
-                            <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
-                        </Style>
-                    </controls1:FABorder.Styles>
-                    <Border
-                        x:Name="ContentBorder"
+                <Border Name="Root"
+                        Background="{DynamicResource AccentButtonBackground}"
+                        BorderBrush="{DynamicResource AccentButtonBorderBrush}"
+                        BorderThickness="{DynamicResource ButtonBorderThemeThickness}"
+                        CornerRadius="{DynamicResource ControlCornerRadius}"
                         Width="{TemplateBinding Width}"
                         Height="{TemplateBinding Height}"
                         MinWidth="{TemplateBinding MinWidth}"
                         MinHeight="{TemplateBinding MinHeight}"
                         Padding="{StaticResource ButtonPadding}"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter
+                            x:Name="ControlIcon"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Icon}"
+                            Foreground="{DynamicResource AccentButtonForeground}"
+                            Focusable="False">
 
-                                <ContentPresenter
-                                    x:Name="ControlIcon"
-                                    Grid.Column="0"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Icon}"
-                                    Foreground="{DynamicResource AccentButtonForeground}"
-                                    Focusable="False">
-                                   
-                                </ContentPresenter>
+                        </ContentPresenter>
+
+                        <ContentPresenter
+                            x:Name="ContentPresenter"
+                            Grid.Column="1"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            Foreground="{DynamicResource AccentButtonForeground}">
+
+                        </ContentPresenter>
+                    </Grid>
+                    <Border.Styles>
+                        <Style Selector="Border:disabled">
+                            <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
+                        </Style>
+                    </Border.Styles>
+                </Border>
 
-                                <ContentPresenter
-                                    x:Name="ContentPresenter"
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    Foreground="{DynamicResource AccentButtonForeground}">
-                                    
-                                </ContentPresenter>
-                            </Grid>
-                        
-                    </Border>
-                </controls1:FABorder>
-                    
-                
             </ControlTemplate>
         </Setter>
     </Style>
diff --git a/KitopiaAvalonia/Controls/ListShow.axaml b/KitopiaAvalonia/Controls/ListShow.axaml
index 300e98d..c022b0d 100644
--- a/KitopiaAvalonia/Controls/ListShow.axaml
+++ b/KitopiaAvalonia/Controls/ListShow.axaml
@@ -60,7 +60,7 @@
                                             <Button.Styles>
 
                                                 <Style
-                                                    Selector="Button#Button:pointerover /template/ controls1|FABorder#Root">
+                                                    Selector="Button#Button:pointerover /template/ Border#Root">
 
                                                     <Setter Property="Background">
                                                         <SolidColorBrush
diff --git a/KitopiaAvalonia/KitopiaAvalonia.csproj b/KitopiaAvalonia/KitopiaAvalonia.csproj
index cc0991e..4f4d437 100644
--- a/KitopiaAvalonia/KitopiaAvalonia.csproj
+++ b/KitopiaAvalonia/KitopiaAvalonia.csproj
@@ -30,7 +30,7 @@
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
         <DebugType Condition="'$(Configuration)' == 'Release'">none</DebugType>
         <Version>0.0.2.053</Version>
-        <AvaloniaVersion>11.1.0-beta2</AvaloniaVersion>
+        <AvaloniaVersion>11.2.999-cibuild0050044-alpha</AvaloniaVersion>
     </PropertyGroup>
 
 
@@ -52,14 +52,14 @@
 
     <ItemGroup>
         <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-rc2"/>
+        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
         <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1"/>
         <PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.1.0-rc2"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc2"/>
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc2"/>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-rc2"/>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2"/>
         <PackageReference Include="log4net" Version="2.0.17"/>
diff --git a/KitopiaAvalonia/Pages/MyDataTemplateSelector.cs b/KitopiaAvalonia/Pages/MyDataTemplateSelector.cs
index 755592d..0d0d0ba 100644
--- a/KitopiaAvalonia/Pages/MyDataTemplateSelector.cs
+++ b/KitopiaAvalonia/Pages/MyDataTemplateSelector.cs
@@ -2,15 +2,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.Layout;
-using Avalonia.Media;
 using Avalonia.Metadata;
 using Core.SDKs.CustomScenario;
+using KitopiaAvalonia.Tools;
 
 #endregion
 
@@ -21,6 +17,15 @@ public class MyDataTemplateSelector : IDataTemplate
     // Override the SelectTemplate method
     [Content] public Dictionary<string, IDataTemplate> Templates { get; } = new Dictionary<string, IDataTemplate>();
 
+    private static Type ResolveType(string? ns, string typeName)
+    {
+        return typeName switch
+        {
+            "TextBlock" => typeof(TextBlock),
+            "ComboBox" => typeof(ComboBox),
+            _ => throw new InvalidOperationException($"Could not resolve type {typeName}.")
+        };
+    }
 
     public Control? Build(object? item)
     {
@@ -41,34 +46,14 @@ public class MyDataTemplateSelector : IDataTemplate
                 return control;
             }
 
+
             if (pointItem.RealType.BaseType.FullName == "System.Enum")
             {
-                StackPanel stackPanel = new StackPanel();
-                stackPanel.Orientation = Orientation.Horizontal;
-                stackPanel.VerticalAlignment = VerticalAlignment.Center;
-                stackPanel.HorizontalAlignment = HorizontalAlignment.Right;
-                TextBlock textBlock = new TextBlock
-                {
-                    VerticalAlignment = VerticalAlignment.Center,
-                    Name = "textBlock",
-                    Foreground = Application.Current.Resources["TextFillColorPrimaryBrush"] as IBrush,
-                };
-                var binding = new Binding();
-                binding.Path = "Title";
-                textBlock.Bind(TextBlock.TextProperty, binding);
-                stackPanel.Children.Add(textBlock);
-                var itemsSource = pointItem.RealType.GetEnumValues();
-                var enumerable = itemsSource.Cast<Object>().ToList().AsReadOnly();
-                var comboBox = new ComboBox()
-                {
-                    ItemsSource = enumerable,
-                    SelectedIndex = 0
-                };
-                var bingding2 = new Binding();
-                bingding2.Path = "InputObject";
-                comboBox.Bind(ComboBox.SelectedValueProperty, bingding2);
-                stackPanel.Children.Add(comboBox);
-                return stackPanel;
+                var control = Templates["EnumTemplate"].Build(item);
+                var childOfType = control.GetChildOfType<ComboBox>("ComboBox");
+                childOfType.ItemsSource = pointItem.RealType.GetEnumValues();
+                Console.WriteLine(1);
+                return control;
             }
 
             switch (pointItem.RealType.FullName!)
diff --git a/KitopiaAvalonia/Services/ScreenCaptureWindow.cs b/KitopiaAvalonia/Services/ScreenCaptureWindow.cs
index 2a3a540..a6279e5 100644
--- a/KitopiaAvalonia/Services/ScreenCaptureWindow.cs
+++ b/KitopiaAvalonia/Services/ScreenCaptureWindow.cs
@@ -82,6 +82,7 @@ public async Task<ScreenCaptureInfo> GetScreenCaptureInfo()
                     CanResize = false,
                     IsVisible = true,
                 };
+
                 window.MosaicImage.Source = captureAllScreen.Item2.Count > 0 ? captureAllScreen.Item2.Dequeue() : null;
                 window.Image.Source = captureAllScreen.Item1.Count > 0 ? captureAllScreen.Item1.Dequeue() : null;
                 window.SetToSelectMode(action);
diff --git a/KitopiaAvalonia/Styles/FAColorPicker.axaml b/KitopiaAvalonia/Styles/FAColorPicker.axaml
index f1d374c..3e4affc 100644
--- a/KitopiaAvalonia/Styles/FAColorPicker.axaml
+++ b/KitopiaAvalonia/Styles/FAColorPicker.axaml
@@ -49,7 +49,7 @@
                                         Height="40"
                                         CornerRadius="{DynamicResource ControlCornerRadius}"
                                         Grid.Row="1"
-                                        Background="{TemplateBinding PreviousColor, Converter={StaticResource ColorBrushConv}}"/>
+                                        Background="{TemplateBinding PreviousColor, Converter={StaticResource ColorBrushConv}}" />
 
                                 <!-- Current Color & +2 Light/Dark variants -->
                                 <Border Name="DarkVariantBackground"
@@ -64,12 +64,12 @@
                                         CornerRadius="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
                                         Grid.Row="1"
                                         Grid.Column="2"
-                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=-0.66}"/>
+                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=-0.66}" />
                                 <Border Name="Dark1PreviewBorder"
                                         Height="40"
                                         Grid.Row="1"
                                         Grid.Column="3"
-                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=-0.33}"/>
+                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=-0.33}" />
 
 
                                 <Border Name="LightVariantBackground"
@@ -84,13 +84,13 @@
                                         CornerRadius="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}"
                                         Grid.Row="1"
                                         Grid.Column="6"
-                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=0.66}"/>
+                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=0.66}" />
 
                                 <Border Name="Light1PreviewBorder"
                                         Height="40"
                                         Grid.Row="1"
                                         Grid.Column="5"
-                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=0.33}"/>
+                                        Background="{TemplateBinding Color, Converter={StaticResource ColorShadeBrushConv}, ConverterParameter=0.33}" />
 
 
                                 <Border Name="CurrentBackground"
@@ -98,12 +98,12 @@
                                         Height="48"
                                         CornerRadius="4"
                                         Grid.Row="1"
-                                        Grid.Column="4"/>
+                                        Grid.Column="4" />
                                 <Border Name="CurrentColorPreviewBorder"
-                                       CornerRadius="{DynamicResource ControlCornerRadius}"
-                                       Grid.Row="1"
-                                       Grid.Column="4"
-                                        Background="{TemplateBinding Color, Converter={StaticResource ColorBrushConv}}"/>
+                                        CornerRadius="{DynamicResource ControlCornerRadius}"
+                                        Grid.Row="1"
+                                        Grid.Column="4"
+                                        Background="{TemplateBinding Color, Converter={StaticResource ColorBrushConv}}" />
 
 
                             </Grid>
@@ -133,9 +133,8 @@
                                             <!--IsVisible="{TemplateBinding UseColorWheel}"-->
                                             <TabItem.Header>
                                                 <ui:FontIcon Glyph="&#xE790;"
-                                                        FontSize="20"
-                                                        FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                                     />
+                                                             FontSize="20"
+                                                             FontFamily="{DynamicResource SymbolThemeFontFamily}" />
                                             </TabItem.Header>
                                         </TabItem>
                                         <TabItem Name="TriangleTab"
@@ -154,8 +153,8 @@
                                                  IsVisible="{TemplateBinding UseColorPalette}">
                                             <TabItem.Header>
                                                 <ui:FontIcon Glyph="&#xF0E2;"
-                                                         FontSize="20"
-                                                         FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
+                                                             FontSize="20"
+                                                             FontFamily="{DynamicResource SymbolThemeFontFamily}" />
 
                                             </TabItem.Header>
                                             <Panel Name="PaletteContent" IsVisible="False"
@@ -163,23 +162,24 @@
                                                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                                                               VerticalScrollBarVisibility="Auto"
                                                               MaxHeight="450">
-                                                    <ItemsRepeater Margin="5"
-                                                                   ItemsSource="{TemplateBinding CustomPaletteColors}">
-                                                        <ItemsRepeater.Layout>
-                                                            <UniformGridLayout MaximumRowsOrColumns="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PaletteColumnCount}"
-                                                                               Orientation="Horizontal"
-                                                                               ItemsStretch="Fill"/>
-                                                        </ItemsRepeater.Layout>
-                                                        <ItemsRepeater.ItemTemplate>
+                                                    <ui:ItemsRepeater Margin="5"
+                                                                      ItemsSource="{TemplateBinding CustomPaletteColors}">
+                                                        <ui:ItemsRepeater.Layout>
+                                                            <ui:UniformGridLayout
+                                                                MaximumRowsOrColumns="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PaletteColumnCount}"
+                                                                Orientation="Horizontal"
+                                                                ItemsStretch="Fill" />
+                                                        </ui:ItemsRepeater.Layout>
+                                                        <ui:ItemsRepeater.ItemTemplate>
                                                             <DataTemplate x:DataType="Color">
                                                                 <ui:ColorPaletteItem Color="{Binding}"
-                                                                                     BorderBrushPointerOver="{DynamicResource ColorPickerColorPaletteItemBorderBrushPointerOver}"
-                                                                                     BorderThicknessPointerOver="1"
-                                                                                     Margin="{DynamicResource ColorPaletteItemMargin}"
-                                                                                     Height="{Binding $self.Bounds.Width}"/>
+                                                                    BorderBrushPointerOver="{DynamicResource ColorPickerColorPaletteItemBorderBrushPointerOver}"
+                                                                    BorderThicknessPointerOver="1"
+                                                                    Margin="{DynamicResource ColorPaletteItemMargin}"
+                                                                    Height="{Binding $self.Bounds.Width}" />
                                                             </DataTemplate>
-                                                        </ItemsRepeater.ItemTemplate>
-                                                    </ItemsRepeater>
+                                                        </ui:ItemsRepeater.ItemTemplate>
+                                                    </ui:ItemsRepeater>
                                                 </ScrollViewer>
                                             </Panel>
                                         </TabItem>
@@ -219,11 +219,11 @@
                                                   CornerRadius="8"
                                                   BorderBrush="{DynamicResource ColorRampBorderBrush}"
                                                   BorderThickness="{DynamicResource ColorRampBorderThickness}"
-                                                  IsVisible="False"/>
+                                                  IsVisible="False" />
 
                                     <ui:ColorSpectrum Name="Spectrum"
-                                                  BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                                  BorderThickness="{DynamicResource ColorRampBorderThickness}"/>
+                                                      BorderBrush="{DynamicResource ColorRampBorderBrush}"
+                                                      BorderThickness="{DynamicResource ColorRampBorderThickness}" />
                                 </DockPanel>
                             </Panel>
                         </DockPanel>
@@ -237,10 +237,10 @@
                                       Padding="3" HorizontalAlignment="Stretch"
                                       HorizontalContentAlignment="Center"
                                       CornerRadius="{Binding Source={StaticResource OverlayCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}">
-                            <ui:SymbolIcon Name="MoreButtonIcon" 
+                            <ui:SymbolIcon Name="MoreButtonIcon"
                                            VerticalAlignment="Center"
                                            FontSize="20"
-                                           Symbol="ChevronLeft"/>
+                                           Symbol="ChevronLeft" />
                         </ToggleButton>
 
                         <StackPanel Name="TextEntryArea"
@@ -252,20 +252,20 @@
                                         Width="120"
                                         Name="RGBHSVSelectorArea"
                                         IsVisible="{TemplateBinding IsCompact}">
-                                <ToggleButton Content="RGB" 
+                                <ToggleButton Content="RGB"
                                               Theme="{StaticResource ColorPickerTypeToggleButtonStyle}"
                                               Classes="RGB"
                                               Width="60"
-                                              Name="RGBButton" IsChecked="True"/>
+                                              Name="RGBButton" IsChecked="True" />
                                 <ToggleButton Content="HSV"
                                               Theme="{StaticResource ColorPickerTypeToggleButtonStyle}"
                                               Classes="HSV"
                                               Width="60"
                                               IsChecked="{Binding !#RGBButton.IsChecked, Mode=TwoWay}"
-                                              Name="HSVButton"/>
+                                              Name="HSVButton" />
                             </StackPanel>
 
-                            <Grid ColumnDefinitions="Auto,Auto,*" 
+                            <Grid ColumnDefinitions="Auto,Auto,*"
                                   Margin="8"
                                   Name="TextEntryContainer"
                                   RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
@@ -291,7 +291,7 @@
                                               Header="V" Margin="0 3"
                                               Theme="{StaticResource ColorPickerNumberBoxStyle}"
                                               Minimum="0"
-                                              Maximum="100"/>
+                                              Maximum="100" />
                                 <ui:NumberBox Name="RedBox" Grid.Row="3" Grid.Column="1"
                                               Header="R" Margin="0 3"
                                               Theme="{StaticResource ColorPickerNumberBoxStyle}"
@@ -301,68 +301,71 @@
                                               Header="G" Margin="0 3"
                                               Theme="{StaticResource ColorPickerNumberBoxStyle}"
                                               Minimum="0"
-                                              Maximum="255"/>
+                                              Maximum="255" />
                                 <ui:NumberBox Name="BlueBox" Grid.Row="5" Grid.Column="1"
                                               Header="B" Margin="0 3"
                                               Theme="{StaticResource ColorPickerNumberBoxStyle}"
                                               Minimum="0"
-                                              Maximum="255"/>
+                                              Maximum="255" />
                                 <ui:NumberBox Name="AlphaBox" Grid.Row="6" Grid.Column="1"
                                               Header="A" Margin="0 3"
                                               Minimum="0" Maximum="255"
                                               Theme="{StaticResource ColorPickerNumberBoxStyle}"
-                                              IsVisible="False"/>
+                                              IsVisible="False" />
 
 
-                                <ui:ColorRamp Component="Hue" CornerRadius="8" Height="{DynamicResource ColorPickerColorRampSize}"
+                                <ui:ColorRamp Component="Hue" CornerRadius="8"
+                                              Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="HueRamp" Grid.Row="0" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                              BorderThickness="1"/>
+                                              BorderThickness="1" />
 
-                                <ui:ColorRamp Component="Saturation" CornerRadius="8" Height="{DynamicResource ColorPickerColorRampSize}"
+                                <ui:ColorRamp Component="Saturation" CornerRadius="8"
+                                              Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="SatRamp" Grid.Row="1" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                              BorderThickness="{DynamicResource ColorRampBorderThickness}"/>
+                                              BorderThickness="{DynamicResource ColorRampBorderThickness}" />
 
-                                <ui:ColorRamp Component="Value" CornerRadius="8" Height="{DynamicResource ColorPickerColorRampSize}"
+                                <ui:ColorRamp Component="Value" CornerRadius="8"
+                                              Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="ValRamp" Grid.Row="2" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                              BorderThickness="{DynamicResource ColorRampBorderThickness}"/>
+                                              BorderThickness="{DynamicResource ColorRampBorderThickness}" />
 
-                                <ui:ColorRamp Component="Red" CornerRadius="8" 
+                                <ui:ColorRamp Component="Red" CornerRadius="8"
                                               Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="RedRamp" Grid.Row="3" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                              BorderThickness="{DynamicResource ColorRampBorderThickness}"/>
+                                              BorderThickness="{DynamicResource ColorRampBorderThickness}" />
 
-                                <ui:ColorRamp Component="Green" CornerRadius="8" 
+                                <ui:ColorRamp Component="Green" CornerRadius="8"
                                               Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="GreenRamp" Grid.Row="4" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                              BorderThickness="{DynamicResource ColorRampBorderThickness}"/>
+                                              BorderThickness="{DynamicResource ColorRampBorderThickness}" />
 
-                                <ui:ColorRamp Component="Blue" CornerRadius="8" 
+                                <ui:ColorRamp Component="Blue" CornerRadius="8"
                                               Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="BlueRamp" Grid.Row="5" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
-                                              BorderThickness="{DynamicResource ColorRampBorderThickness}"/>
+                                              BorderThickness="{DynamicResource ColorRampBorderThickness}" />
 
-                                <ui:ColorRamp Component="Alpha" CornerRadius="8" 
+                                <ui:ColorRamp Component="Alpha" CornerRadius="8"
                                               Height="{DynamicResource ColorPickerColorRampSize}"
                                               VerticalAlignment="Center" Margin="5 0"
                                               Name="AlphaRamp" Grid.Row="6" Grid.Column="2"
                                               BorderBrush="{DynamicResource ColorRampBorderBrush}"
                                               BorderThickness="{DynamicResource ColorRampBorderThickness}"
-                                              IsVisible="False"/>
+                                              IsVisible="False" />
 
-                                <TextBox Name="HexBox" 
-                                         Margin="0 3" 
+                                <TextBox Name="HexBox"
+                                         Margin="0 3"
                                          ContextMenu="{x:Null}"
                                          Grid.Row="7" Grid.Column="2">
                                     <TextBox.InnerLeftContent>
@@ -370,19 +373,36 @@
                                             <TextBlock Text="#"
                                                        VerticalAlignment="Center"
                                                        FontWeight="SemiBold" Margin="9 4"
-                                                       Name="Comp1Label"/>
+                                                       Name="Comp1Label" />
                                         </Border>
                                     </TextBox.InnerLeftContent>
                                     <TextBox.ContextFlyout>
                                         <MenuFlyout>
-                                            <MenuItem Header="#RRGGBB" Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}"/>
-                                            <MenuItem Header="#AARRGGBB" Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
-                                            <MenuItem Header="rgb( r, g, b )" Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
-                                            <MenuItem Header="rgba( r, g, b, a )" Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
+                                            <MenuItem Header="#RRGGBB"
+                                                      Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}"
+                                                      CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
+                                            <MenuItem Header="#AARRGGBB"
+                                                      Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}"
+                                                      CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
+                                            <MenuItem Header="rgb( r, g, b )"
+                                                      Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}"
+                                                      CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
+                                            <MenuItem Header="rgba( r, g, b, a )"
+                                                      Command="{Binding $parent[ui:FAColorPicker].OnHexTextContextMenuItemClick}"
+                                                      CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}" />
                                             <MenuItem Header="-" />
-                                            <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-                                            <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-                                            <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+                                            <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut"
+                                                      Command="{Binding $parent[TextBox].Cut}"
+                                                      IsEnabled="{Binding $parent[TextBox].CanCut}"
+                                                      InputGesture="{x:Static TextBox.CutGesture}" />
+                                            <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy"
+                                                      Command="{Binding $parent[TextBox].Copy}"
+                                                      IsEnabled="{Binding $parent[TextBox].CanCopy}"
+                                                      InputGesture="{x:Static TextBox.CopyGesture}" />
+                                            <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste"
+                                                      Command="{Binding $parent[TextBox].Paste}"
+                                                      IsEnabled="{Binding $parent[TextBox].CanPaste}"
+                                                      InputGesture="{x:Static TextBox.PasteGesture}" />
                                         </MenuFlyout>
                                     </TextBox.ContextFlyout>
                                 </TextBox>
@@ -396,16 +416,16 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^ /template/ #TextEntryContainer RadioButton">
-            <Setter Property="IsVisible" Value="False"/>
+            <Setter Property="IsVisible" Value="False" />
         </Style>
 
         <Style Selector="^:triangle /template/ ui|ColorRamp#ThirdComponentRamp">
-            <Setter Property="IsVisible" Value="False"/>
+            <Setter Property="IsVisible" Value="False" />
         </Style>
 
         <Style Selector="^:palette">
             <Style Selector="^ /template/ Panel#PaletteContent">
-                <Setter Property="IsVisible" Value="True"/>
+                <Setter Property="IsVisible" Value="True" />
             </Style>
             <Style Selector="^ /template/ DockPanel#SpectrumContent">
                 <Setter Property="IsVisible" Value="False" />
@@ -413,7 +433,7 @@
         </Style>
 
         <Style Selector="^:spectrum /template/ #TextEntryContainer RadioButton">
-            <Setter Property="IsVisible" Value="True"/>
+            <Setter Property="IsVisible" Value="True" />
         </Style>
 
         <Style Selector="^:textentry /template/ DockPanel#SpectrumContent">
@@ -422,28 +442,28 @@
 
         <Style Selector="^:alpha">
             <Style Selector="^ /template/ ui|ColorRamp#AlphaRamp">
-                <Setter Property="IsVisible" Value="True"/>
+                <Setter Property="IsVisible" Value="True" />
             </Style>
             <Style Selector="^ /template/ ui|NumberBox#AlphaBox">
-                <Setter Property="IsVisible" Value="True"/>
+                <Setter Property="IsVisible" Value="True" />
             </Style>
 
             <Style Selector="^:compact /template/ ui|ColorRamp#SpectrumAlphaRamp">
-                <Setter Property="IsVisible" Value="True"/>
+                <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
 
 
         <Style Selector="^:compact">
             <Style Selector="^ /template/ StackPanel#TextEntryArea">
-                <Setter Property="IsVisible" Value="False"/>
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ TabItem#TextEntryTab">
-                <Setter Property="IsVisible" Value="True"/>
+                <Setter Property="IsVisible" Value="True" />
             </Style>
 
             <Style Selector="^:textentry /template/ StackPanel#TextEntryArea">
-                <Setter Property="IsVisible" Value="True"/>
+                <Setter Property="IsVisible" Value="True" />
             </Style>
 
             <Style Selector="^ /template/ ToggleButton#MoreButton">
@@ -452,43 +472,43 @@
 
             <Style Selector="^:hsv">
                 <Style Selector="^ /template/ ui|NumberBox#RedBox">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|NumberBox#GreenBox">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|NumberBox#BlueBox">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|ColorRamp#RedRamp">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|ColorRamp#GreenRamp">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|ColorRamp#BlueRamp">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
             </Style>
 
             <Style Selector="^:rgb">
                 <Style Selector="^ /template/ ui|NumberBox#HueBox">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|NumberBox#SatBox">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|NumberBox#ValBox">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|ColorRamp#HueRamp">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|ColorRamp#SatRamp">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
                 <Style Selector="^ /template/ ui|ColorRamp#ValRamp">
-                    <Setter Property="IsVisible" Value="False"/>
+                    <Setter Property="IsVisible" Value="False" />
                 </Style>
             </Style>
 
@@ -498,4 +518,4 @@
         </Style>
 
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Styles/FluentUiStyles.axaml b/KitopiaAvalonia/Styles/FluentUiStyles.axaml
index 051cd31..1b4a1d4 100644
--- a/KitopiaAvalonia/Styles/FluentUiStyles.axaml
+++ b/KitopiaAvalonia/Styles/FluentUiStyles.axaml
@@ -3,7 +3,7 @@
                     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
     <!-- Add Resources Here -->
     <x:Double x:Key="SettingsExpanderItemAdaptiveWidthTrigger">210</x:Double>
-    <Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness> 
+    <Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
     <Thickness x:Key="AppBarButtonInnerBorderMargin">0,0,0,0</Thickness>
     <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
@@ -18,11 +18,11 @@
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <ui:FABorder Background="{TemplateBinding Background}"
-                             BorderBrush="{TemplateBinding BorderBrush}"
-                             BorderThickness="{TemplateBinding BorderThickness}"
-                             CornerRadius="{TemplateBinding CornerRadius}"
-                             Name="Root">
+                <Border Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Name="Root">
                     <ContentPresenter Name="PART_ContentPresenter"
                                       Content="{TemplateBinding Content}"
                                       ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -30,13 +30,13 @@
                                       RecognizesAccessKey="True"
                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                </ui:FABorder>
+                </Border>
             </ControlTemplate>
         </Setter>
-        
+
 
         <Style Selector="^:pointerover">
-            <Style Selector="^ /template/ ui|FABorder#Root">
+            <Style Selector="^ /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
             </Style>
@@ -46,7 +46,7 @@
         </Style>
 
         <Style Selector="^:pressed">
-            <Style Selector="^ /template/ ui|FABorder#Root">
+            <Style Selector="^ /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
             </Style>
@@ -56,7 +56,7 @@
         </Style>
 
         <Style Selector="^:disabled">
-            <Style Selector="^ /template/ ui|FABorder#Root">
+            <Style Selector="^ /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
             </Style>
@@ -68,7 +68,7 @@
 
         <!--Accent Button-->
         <Style Selector="^.accent">
-            <Style Selector="^ /template/ ui|FABorder#Root">
+            <Style Selector="^ /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
             </Style>
@@ -77,7 +77,7 @@
             </Style>
 
             <Style Selector="^:pointerover">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
                     <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
                 </Style>
@@ -87,7 +87,7 @@
             </Style>
 
             <Style Selector="^:pressed">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
                     <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
                 </Style>
@@ -97,7 +97,7 @@
             </Style>
 
             <Style Selector="^:disabled">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
                     <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
                 </Style>
@@ -107,4 +107,331 @@
             </Style>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+    <ControlTheme TargetType="ComboBox" x:Key="{x:Type ComboBox}">
+        <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
+        <Setter Property="MaxDropDownHeight" Value="504" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <DataValidationErrors>
+                    <Grid RowDefinitions="Auto, *, Auto"
+                          ColumnDefinitions="*,32">
+
+                        <!-- Disabling since Avalonia doesn't have Header property here
+                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                          Grid.Row="0"
+                                          Grid.Column="0"
+                                          Grid.ColumnSpan="2"
+                                          IsVisible="False"
+                                          FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
+                                          Margin="{DynamicResource ComboBoxTopHeaderMargin}"
+                                          VerticalAlignment="Top" />-->
+                        <Border x:Name="Background"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
+
+                        <Border x:Name="HighlightBackground"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                BorderThickness="{DynamicResource ComboBoxBackgroundBorderThicknessFocused}"
+                                Opacity="0"
+                                Background="{DynamicResource ComboBoxBackgroundFocused}"
+                                BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
+
+                        <Border Name="Pill"
+                                Classes="ComboBoxItemPill"
+                                Margin="1 0 0 0"
+                                Grid.Row="1"
+                                Opacity="0" />
+
+                        <TextBlock x:Name="PlaceholderTextBlock"
+                                   Grid.Row="1"
+                                   Grid.Column="0"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   Margin="{TemplateBinding Padding}"
+                                   Text="{TemplateBinding PlaceholderText}"
+                                   Foreground="{TemplateBinding PlaceholderForeground}"
+                                   IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
+
+                        <ContentControl x:Name="ContentPresenter"
+
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="{TemplateBinding Padding}"
+                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <TextBlock Text="{TemplateBinding SelectionBoxItem}"></TextBlock>
+                        </ContentControl>
+
+                        <Border x:Name="DropDownOverlay"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Background="Transparent"
+                                Margin="-4,4,4,4"
+                                Width="30"
+                                IsVisible="False"
+                                HorizontalAlignment="Right" />
+
+                        <ui:FontIcon Name="DropDownGlyph"
+                                     Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
+                                     MinHeight="{DynamicResource ComboBoxMinHeight}"
+                                     Grid.Row="1"
+                                     Grid.Column="1"
+                                     IsHitTestVisible="False"
+                                     Margin="0 0 14 0"
+                                     FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                     FontSize="12"
+                                     Glyph="&#xE70D;"
+                                     HorizontalAlignment="Right"
+                                     VerticalAlignment="Center" />
+
+                        <Popup Name="PART_Popup"
+                               WindowManagerAddShadowHint="False"
+                               IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
+                               MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                               MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                               PlacementTarget="Background"
+                               IsLightDismissEnabled="True"
+                               InheritsTransform="True">
+                            <Border x:Name="PopupBorder"
+                                    Background="{DynamicResource ComboBoxDropDownBackground}"
+                                    BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
+                                    BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
+                                    Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}"
+                                    BackgroundSizing="InnerBorderEdge">
+                                <ScrollViewer
+                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                                    Margin="{DynamicResource ComboBoxDropdownContentMargin}"
+                                                    ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundPressed}" />
+            </Style>
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxHeaderForegroundDisabled}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxHeaderForegroundDisabled}" />
+            </Style>
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
+            </Style>
+            <Style Selector="^ /template/ ui|FontIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:focus-visible">
+            <Style Selector="^ /template/ Border#Pill">
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocused}" />
+            </Style>
+            <Style Selector="^ /template/ ui|FontIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:error /template/ Border#Background">
+            <Setter Property="BorderBrush" Value="{DynamicResource SystemFillColorCriticalBrush}" />
+        </Style>
+    </ControlTheme>
+    <ControlTheme TargetType="ComboBoxItem" x:Key="{x:Type ComboBoxItem}">
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
+        <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+                <Border BorderThickness="{DynamicResource SystemControlFocusVisualPrimaryThickness}"
+                        BorderBrush="{DynamicResource SystemControlFocusVisualPrimaryBrush}"
+                        Margin="-3">
+                    <Border BorderThickness="{DynamicResource SystemControlFocusVisualSecondaryThickness}"
+                            BorderBrush="{DynamicResource SystemControlFocusVisualSecondaryBrush}" />
+                </Border>
+            </FocusAdornerTemplate>
+        </Setter>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border Name="LayoutRoot"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Margin="5,2,5,2"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        TemplatedControl.IsTemplateFocusTarget="True">
+                    <Panel>
+                        <Rectangle Name="Pill"
+                                   Theme="{StaticResource ComboBoxItemPill}"
+                                   Opacity="0" />
+
+                        <ContentPresenter Name="ContentPresenter"
+                                          Content="{TemplateBinding Content}"
+
+                                          Foreground="{TemplateBinding Foreground}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Margin="{TemplateBinding Padding}"
+                                          Background="{x:Null}"
+                                          BorderBrush="{x:Null}"
+                                          CornerRadius="{TemplateBinding CornerRadius}"
+                                          BorderThickness="0">
+                            <ContentPresenter.ContentTemplate>
+                                <DataTemplate DataType="x:Object">
+                                    <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="{Binding .}"></TextBlock>
+                                </DataTemplate>
+                            </ContentPresenter.ContentTemplate>
+                        </ContentPresenter>
+                    </Panel>
+
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:selected">
+            <Style Selector="^ /template/ Rectangle#Pill">
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
+            </Style>
+        </Style>
+
+        <!-- WinUI styles not implemented: SelectedUnfocused  -->
+
+        <Style Selector="^:selected:disabled">
+            <Style Selector="^ /template/ Rectangle#Pill">
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:selected:pointerover">
+            <Style Selector="^ /template/ Rectangle#Pill">
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:selected:pressed">
+            <Style Selector="^ /template/ Rectangle#Pill">
+                <Setter Property="Opacity" Value="1" />
+                <Setter Property="RenderTransform" Value="scaleY(0.625)" />
+            </Style>
+            <Style Selector="^ /template/ Border#LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
+            </Style>
+        </Style>
+
+        <!-- WinUI styles not implemented: All InputModeStates  -->
+
+    </ControlTheme>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Windows/Dialog.axaml b/KitopiaAvalonia/Windows/Dialog.axaml
index 02ea820..8dc1198 100644
--- a/KitopiaAvalonia/Windows/Dialog.axaml
+++ b/KitopiaAvalonia/Windows/Dialog.axaml
@@ -1,125 +1,122 @@
 <Window xmlns="https://github.com/avaloniaui"
-           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:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-           mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-           x:Class="KitopiaAvalonia.Controls.Dialog"
-           Foreground="{DynamicResource ContentDialogForeground}"
-           
-           BorderBrush="{DynamicResource ContentDialogBorderBrush}"
-           BorderThickness="{DynamicResource ContentDialogBorderWidth}"
-           CornerRadius="{DynamicResource OverlayCornerRadius}"
-           Topmost="True"
-           CanResize="False"
-           SystemDecorations="BorderOnly"
-           ExtendClientAreaChromeHints="NoChrome"
-           ExtendClientAreaTitleBarHeightHint="25"
-           ExtendClientAreaToDecorationsHint="True"
-           WindowStartupLocation="CenterScreen"
-           ShowInTaskbar="False"
-           Name="myWindow"
-           SizeToContent="WidthAndHeight"
-           
-           TransparencyLevelHint="AcrylicBlur"
-           Title="Dialog">
+        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"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="KitopiaAvalonia.Controls.Dialog"
+        Foreground="{DynamicResource ContentDialogForeground}"
+
+        BorderBrush="{DynamicResource ContentDialogBorderBrush}"
+        BorderThickness="{DynamicResource ContentDialogBorderWidth}"
+        CornerRadius="{DynamicResource OverlayCornerRadius}"
+        Topmost="True"
+        CanResize="False"
+        SystemDecorations="BorderOnly"
+        ExtendClientAreaChromeHints="NoChrome"
+        ExtendClientAreaTitleBarHeightHint="25"
+        ExtendClientAreaToDecorationsHint="True"
+        WindowStartupLocation="CenterScreen"
+        ShowInTaskbar="False"
+        Name="myWindow"
+        SizeToContent="WidthAndHeight"
+
+        TransparencyLevelHint="AcrylicBlur"
+        Title="Dialog">
     <Window.Background>
         <SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorBase}" Opacity="0.65" />
 
     </Window.Background>
-    <controls:FABorder Name="BackgroundElement"
-                       Background="{DynamicResource ContentDialogBackground}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center">
-        <!-- Even in WinUI, shadow is always black regardless of light/dark mode -->
 
-        <!-- if this border isn't here, dialog space displays outside of corner radius at top
+    <!-- Even in WinUI, shadow is always black regardless of light/dark mode -->
+
+    <!-- if this border isn't here, dialog space displays outside of corner radius at top
                                  if we put ClipToBounds=True on BackgroundElement above, it clips the shadow -->
-        <Border ClipToBounds="True">
-            <Grid Name="DialogSpace" ClipToBounds="True"
-                  RowDefinitions="Auto,*,Auto">
-                <Panel   Background="{DynamicResource ContentDialogTopOverlay}"
-                       PointerMoved="InputElement_OnPointerMoved" PointerPressed="InputElement_OnPointerPressed" PointerReleased="InputElement_OnPointerReleased"
-                       >
-                    <TextPresenter Name="Title" 
-                                   Margin="5"
-                                   FontSize="20"
-                                   FontFamily="Default"
-                                   FontWeight="SemiBold"
-                                   HorizontalAlignment="Left"
-                                   VerticalAlignment="Top" />
-                </Panel>
-                <ScrollViewer Grid.Row="1" Name="ContentScrollViewer"
-                              HorizontalScrollBarVisibility="Disabled"
-                              MinHeight="100"
-                              VerticalScrollBarVisibility="Auto">
-                    <Border Background="{DynamicResource ContentDialogTopOverlay}"
-                            Padding="5,0,5,0"
-                            BorderThickness="{StaticResource ContentDialogSeparatorThickness}"
-                            BorderBrush="{DynamicResource ContentDialogSeparatorBorderBrush}">
-                        <Grid RowDefinitions="Auto,*">
-                            <Grid.Styles>
-                                <!--Make sure text wrapping is on-->
-                                <Style Selector="TextBlock">
-                                    <Setter Property="TextWrapping" Value="Wrap" />
-                                </Style>
-                            </Grid.Styles>
-                            
-
-                            <ContentPresenter Name="Content"
-                                                
-                                              FontSize="{StaticResource ControlContentThemeFontSize}"
-                                              FontFamily="{StaticResource ContentControlThemeFontFamily}"
-
-                                              Grid.Row="1" />
-                        </Grid>
-                    </Border>
-                </ScrollViewer>
-
-                <Border Padding="{StaticResource ContentDialogPadding}"
-                        Grid.Row="2"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Bottom">
-                    <Grid Name="CommandSpace">
-                        <!--
+    <Border ClipToBounds="True" HorizontalAlignment="Center" Name="BackgroundElement"
+            Background="{DynamicResource ContentDialogBackground}"
+            VerticalAlignment="Center">
+        <Grid Name="DialogSpace" ClipToBounds="True"
+              RowDefinitions="Auto,*,Auto">
+            <Panel Background="{DynamicResource ContentDialogTopOverlay}"
+                   PointerMoved="InputElement_OnPointerMoved" PointerPressed="InputElement_OnPointerPressed"
+                   PointerReleased="InputElement_OnPointerReleased">
+                <TextPresenter Name="Title"
+                               Margin="5"
+                               FontSize="20"
+                               FontFamily="Default"
+                               FontWeight="SemiBold"
+                               HorizontalAlignment="Left"
+                               VerticalAlignment="Top" />
+            </Panel>
+            <ScrollViewer Grid.Row="1" Name="ContentScrollViewer"
+                          HorizontalScrollBarVisibility="Disabled"
+                          MinHeight="100"
+                          VerticalScrollBarVisibility="Auto">
+                <Border Background="{DynamicResource ContentDialogTopOverlay}"
+                        Padding="5,0,5,0"
+                        BorderThickness="{StaticResource ContentDialogSeparatorThickness}"
+                        BorderBrush="{DynamicResource ContentDialogSeparatorBorderBrush}">
+                    <Grid RowDefinitions="Auto,*">
+                        <Grid.Styles>
+                            <!--Make sure text wrapping is on-->
+                            <Style Selector="TextBlock">
+                                <Setter Property="TextWrapping" Value="Wrap" />
+                            </Style>
+                        </Grid.Styles>
+
+
+                        <ContentPresenter Name="Content"
+
+                                          FontSize="{StaticResource ControlContentThemeFontSize}"
+                                          FontFamily="{StaticResource ContentControlThemeFontFamily}"
+
+                                          Grid.Row="1" />
+                    </Grid>
+                </Border>
+            </ScrollViewer>
+
+            <Border Padding="{StaticResource ContentDialogPadding}"
+                    Grid.Row="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom">
+                <Grid Name="CommandSpace">
+                    <!--
                                             B/C we can't target Row/Column defs in Styles like WinUI
                                             this still uses the old Col defs, but it works the same
                                             way in the end...
                                             -->
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="0.5*" />
-                            <ColumnDefinition Width="0.5*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Button Name="PrimaryButton"
-                                IsDefault="True"
-                                Classes="accent"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                IsVisible="False" />
-
-                        <Button Name="SecondaryButton"
-
-                                HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                IsVisible="False" />
-
-                        <Button Name="CloseButton"
-
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                VerticalContentAlignment="Center"
-                                IsVisible="False" />
-                    </Grid>
-                </Border>
-            </Grid>
-        </Border>
-    </controls:FABorder>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="0.5*" />
+                        <ColumnDefinition Width="0.5*" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Button Name="PrimaryButton"
+                            IsDefault="True"
+                            Classes="accent"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            IsVisible="False" />
+
+                    <Button Name="SecondaryButton"
+
+                            HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            IsVisible="False" />
+
+                    <Button Name="CloseButton"
+
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            IsVisible="False" />
+                </Grid>
+            </Border>
+        </Grid>
+    </Border>
 
 
 </Window>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml b/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
index b4daf05..f524f5a 100644
--- a/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
+++ b/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
@@ -8,16 +8,17 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="KitopiaAvalonia.Windows.ScreenCaptureWindow"
         Title="ScreenCaptureWindow">
-   
+
     <Canvas>
 
         <Image Name="Image" />
-        <Image Name="MosaicImage" Width="{Binding $parent[Canvas].Bounds.Width}" 
+        <Image Name="MosaicImage" Width="{Binding $parent[Canvas].Bounds.Width}"
                Height="{Binding $parent[Canvas].Bounds.Height}">
-          
+
         </Image>
         <capture:PenCaptureTool Name="MosaicCanvas" Width="{Binding $parent[Canvas].Bounds.Width}" ZIndex="-1"
-                  Height="{Binding $parent[Canvas].Bounds.Height}" Stroke="Black" Fill="Black" StrokeThickness="7">
+                                Height="{Binding $parent[Canvas].Bounds.Height}" Stroke="Black" Fill="Black"
+                                StrokeThickness="7">
         </capture:PenCaptureTool>
         <Rectangle ZIndex="1" Name="Rectangle" Width="{Binding $parent[Window].Bounds.Width}" Focusable="True"
                    Height="{Binding $parent[Window].Bounds.Height}" PointerEntered="Rectangle_OnPointerEntered">
@@ -25,7 +26,8 @@
                 <SolidColorBrush Color="Black" Opacity="0.5" />
             </Rectangle.Fill>
         </Rectangle>
-        <capture:DraggableResizeableControl IsVisible="False" IsSelected="True" ZIndex="2" Name="SelectBox" OnlyShowReSizingBoxOnSelect="False">
+        <capture:DraggableResizeableControl IsVisible="False" IsSelected="True" ZIndex="2" Name="SelectBox"
+                                            OnlyShowReSizingBoxOnSelect="False">
             <Rectangle PointerMoved="SelectBox_OnPointerMoved" PointerReleased="SelectBox_OnPointerReleased"
                        PointerPressed="SelectBox_OnPointerPressed" PointerCaptureLost="SelectBox_OnPointerCaptureLost">
                 <Rectangle.Fill>
@@ -36,8 +38,9 @@
 
 
         <Canvas ZIndex="3" Name="Canvas" Width="{Binding $parent[Canvas].Bounds.Width}"
-                Height="{Binding $parent[Canvas].Bounds.Height}"/>
-        <Border ZIndex="3" Padding="5" CornerRadius="4" IsVisible="False"   d:IsHidden="False" Name="ToolBar" Focusable="True">
+                Height="{Binding $parent[Canvas].Bounds.Height}" />
+        <Border ZIndex="3" Padding="5" CornerRadius="4" IsVisible="False" d:IsHidden="False" Name="ToolBar"
+                Focusable="True">
             <Border.Background>
                 <SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorBase}" Opacity="0.5" />
             </Border.Background>
@@ -53,7 +56,7 @@
                             <Setter Property="BorderBrush" Value="DimGray"></Setter>
 
                         </Style>
-                        <Style Selector="Button.Selected:pointerover /template/ controls|FABorder#Root">
+                        <Style Selector="Button.Selected:pointerover /template/ Border#Root">
                             <Setter Property="BorderBrush" Value="DimGray" />
                             <Setter Property="Background">
                                 <Setter.Value>
@@ -82,11 +85,13 @@
                             </controls:FontIcon.RenderTransform>
                         </controls:FontIcon>
                     </Button>
-                    <Button BorderThickness="1" ToolTip.Tip="批注" Width="32" Height="32" Padding="0,3,0,0" Click="CommentButton_OnClick">
+                    <Button BorderThickness="1" ToolTip.Tip="批注" Width="32" Height="32" Padding="0,3,0,0"
+                            Click="CommentButton_OnClick">
                         <controls:FontIcon Width="24" Height="24"
                                            FontFamily="{StaticResource FluentFont}" Glyph="&#xe8d8;" FontSize="24" />
                     </Button>
-                    <Button BorderThickness="1" ToolTip.Tip="文本" Width="32" Height="32" Padding="1,3,0,0" Click="TextButton_OnClick">
+                    <Button BorderThickness="1" ToolTip.Tip="文本" Width="32" Height="32" Padding="1,3,0,0"
+                            Click="TextButton_OnClick">
                         <controls:FontIcon VerticalAlignment="Center" HorizontalAlignment="Center" Width="24"
                                            Height="24"
                                            FontFamily="{StaticResource FluentFont}" Glyph="&#xecaf;" FontSize="24" />
@@ -98,7 +103,8 @@
                           StrokeThickness="1"
                           StartPoint="0.5,0"
                           EndPoint="0.5,32" />
-                    <Button BorderThickness="1" ToolTip.Tip="撤销" Width="32" Height="32" Padding="1,3,0,0" Click="RedoButton_OnClick">
+                    <Button BorderThickness="1" ToolTip.Tip="撤销" Width="32" Height="32" Padding="1,3,0,0"
+                            Click="RedoButton_OnClick">
                         <controls:FontIcon VerticalAlignment="Center" HorizontalAlignment="Center" Width="24"
                                            Height="24"
                                            FontFamily="{StaticResource FluentFont}" Glyph="&#xf8e6;" FontSize="24" />
@@ -132,7 +138,7 @@
                             <Setter Property="BorderBrush" Value="DimGray"></Setter>
 
                         </Style>
-                        <Style Selector="Button.Selected:pointerover /template/ controls|FABorder#Root">
+                        <Style Selector="Button.Selected:pointerover /template/ Border#Root">
                             <Setter Property="BorderBrush" Value="DimGray" />
                             <Setter Property="Background">
                                 <Setter.Value>
@@ -141,23 +147,25 @@
                             </Setter>
                         </Style>
                     </StackPanel.Styles>
-                    <controls:NumberBox ToolTip.Tip="画笔大小" Margin="0,2,0,0" Height="37" Name="StrokeWidth" Minimum="1" Maximum="50"  
+                    <controls:NumberBox ToolTip.Tip="画笔大小" Margin="0,2,0,0" Height="37" Name="StrokeWidth" Minimum="1"
+                                        Maximum="50"
                                         PlaceholderText="3"
-                                        SpinButtonPlacementMode="Inline" Value="3" ValidationMode="InvalidInputOverwritten" >
+                                        SpinButtonPlacementMode="Inline" Value="3"
+                                        ValidationMode="InvalidInputOverwritten">
                         <controls:NumberBox.Styles>
                             <Style Selector="controls|NumberBox /template/ TextBox#InputBox">
                                 <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
                             </Style>
                         </controls:NumberBox.Styles>
-                    </controls:NumberBox> 
+                    </controls:NumberBox>
                     <controls:ColorPickerButton ToolTip.Tip="画笔颜色" Name="ColorPicker" UseColorPalette="True"></controls:ColorPickerButton>
-                   
+
                 </StackPanel>
             </StackPanel>
 
         </Border>
 
-        
+
         <Line ZIndex="2" Name="X" Fill="WhiteSmoke" Stroke="WhiteSmoke" StrokeThickness="1.5" IsVisible="False" />
         <Line ZIndex="2" Name="Y" Fill="WhiteSmoke" Stroke="WhiteSmoke" StrokeThickness="1.5" IsVisible="False" />
 
diff --git a/KitopiaAvalonia/Windows/TaskEditor.axaml b/KitopiaAvalonia/Windows/TaskEditor.axaml
index 7f5550a..f621b4d 100644
--- a/KitopiaAvalonia/Windows/TaskEditor.axaml
+++ b/KitopiaAvalonia/Windows/TaskEditor.axaml
@@ -35,6 +35,17 @@
 
         <converter:ReverseBool x:Key="ReverseBool" />
     </windowing:AppWindow.Resources>
+    <windowing:AppWindow.Styles>
+        <Style Selector="RepeatButton /template/ ContentPresenter">
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate DataType="x:String">
+                        <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="{Binding .}"></TextBlock>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </windowing:AppWindow.Styles>
     <Interaction.Behaviors>
         <EventTriggerBehavior EventName="Closing">
             <InvokeCommandAction Command="{Binding ReloadScenarioCommand}" PassEventArgsToCommand="True" />
@@ -171,7 +182,7 @@
                                                     <Button.Styles>
 
                                                         <Style
-                                                            Selector="Button#Button:pointerover /template/ controls|FABorder#Root">
+                                                            Selector="Button#Button:pointerover /template/ Border#Root">
 
                                                             <Setter Property="Background">
                                                                 <SolidColorBrush
@@ -864,6 +875,24 @@
                                                                                             Watermark="字符串" />
                                                                                     </StackPanel>
 
+                                                                                </DataTemplate>
+                                                                                <DataTemplate x:Key="EnumTemplate"
+                                                                                    DataType="{x:Type customScenario:ConnectorItem}">
+                                                                                    <StackPanel Margin="10,0,0,0"
+                                                                                        Orientation="Horizontal"
+                                                                                        VerticalAlignment="Center"
+                                                                                        HorizontalAlignment="Right">
+                                                                                        <TextBlock
+                                                                                            VerticalAlignment="Center"
+                                                                                            x:Name="textBlock"
+                                                                                            Text="{Binding Title}"
+                                                                                            Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                                                                                        <ComboBox Margin="10,5,10,5"
+                                                                                            x:Name="ComboBox"
+                                                                                            MinWidth="40"
+                                                                                            SelectedValue="{Binding InputObject,Mode=TwoWay}" />
+                                                                                    </StackPanel>
+
                                                                                 </DataTemplate>
                                                                                 <DataTemplate x:Key="IntTemplate"
                                                                                     DataType="{x:Type customScenario:ConnectorItem}">
@@ -1191,14 +1220,14 @@
                                 <controls2:Node.InputConnectorTemplate>
                                     <DataTemplate DataType="{x:Type customScenario:ConnectorItem}">
 
-                                        <ContentPresenter Content="{Binding .}" Name="ContentPresenter">
+                                        <ContentPresenter Content="{Binding .}" Name="ContentPresenter1">
                                             <ContentPresenter.ContextFlyout>
                                                 <MenuFlyout>
                                                     <!-- ReSharper disable once Xaml.RedundantResource -->
                                                     <MenuItem Header="切换自输入/连接器"
                                                               Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                                               Command="{Binding $parent[controls2:NodifyEditor].((taskEditor1:TaskEditorViewModel)DataContext).SwitchConnectorCommand}"
-                                                              CommandParameter="{Binding #ContentPresenter  }" />
+                                                              CommandParameter="{Binding #ContentPresenter1  }" />
                                                 </MenuFlyout>
                                             </ContentPresenter.ContextFlyout>
                                             <ContentPresenter.DataTemplates>
@@ -1282,6 +1311,23 @@
                                                                      Text="{Binding InputObject}" Watermark="字符串" />
                                                         </StackPanel>
                                                     </DataTemplate>
+                                                    <DataTemplate x:Key="EnumTemplate"
+                                                                  DataType="{x:Type customScenario:ConnectorItem}">
+                                                        <StackPanel Margin="10,0,0,0"
+                                                                    Orientation="Horizontal"
+                                                                    VerticalAlignment="Center"
+                                                                    HorizontalAlignment="Right">
+                                                            <TextBlock
+                                                                VerticalAlignment="Center"
+                                                                x:Name="textBlock"
+                                                                Text="{Binding Title}"
+                                                                Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                                                            <ComboBox Margin="10,5,10,5" x:Name="ComboBox"
+                                                                      MinWidth="40"
+                                                                      SelectedValue="{Binding InputObject,Mode=TwoWay}" />
+                                                        </StackPanel>
+
+                                                    </DataTemplate>
                                                     <DataTemplate x:Key="IntTemplate"
                                                                   DataType="{x:Type customScenario:ConnectorItem}">
                                                         <StackPanel Margin="10,0,0,0" Orientation="Horizontal"
diff --git a/PluginCore b/PluginCore
index 5a28e9d..b6fd5f3 160000
--- a/PluginCore
+++ b/PluginCore
@@ -1 +1 @@
-Subproject commit 5a28e9d395f315a7f84369bc1fe86c4cb9ea1628
+Subproject commit b6fd5f304e56de6978dfc153ed772db2c3895517