diff --git a/VPet-Simulator.Core/Display/basestyle.xaml b/VPet-Simulator.Core/Display/basestyle.xaml
index 3a42767..e087bd9 100644
--- a/VPet-Simulator.Core/Display/basestyle.xaml
+++ b/VPet-Simulator.Core/Display/basestyle.xaml
@@ -1,364 +1,309 @@
-<ResourceDictionary
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:pu="https://opensource.panuon.com/wpf-ui"
-  xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
-  <ResourceDictionary.MergedDictionaries>
-    <pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" />
-  </ResourceDictionary.MergedDictionaries>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="https://opensource.panuon.com/wpf-ui"
+        xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
+    <ResourceDictionary.MergedDictionaries>
+        <pu:StyleDictionary Includes="All" />
+    </ResourceDictionary.MergedDictionaries>
 
-  <DrawingBrush
-    x:Key="ProgressBarForeground"
-    Stretch="None"
-    TileMode="Tile"
-    Viewport="0,0,8,22"
-    ViewportUnits="Absolute">
-    <DrawingBrush.RelativeTransform>
-      <RotateTransform Angle="2" />
-    </DrawingBrush.RelativeTransform>
-    <DrawingBrush.Drawing>
-      <DrawingGroup>
-        <GeometryDrawing Brush="{DynamicResource DARKPrimaryTransA}">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="5.5,0,2.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="{DynamicResource DARKPrimary}">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="0,0,5.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <DrawingBrush
-    x:Key="SuccessProgressBarForeground"
-    Stretch="None"
-    TileMode="Tile"
-    Viewport="0,0,8,22"
-    ViewportUnits="Absolute">
-    <DrawingBrush.RelativeTransform>
-      <RotateTransform Angle="2" />
-    </DrawingBrush.RelativeTransform>
-    <DrawingBrush.Drawing>
-      <DrawingGroup>
-        <GeometryDrawing Brush="#AAAACC6C">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="5.5,0,2.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="#AACC6C">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="0,0,5.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <DrawingBrush
-    x:Key="WarningProgressBarForeground"
-    Stretch="None"
-    TileMode="Tile"
-    Viewport="0,0,8,22"
-    ViewportUnits="Absolute">
-    <DrawingBrush.RelativeTransform>
-      <RotateTransform Angle="2" />
-    </DrawingBrush.RelativeTransform>
-    <DrawingBrush.Drawing>
-      <DrawingGroup>
-        <GeometryDrawing Brush="#AAFFCC4C">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="5.5,0,2.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="#FFCC4C">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="0,0,5.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <DrawingBrush
-    x:Key="DangerProgressBarForeground"
-    Stretch="None"
-    TileMode="Tile"
-    Viewport="0,0,8,22"
-    ViewportUnits="Absolute">
-    <DrawingBrush.RelativeTransform>
-      <RotateTransform Angle="2" />
-    </DrawingBrush.RelativeTransform>
-    <DrawingBrush.Drawing>
-      <DrawingGroup>
-        <GeometryDrawing Brush="#AAFF4C4C">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="5.5,0,2.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="#FF4C4C">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="0,0,5.5,22" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
+    <DrawingBrush x:Key="ProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
+            ViewportUnits="Absolute">
+        <DrawingBrush.RelativeTransform>
+            <RotateTransform Angle="2" />
+        </DrawingBrush.RelativeTransform>
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="{DynamicResource DARKPrimaryTransA}">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="5.5,0,2.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="{DynamicResource DARKPrimary}">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="0,0,5.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+    <DrawingBrush x:Key="SuccessProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
+            ViewportUnits="Absolute">
+        <DrawingBrush.RelativeTransform>
+            <RotateTransform Angle="2" />
+        </DrawingBrush.RelativeTransform>
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="#AAAACC6C">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="5.5,0,2.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="#AACC6C">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="0,0,5.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+    <DrawingBrush x:Key="WarningProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
+            ViewportUnits="Absolute">
+        <DrawingBrush.RelativeTransform>
+            <RotateTransform Angle="2" />
+        </DrawingBrush.RelativeTransform>
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="#AAFFCC4C">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="5.5,0,2.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="#FFCC4C">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="0,0,5.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+    <DrawingBrush x:Key="DangerProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
+            ViewportUnits="Absolute">
+        <DrawingBrush.RelativeTransform>
+            <RotateTransform Angle="2" />
+        </DrawingBrush.RelativeTransform>
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="#AAFF4C4C">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="5.5,0,2.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="#FF4C4C">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="0,0,5.5,22" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
 
-  <Style x:Key="BaseWindowXStyle" TargetType="pu:WindowX">
-    <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="pu:WindowXCaption.Buttons" Value="Close" />
-    <Setter Property="pu:WindowXCaption.CloseButtonStyle">
-      <Setter.Value>
-        <Style BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}" TargetType="Button">
-          <Setter Property="pu:ButtonHelper.HoverBackground" Value="{x:Null}" />
-        </Style>
-      </Setter.Value>
-    </Setter>
-  </Style>
+    <Style x:Key="BaseWindowXStyle" TargetType="pu:WindowX">
+        <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:WindowXCaption.Buttons" Value="Close" />
+        <Setter Property="pu:WindowXCaption.CloseButtonStyle">
+            <Setter.Value>
+                <Style BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}" TargetType="Button">
+                    <Setter Property="pu:ButtonHelper.HoverBackground" Value="{x:Null}" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-  <Style
-    x:Key="ThemedButtonStyle"
-    BasedOn="{StaticResource {x:Type Button}}"
-    TargetType="{x:Type Button}">
-    <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="Padding" Value="10,5" />
-    <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
-  </Style>
+    <Style x:Key="ThemedButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="Padding" Value="10,5" />
+        <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
+    </Style>
 
-  <Style
-    x:Key="TextButtonStyle"
-    BasedOn="{StaticResource {x:Type Button}}"
-    TargetType="{x:Type Button}">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
-    <Setter Property="Cursor" Value="Hand" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="FontSize" Value="12" />
-  </Style>
+    <Style x:Key="TextButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="FontSize" Value="12" />
+    </Style>
 
-  <Style
-    x:Key="DARKPrimaryTextButtonStyle"
-    BasedOn="{StaticResource TextButtonStyle}"
-    TargetType="{x:Type Button}">
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
-  </Style>
+    <Style x:Key="DARKPrimaryTextButtonStyle" BasedOn="{StaticResource TextButtonStyle}" TargetType="{x:Type Button}">
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
+    </Style>
 
-  <Style
-    x:Key="IconInvertedForegroundRepeatButtonStyle"
-    BasedOn="{StaticResource {x:Type RepeatButton}}"
-    TargetType="{x:Type RepeatButton}">
-    <Setter Property="Width" Value="25" />
-    <Setter Property="Height" Value="25" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="Cursor" Value="Hand" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="FontSize" Value="15" />
-    <Setter Property="FontFamily" Value="pack://application:,,,/Res/#remixicon" />
-  </Style>
+    <Style x:Key="IconInvertedForegroundRepeatButtonStyle" BasedOn="{StaticResource {x:Type RepeatButton}}"
+            TargetType="{x:Type RepeatButton}">
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="FontSize" Value="15" />
+        <Setter Property="FontFamily" Value="pack://application:,,,/Res/#remixicon" />
+    </Style>
 
-  <Style
-    x:Key="LinkButtonStyle"
-    BasedOn="{StaticResource TextButtonStyle}"
-    TargetType="{x:Type Button}">
-    <Setter Property="ContentTemplate">
-      <Setter.Value>
-        <DataTemplate>
-          <TextBlock Text="{Binding}" TextDecorations="Underline" />
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+    <Style x:Key="LinkButtonStyle" BasedOn="{StaticResource TextButtonStyle}" TargetType="{x:Type Button}">
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding}" TextDecorations="Underline" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-  <Style
-    x:Key="StndardToggleButtonStyle"
-    BasedOn="{StaticResource {x:Type ToggleButton}}"
-    TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimaryDarker}" />
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="Padding" Value="10,5" />
-    <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
-  </Style>
+    <Style x:Key="StndardToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
+            TargetType="{x:Type ToggleButton}">
+        <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimaryDarker}" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="Padding" Value="10,5" />
+        <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
+    </Style>
 
-  <Style
-    x:Key="TextToggleButtonStyle"
-    BasedOn="{StaticResource {x:Type ToggleButton}}"
-    TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
-    <Setter Property="Cursor" Value="Hand" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="FontSize" Value="14" />
-  </Style>
+    <Style x:Key="TextToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
+            TargetType="{x:Type ToggleButton}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="FontSize" Value="14" />
+    </Style>
 
-  <Style
-    x:Key="LinkToggleButtonStyle"
-    BasedOn="{StaticResource TextToggleButtonStyle}"
-    TargetType="{x:Type ToggleButton}">
-    <Setter Property="ContentTemplate">
-      <Setter.Value>
-        <DataTemplate>
-          <TextBlock Text="{Binding}" TextDecorations="Underline" />
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+    <Style x:Key="LinkToggleButtonStyle" BasedOn="{StaticResource TextToggleButtonStyle}"
+            TargetType="{x:Type ToggleButton}">
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding}" TextDecorations="Underline" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-  <Style x:Key="StandardPaginationStyle" TargetType="{x:Type pu:Pagination}">
-    <Setter Property="Height" Value="25" />
-    <Setter Property="ItemsWidth" Value="NaN" />
-    <Setter Property="ItemsPadding" Value="7,0" />
-    <Setter Property="ItemsBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
-    <Setter Property="ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="ItemsCornerRadius" Value="2" />
-  </Style>
+    <Style x:Key="StandardPaginationStyle" TargetType="{x:Type pu:Pagination}">
+        <Setter Property="Height" Value="25" />
+        <Setter Property="ItemsWidth" Value="NaN" />
+        <Setter Property="ItemsPadding" Value="7,0" />
+        <Setter Property="ItemsBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
+        <Setter Property="ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="ItemsCornerRadius" Value="2" />
+    </Style>
 
-  <Style
-    x:Key="StandardComboBoxStyle"
-    BasedOn="{StaticResource {x:Type ComboBox}}"
-    TargetType="{x:Type ComboBox}">
-    <Setter Property="FontSize" Value="14" />
-    <Setter Property="Height" Value="30" />
-    <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="BorderThickness" Value="1.5" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="Padding" Value="7,0,15,0" />
-    <Setter Property="pu:ComboBoxHelper.CornerRadius" Value="5" />
-    <Setter Property="pu:ComboBoxHelper.WatermarkForeground" Value="#DCDCDC" />
-    <Setter Property="pu:ComboBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
-    <Setter Property="pu:ComboBoxHelper.ItemsPadding" Value="22,0" />
-    <Setter Property="pu:DropDownHelper.BorderThickness" Value="1" />
-    <Setter Property="pu:DropDownHelper.Background" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" />
-    <Setter Property="pu:DropDownHelper.CornerRadius" Value="5" />
-    <Setter Property="pu:DropDownHelper.MinHeight" Value="100" />
-    <Setter Property="pu:DropDownHelper.ClipDockSideShadow" Value="False" />
-    <Setter Property="pu:DropDownHelper.BorderBrush" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
-    <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
-    <Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle">
-      <Setter.Value>
-        <Style BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}" TargetType="pu:TransformControl">
-          <Setter Property="Foreground" Value="{DynamicResource PrimaryText}" />
-          <Setter Property="FontSize" Value="10" />
-          <Setter Property="Content" Value="&#xe91f;" />
-        </Style>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style
-    x:Key="StandardTextBoxStyle"
-    BasedOn="{StaticResource {x:Type TextBox}}"
-    TargetType="TextBox">
-    <Setter Property="FontSize" Value="14" />
-    <Setter Property="Height" Value="30" />
-    <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="BorderThickness" Value="1.5" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="Padding" Value="7,0,15,0" />
-    <Setter Property="pu:TextBoxHelper.CornerRadius" Value="5" />
-    <Setter Property="pu:TextBoxHelper.WatermarkForeground" Value="#DCDCDC" />
-    <Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
-    <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
-  </Style>
-  <Style
-    x:Key="StandardSliderStyle"
-    BasedOn="{StaticResource {x:Type Slider}}"
-    TargetType="Slider">
-    <Setter Property="Background" Value="{DynamicResource DARKPrimaryTrans4}" />
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDark}" />
-    <Setter Property="pu:SliderHelper.ThumbShadowColor" Value="{DynamicResource ShadowColor}" />
-    <Setter Property="pu:SliderHelper.TrackThickness" Value="2.5" />
-    <Setter Property="pu:SliderHelper.ThumbBorderBrush" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:SliderHelper.ThumbBorderThickness" Value="2.5" />
-    <Setter Property="pu:SliderHelper.CoveredBackground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:ShadowHelper.ShadowDepth" Value="3" />
-    <Setter Property="pu:ShadowHelper.Direction" Value="270" />
-    <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
-  </Style>
+    <Style x:Key="StandardComboBoxStyle" BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="{x:Type ComboBox}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="BorderThickness" Value="1.5" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="Padding" Value="7,0,15,0" />
+        <Setter Property="pu:ComboBoxHelper.CornerRadius" Value="5" />
+        <Setter Property="pu:ComboBoxHelper.WatermarkForeground" Value="#DCDCDC" />
+        <Setter Property="pu:ComboBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
+        <Setter Property="pu:ComboBoxHelper.ItemsPadding" Value="22,0" />
+        <Setter Property="pu:DropDownHelper.BorderThickness" Value="1" />
+        <Setter Property="pu:DropDownHelper.Background" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" />
+        <Setter Property="pu:DropDownHelper.CornerRadius" Value="5" />
+        <Setter Property="pu:DropDownHelper.MinHeight" Value="100" />
+        <Setter Property="pu:DropDownHelper.ClipDockSideShadow" Value="False" />
+        <Setter Property="pu:DropDownHelper.BorderBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
+        <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
+        <Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle">
+            <Setter.Value>
+                <Style BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}"
+                        TargetType="pu:TransformControl">
+                    <Setter Property="Foreground" Value="{DynamicResource PrimaryText}" />
+                    <Setter Property="FontSize" Value="10" />
+                    <Setter Property="Content" Value="&#xe91f;" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="StandardTextBoxStyle" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="BorderThickness" Value="1.5" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="Padding" Value="7,0,15,0" />
+        <Setter Property="pu:TextBoxHelper.CornerRadius" Value="5" />
+        <Setter Property="pu:TextBoxHelper.WatermarkForeground" Value="#DCDCDC" />
+        <Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
+        <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
+    </Style>
+    <Style x:Key="StandardSliderStyle" BasedOn="{StaticResource {x:Type Slider}}" TargetType="Slider">
+        <Setter Property="Background" Value="{DynamicResource DARKPrimaryTrans4}" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDark}" />
+        <Setter Property="pu:SliderHelper.ThumbShadowColor" Value="{DynamicResource ShadowColor}" />
+        <Setter Property="pu:SliderHelper.TrackThickness" Value="2.5" />
+        <Setter Property="pu:SliderHelper.ThumbBorderBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:SliderHelper.ThumbBorderThickness" Value="2.5" />
+        <Setter Property="pu:SliderHelper.CoveredBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:ShadowHelper.ShadowDepth" Value="3" />
+        <Setter Property="pu:ShadowHelper.Direction" Value="270" />
+        <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
+    </Style>
 
-  <Style
-    x:Key="StandardRadioButtonStyle"
-    BasedOn="{StaticResource {x:Type RadioButton}}"
-    TargetType="RadioButton">
-    <Setter Property="pu:RadioButtonHelper.CheckedToggleBrush" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:RadioButtonHelper.CheckedBorderBrush" Value="{DynamicResource DARKPrimary}" />
-  </Style>
+    <Style x:Key="StandardRadioButtonStyle" BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+        <Setter Property="pu:RadioButtonHelper.CheckedToggleBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:RadioButtonHelper.CheckedBorderBrush" Value="{DynamicResource DARKPrimary}" />
+    </Style>
 
-  <Style
-    x:Key="SideMenuListBoxStyle"
-    BasedOn="{StaticResource {x:Type ListBox}}"
-    TargetType="ListBox">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="pu:ListBoxHelper.ItemsHeight" Value="30" />
-    <Setter Property="pu:ListBoxHelper.ItemsPadding" Value="15,0" />
-    <Setter Property="pu:ListBoxHelper.ItemsCornerRadius" Value="5" />
-    <Setter Property="pu:ListBoxHelper.ItemsHoverBackground" Value="{x:Null}" />
-    <Setter Property="pu:ListBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:ListBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
-  </Style>
+    <Style x:Key="SideMenuListBoxStyle" BasedOn="{StaticResource {x:Type ListBox}}" TargetType="ListBox">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="pu:ListBoxHelper.ItemsHeight" Value="30" />
+        <Setter Property="pu:ListBoxHelper.ItemsPadding" Value="15,0" />
+        <Setter Property="pu:ListBoxHelper.ItemsCornerRadius" Value="5" />
+        <Setter Property="pu:ListBoxHelper.ItemsHoverBackground" Value="{x:Null}" />
+        <Setter Property="pu:ListBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:ListBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
+    </Style>
 
-  <Style
-    x:Key="ToolBarMenuStyle"
-    BasedOn="{StaticResource {x:Type Menu}}"
-    TargetType="Menu">
-    <Setter Property="Height" Value="55" />
-    <Setter Property="FontSize" Value="24" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="pu:MenuHelper.TopLevelDropDownVerticalOffset" Value="-25" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimaryDarker}" />
-    <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="pu:MenuHelper.CornerRadius" Value="5" />
-    <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="TopRight" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="15,0" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsHeight" Value="55" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="Transparent" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsHoverForeground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsOpenedForeground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="15,0" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="55" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsIconWidth" Value="NaN" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="200" />
-    <Setter Property="pu:DropDownHelper.CornerRadius" Value="5" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="Transparent" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
-    <!--<Setter Property="pu:MenuHelper.SubmenuItemsHoverForeground"
+    <Style x:Key="ToolBarMenuStyle" BasedOn="{StaticResource {x:Type Menu}}" TargetType="Menu">
+        <Setter Property="Height" Value="55" />
+        <Setter Property="FontSize" Value="24" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="pu:MenuHelper.TopLevelDropDownVerticalOffset" Value="-25" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimaryDarker}" />
+        <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:MenuHelper.CornerRadius" Value="5" />
+        <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="TopRight" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="15,0" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsHeight" Value="55" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="Transparent" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsHoverForeground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsOpenedForeground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="15,0" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="55" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsIconWidth" Value="NaN" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="200" />
+        <Setter Property="pu:DropDownHelper.CornerRadius" Value="5" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="Transparent" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
+        <!--<Setter Property="pu:MenuHelper.SubmenuItemsHoverForeground"
                 Value="{DynamicResource DARKPrimary}" />-->
-    <Setter Property="pu:MenuHelper.SubmenuItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" />
-    <!--<Setter Property="pu:MenuHelper.SubmenuItemsOpenedForeground"
+        <Setter Property="pu:MenuHelper.SubmenuItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" />
+        <!--<Setter Property="pu:MenuHelper.SubmenuItemsOpenedForeground"
                 Value="{DynamicResource DARKPrimary}" />-->
-    <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorVisibility" Value="Visible" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorBrush" Value="#CCCECF" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorMargin" Value="10,0" />
-    <!--<Setter Property="pu:MenuHelper.ShadowColor"
+        <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorVisibility" Value="Visible" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorBrush" Value="#CCCECF" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorMargin" Value="10,0" />
+        <!--<Setter Property="pu:MenuHelper.ShadowColor"
                 Value="{DynamicResource ShadowColor}" />-->
-    <Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" />
-    <Setter Property="pu:ShadowHelper.Opacity" Value="0.7" />
-    <Setter Property="pu:ShadowHelper.BlurRadius" Value="25" />
-  </Style>
+        <Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" />
+        <Setter Property="pu:ShadowHelper.Opacity" Value="0.7" />
+        <Setter Property="pu:ShadowHelper.BlurRadius" Value="25" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
index fc2f5e6..e1590c9 100644
--- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj
+++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
@@ -23,10 +23,10 @@
 	  <None Include="..\.editorconfig" Link=".editorconfig" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="LinePutScript" Version="1.11.3" />
+		<PackageReference Include="LinePutScript" Version="1.11.4" />
 		<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
-		<PackageReference Include="Panuon.WPF" Version="1.0.4" />
-		<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
+		<PackageReference Include="Panuon.WPF" Version="1.1.0" />
+		<PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
diff --git a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
index 044d504..c899719 100644
--- a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
+++ b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
@@ -16,9 +16,9 @@
     <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LinePutScript" Version="1.11.3" />
+    <PackageReference Include="LinePutScript" Version="1.11.4" />
     <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
-    <PackageReference Include="Panuon.WPF" Version="1.0.4" />
-    <PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
+    <PackageReference Include="Panuon.WPF" Version="1.1.0" />
+    <PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
index a3926ce..ef36f9f 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -214,12 +214,12 @@
 	<ItemGroup>
 		<PackageReference Include="Facepunch.Steamworks" Condition="'$(Platform)' == 'x64'" Version="2.3.3" />
 		<PackageReference Include="Facepunch.Steamworks.win32" Condition="'$(Platform)' == 'x86'" Version="2.3.3" />
-		<PackageReference Include="LinePutScript" Version="1.11.3" />
+		<PackageReference Include="LinePutScript" Version="1.11.4" />
 		<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="NAudio" Version="2.2.1" />
-		<PackageReference Include="Panuon.WPF" Version="1.0.4" />
-		<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
+		<PackageReference Include="Panuon.WPF" Version="1.1.0" />
+		<PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
index 86e9dde..edb6122 100644
--- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
@@ -177,7 +177,7 @@
                                             <ItemsControl.ItemTemplate>
                                                 <DataTemplate>
                                                     <StackPanel Orientation="Horizontal"
-                                                                Width="{Binding ActualWidth, Converter={StaticResource {x:Static pu:ConverterKeys.DoubleDivideByConverter}},ConverterParameter=2, ElementName=StkContainer}">
+                                                            Width="{Binding ActualWidth, Converter={x:Static pu:Converters.DoubleDivideByConverter},ConverterParameter=2, ElementName=StkContainer}">
                                                         <TextBlock Foreground="{DynamicResource DARKPrimaryText}" FontSize="12" Width="37"
                                                                    Padding="0" VerticalAlignment="Center" Text="{Binding Key}" />
                                                         <TextBlock Text="："
@@ -206,7 +206,7 @@
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Border x:Name="BdrImage" Margin="10,35,0,10" CornerRadius="5"
-                            Visibility="{Binding IsChecked,Converter={StaticResource {x:Static pu:ConverterKeys.TrueToCollapseConverter}}, ElementName=TbtnDetail}">
+                            Visibility="{Binding IsChecked,Converter={x:Static pu:Converters.TrueToCollapseConverter}, ElementName=TbtnDetail}">
                         <Image Source="{Binding ImageSource}" Stretch="UniformToFill" />
                     </Border>
                     <ToggleButton x:Name="TbtnStar" Grid.ColumnSpan="2" Margin="0,5,32,0" HorizontalAlignment="Right"
diff --git a/VPet.Solution/App.xaml b/VPet.Solution/App.xaml
index f8cd87d..9f5f531 100644
--- a/VPet.Solution/App.xaml
+++ b/VPet.Solution/App.xaml
@@ -1,17 +1,15 @@
-<Application
-  x:Class="VPet.Solution.App"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  StartupUri="Views/MainWindow.xaml">
-  <Application.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
-        <ResourceDictionary Source="Converters.xaml" />
-        <ResourceDictionary Source="Templates.xaml" />
-        <ResourceDictionary Source="Styles.xaml" />
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </Application.Resources>
+<Application x:Class="VPet.Solution.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="https://opensource.panuon.com/wpf-ui"
+        StartupUri="Views/MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
+                <pu:StyleDictionary Includes="All" />
+                <ResourceDictionary Source="Converters.xaml" />
+                <ResourceDictionary Source="Templates.xaml" />
+                <ResourceDictionary Source="Styles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/VPet.Solution/NativeStyles.xaml b/VPet.Solution/NativeStyles.xaml
index 4710477..8675ea0 100644
--- a/VPet.Solution/NativeStyles.xaml
+++ b/VPet.Solution/NativeStyles.xaml
@@ -1,12 +1,11 @@
-<ResourceDictionary
-  x:Class="VPet.Solution.NativeStyles"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
-    <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
-    <ResourceDictionary Source="Converters.xaml" />
-    <ResourceDictionary Source="Templates.xaml" />
-    <ResourceDictionary Source="Styles.xaml" />
-  </ResourceDictionary.MergedDictionaries>
+<ResourceDictionary x:Class="VPet.Solution.NativeStyles" xmlns:pu="https://opensource.panuon.com/wpf-ui"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
+        <pu:StyleDictionary Includes="All" />
+        <ResourceDictionary Source="Converters.xaml" />
+        <ResourceDictionary Source="Templates.xaml" />
+        <ResourceDictionary Source="Styles.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/VPet.Solution/Styles.xaml b/VPet.Solution/Styles.xaml
index 98cecb4..3136486 100644
--- a/VPet.Solution/Styles.xaml
+++ b/VPet.Solution/Styles.xaml
@@ -1,133 +1,98 @@
-<ResourceDictionary
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:pu="https://opensource.panuon.com/wpf-ui">
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-  <Style
-    x:Key="Button_Add"
-    BasedOn="{StaticResource {x:Type Button}}"
-    TargetType="Button">
-    <Setter Property="Background" Value="{StaticResource DARKPrimary}" />
-    <Setter Property="pu:ButtonHelper.ShadowColor" Value="{StaticResource ShadowColor}" />
-    <Setter Property="FontSize" Value="24" />
-    <Setter Property="Padding" Value="10" />
-    <Setter Property="Margin" Value="10" />
-    <Setter Property="pu:ButtonHelper.CornerRadius" Value="24" />
-  </Style>
-  <Style
-    x:Key="Button_Cancel"
-    BasedOn="{StaticResource ThemedButtonStyle}"
-    TargetType="Button">
-    <Setter Property="Background" Value="{StaticResource PrimaryLight}" />
-    <Setter Property="Foreground" Value="{StaticResource SecondaryText}" />
-  </Style>
-  <Style
-    x:Key="Button_HiddenOnTagNull"
-    BasedOn="{StaticResource ThemedButtonStyle}"
-    TargetType="Button">
-    <Setter Property="Visibility" Value="Hidden" />
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
-        <Setter Property="Visibility" Value="Visible" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style
-    x:Key="Button_CollapsedOnTagNull"
-    BasedOn="{StaticResource ThemedButtonStyle}"
-    TargetType="Button">
-    <Setter Property="Visibility" Value="Collapsed" />
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
-        <Setter Property="Visibility" Value="Visible" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style
-    x:Key="TextBlock_Wrap"
-    BasedOn="{StaticResource {x:Type TextBlock}}"
-    TargetType="TextBlock">
-    <Setter Property="TextWrapping" Value="Wrap" />
-    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
-  </Style>
-  <Style
-    x:Key="TextBlock_BaseStyle"
-    BasedOn="{StaticResource {x:Type TextBlock}}"
-    TargetType="TextBlock">
-    <Setter Property="Margin" Value="5" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
-  </Style>
-  <Style
-    x:Key="TextBlock_LeftCenter"
-    BasedOn="{StaticResource {x:Type TextBlock}}"
-    TargetType="TextBlock">
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
-  </Style>
-  <Style
-    x:Key="TextBox_Wrap"
-    BasedOn="{StaticResource {x:Type TextBox}}"
-    TargetType="TextBox">
-    <Setter Property="TextWrapping" Value="Wrap" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
-  </Style>
-  <Style
-    x:Key="TextBox_Center"
-    BasedOn="{StaticResource {x:Type TextBox}}"
-    TargetType="TextBox">
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
-  </Style>
-  <Style
-    x:Key="TextBox_LeftCenter"
-    BasedOn="{StaticResource {x:Type TextBox}}"
-    TargetType="TextBox">
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
-  </Style>
-  <Style x:Key="WindowXStyle" TargetType="pu:WindowX">
-    <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
-  </Style>
-  <Style
-    x:Key="Menu_Style"
-    BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}"
-    TargetType="Menu">
-    <Setter Property="Height" Value="NaN" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:MenuHelper.CornerRadius" Value="4" />
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="https://opensource.panuon.com/wpf-ui">
+    <ResourceDictionary.MergedDictionaries>
+        <pu:StyleDictionary Includes="All" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style x:Key="Button_Add" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource DARKPrimary}" />
+        <Setter Property="pu:ButtonHelper.ShadowColor" Value="{StaticResource ShadowColor}" />
+        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Padding" Value="10" />
+        <Setter Property="Margin" Value="10" />
+        <Setter Property="pu:ButtonHelper.CornerRadius" Value="24" />
+    </Style>
+    <Style x:Key="Button_Cancel" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource PrimaryLight}" />
+        <Setter Property="Foreground" Value="{StaticResource SecondaryText}" />
+    </Style>
+    <Style x:Key="Button_HiddenOnTagNull" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
+        <Setter Property="Visibility" Value="Hidden" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Visible" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="Button_CollapsedOnTagNull" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
+        <Setter Property="Visibility" Value="Collapsed" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Visible" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="TextBlock_Wrap" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
+    </Style>
+    <Style x:Key="TextBlock_BaseStyle" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
+    </Style>
+    <Style x:Key="TextBlock_LeftCenter" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
+    </Style>
+    <Style x:Key="TextBox_Wrap" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
+    </Style>
+    <Style x:Key="TextBox_Center" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
+    </Style>
+    <Style x:Key="TextBox_LeftCenter" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
+    </Style>
+    <Style x:Key="WindowXStyle" TargetType="pu:WindowX">
+        <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
+    </Style>
+    <Style x:Key="Menu_Style" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}" TargetType="Menu">
+        <Setter Property="Height" Value="NaN" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.CornerRadius" Value="4" />
 
-    <Setter Property="pu:DropDownHelper.CornerRadius" Value="4" />
-    <!--    -->
-    <Setter Property="pu:MenuHelper.TopLevelItemsBorderThickness" Value="0" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="5,0,5,0" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsMargin" Value="0" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsHorizontalContentAlignment" Value="Center" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:MenuHelper.TopLevelItemsForeground" Value="{DynamicResource DARKPrimaryText}" />
-    <!--    -->
-    <Setter Property="pu:MenuHelper.SubmenuItemsBorderThickness" Value="0" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsBorderBrush" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="NaN" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="NaN" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="5" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsMargin" Value="0" />
-    <!--<Setter Property="pu:MenuHelper.SubmenuItemsCornerRadius" Value="4" />-->
-    <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="{DynamicResource DARKPrimary}" />
-    <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="{DynamicResource DARKPrimaryText}" />
-    <!--<Setter Property="Width" Value="NaN" />
+        <Setter Property="pu:DropDownHelper.CornerRadius" Value="4" />
+        <!--    -->
+        <Setter Property="pu:MenuHelper.TopLevelItemsBorderThickness" Value="0" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="5,0,5,0" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsMargin" Value="0" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsHorizontalContentAlignment" Value="Center" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsForeground" Value="{DynamicResource DARKPrimaryText}" />
+        <!--    -->
+        <Setter Property="pu:MenuHelper.SubmenuItemsBorderThickness" Value="0" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsBorderBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="NaN" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="NaN" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="5" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsMargin" Value="0" />
+        <!--<Setter Property="pu:MenuHelper.SubmenuItemsCornerRadius" Value="4" />-->
+        <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="{DynamicResource DARKPrimaryText}" />
+        <!--<Setter Property="Width" Value="NaN" />
     <Setter Property="Height" Value="NaN" />
     <Setter Property="Padding" Value="5" />
     <Setter Property="Background" Value="{DynamicResource BackgroundColor}" />
@@ -136,73 +101,62 @@
     <Setter Property="pu:MenuItemHelper.HoverBackground" Value="{DynamicResource HoverColor}" />
     <Setter Property="pu:MenuItemHelper.ClickBackground" Value="{DynamicResource ClickColor}" />
     <Setter Property="pu:MenuItemHelper.CheckedBackground" Value="{DynamicResource CheckedColor}" />-->
-  </Style>
-  <Style x:Key="Switch_BaseStyle" TargetType="pu:Switch">
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="Margin" Value="5" />
-    <Setter Property="Background" Value="{x:Null}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryDark}" />
-    <Setter Property="BoxHeight" Value="20" />
-    <Setter Property="CheckedBackground" Value="{DynamicResource Primary}" />
-    <Setter Property="CheckedBorderBrush" Value="{DynamicResource Primary}" />
-    <Setter Property="CheckedToggleBrush" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="ToggleBrush" Value="{DynamicResource PrimaryDark}" />
-    <Setter Property="ToggleShadowColor" Value="{x:Null}" />
-    <Setter Property="ToggleSize" Value="14" />
-  </Style>
-  <Style x:Key="Label_BaseStyle" TargetType="Label">
-    <Setter Property="FontSize" Value="14" />
-    <Setter Property="Margin" Value="10,5,10,5" />
-    <Setter Property="Height" Value="30" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{x:Null}" />
-  </Style>
-  <Style x:Key="NumberInput_BaseStyle" TargetType="pu:NumberInput">
-    <Setter Property="Height" Value="30" />
-    <Setter Property="Margin" Value="5" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Background" Value="{x:Null}" />
-    <Setter Property="FontSize" Value="14" />
-    <Setter Property="FontWeight" Value="Bold" />
-    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDarker}" />
-  </Style>
-  <Style
-    x:Key="Button_BaseStyle"
-    BasedOn="{StaticResource {x:Type Button}}"
-    TargetType="Button">
-    <Setter Property="Margin" Value="5" />
-    <Setter Property="Padding" Value="5" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="pu:ButtonHelper.CornerRadius" Value="4" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryLight}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
-    <Setter Property="BorderThickness" Value="2" />
-  </Style>
-  <Style
-    x:Key="ComboBox_BaseStyle"
-    BasedOn="{StaticResource StandardComboBoxStyle}"
-    TargetType="ComboBox">
-    <Setter Property="Margin" Value="5" />
-  </Style>
-  <Style
-    x:Key="Expander_BaseStyle"
-    BasedOn="{StaticResource {x:Static pu:StyleKeys.ExpanderStyle}}"
-    TargetType="Expander">
-    <Setter Property="Margin" Value="10" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
-    <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
-    <Setter Property="BorderThickness" Value="2" />
-    <Setter Property="pu:ExpanderHelper.CornerRadius" Value="4" />
-    <Setter Property="pu:ExpanderHelper.ToggleArrowPlacement" Value="Right" />
-  </Style>
-  <Style
-    x:Key="Slider_BaseStyle"
-    BasedOn="{StaticResource StandardSliderStyle}"
-    TargetType="Slider">
-    <Setter Property="IsSnapToTickEnabled" Value="True" />
-    <Setter Property="Margin" Value="5" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
+    </Style>
+    <Style x:Key="Switch_BaseStyle" TargetType="pu:Switch">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryDark}" />
+        <Setter Property="BoxHeight" Value="20" />
+        <Setter Property="CheckedBackground" Value="{DynamicResource Primary}" />
+        <Setter Property="CheckedBorderBrush" Value="{DynamicResource Primary}" />
+        <Setter Property="CheckedToggleBrush" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="ToggleBrush" Value="{DynamicResource PrimaryDark}" />
+        <Setter Property="ToggleShadowColor" Value="{x:Null}" />
+        <Setter Property="ToggleSize" Value="14" />
+    </Style>
+    <Style x:Key="Label_BaseStyle" TargetType="Label">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Margin" Value="10,5,10,5" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{x:Null}" />
+    </Style>
+    <Style x:Key="NumberInput_BaseStyle" TargetType="pu:NumberInput">
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDarker}" />
+    </Style>
+    <Style x:Key="Button_BaseStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="Padding" Value="5" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="pu:ButtonHelper.CornerRadius" Value="4" />
+        <Setter Property="Background" Value="{DynamicResource SecondaryLight}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
+        <Setter Property="BorderThickness" Value="2" />
+    </Style>
+    <Style x:Key="ComboBox_BaseStyle" BasedOn="{StaticResource StandardComboBoxStyle}" TargetType="ComboBox">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+    <Style x:Key="Expander_BaseStyle" BasedOn="{StaticResource {x:Static pu:StyleKeys.ExpanderStyle}}"
+            TargetType="Expander">
+        <Setter Property="Margin" Value="10" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
+        <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="pu:ExpanderHelper.CornerRadius" Value="4" />
+        <Setter Property="pu:ExpanderHelper.ToggleArrowPlacement" Value="Right" />
+    </Style>
+    <Style x:Key="Slider_BaseStyle" BasedOn="{StaticResource StandardSliderStyle}" TargetType="Slider">
+        <Setter Property="IsSnapToTickEnabled" Value="True" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/VPet.Solution/VPet.Solution.csproj b/VPet.Solution/VPet.Solution.csproj
index 09e847a..160992b 100644
--- a/VPet.Solution/VPet.Solution.csproj
+++ b/VPet.Solution/VPet.Solution.csproj
@@ -20,11 +20,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FastMember" Version="1.5.0" />
-    <PackageReference Include="LinePutScript" Version="1.11.3" />
+    <PackageReference Include="LinePutScript" Version="1.11.4" />
     <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Panuon.WPF" Version="1.0.4" />
-    <PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
+    <PackageReference Include="Panuon.WPF" Version="1.1.0" />
+    <PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file