diff --git a/AIStudio.Wpf.DiagramApp/Themes/Styles/Expander.xaml b/AIStudio.Wpf.DiagramApp/Styles/Expander.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramApp/Themes/Styles/Expander.xaml
rename to AIStudio.Wpf.DiagramApp/Styles/Expander.xaml
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Styles/Fluent.xaml b/AIStudio.Wpf.DiagramApp/Styles/Fluent.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramApp/Themes/Styles/Fluent.xaml
rename to AIStudio.Wpf.DiagramApp/Styles/Fluent.xaml
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Styles/ListBox.xaml b/AIStudio.Wpf.DiagramApp/Styles/ListBox.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramApp/Themes/Styles/ListBox.xaml
rename to AIStudio.Wpf.DiagramApp/Styles/ListBox.xaml
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Styles/Slider.xaml b/AIStudio.Wpf.DiagramApp/Styles/Slider.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramApp/Themes/Styles/Slider.xaml
rename to AIStudio.Wpf.DiagramApp/Styles/Slider.xaml
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Styles/TabControl.xaml b/AIStudio.Wpf.DiagramApp/Styles/TabControl.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramApp/Themes/Styles/TabControl.xaml
rename to AIStudio.Wpf.DiagramApp/Styles/TabControl.xaml
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Styles/ToggleButton.xaml b/AIStudio.Wpf.DiagramApp/Styles/ToggleButton.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramApp/Themes/Styles/ToggleButton.xaml
rename to AIStudio.Wpf.DiagramApp/Styles/ToggleButton.xaml
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml b/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml
index acecd78..834adaf 100644
--- a/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml
+++ b/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml
@@ -2,20 +2,20 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <ResourceDictionary.MergedDictionaries>      
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ScrollBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/Expander.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/GroupBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ToolTip.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ScrollViewer.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ZoomBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/DesignerItems.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/Fluent.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/Expander.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/ListBox.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/Slider.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/TabControl.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/ToggleButton.xaml"/>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ScrollBar.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/Expander.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/GroupBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ToolTip.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ScrollViewer.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ZoomBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ComboBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Styles/Fluent.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Styles/Expander.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Styles/ListBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Styles/Slider.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Styles/TabControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Styles/ToggleButton.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/PathItemViewModel.xaml"/>
diff --git a/AIStudio.Wpf.DiagramDesigner.Test/App.xaml b/AIStudio.Wpf.DiagramDesigner.Test/App.xaml
index cf8e9da..2493cd6 100644
--- a/AIStudio.Wpf.DiagramDesigner.Test/App.xaml
+++ b/AIStudio.Wpf.DiagramDesigner.Test/App.xaml
@@ -6,14 +6,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ScrollBar.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/Expander.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/GroupBox.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ToolTip.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ScrollViewer.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ZoomBox.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/DesignerItems.xaml" />
-                
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ScrollBar.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/Expander.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/GroupBox.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ToolTip.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ScrollViewer.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ZoomBox.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ComboBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>      
     </Application.Resources>
diff --git a/AIStudio.Wpf.DiagramDesigner.Test/MainWindow.xaml b/AIStudio.Wpf.DiagramDesigner.Test/MainWindow.xaml
index a6c8af3..916856c 100644
--- a/AIStudio.Wpf.DiagramDesigner.Test/MainWindow.xaml
+++ b/AIStudio.Wpf.DiagramDesigner.Test/MainWindow.xaml
@@ -12,7 +12,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Flowchart;component/Themes/FlowNode.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Controls/ComboBox.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ComboBox.xaml" />
                 <ResourceDictionary>
                     <!-- Accent colors -->
                     <Color x:Key="Fluent.Ribbon.Colors.AccentBaseColor">#FF0078D7</Color>
diff --git a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
index 8a69c51..c70117e 100644
--- a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
+++ b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
@@ -30,5 +30,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Styles\ComboBox.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
   
 </Project>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
index 5050d15..0053700 100644
--- a/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
@@ -25,42 +25,46 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            List<PointInfoBase> points = (List<PointInfoBase>)values[0];
             PathGeometry pathGeometry = new PathGeometry();
-            PathFigure figure = new PathFigure();
-            figure.StartPoint = points[0];
-            if (values[1]?.ToString() == DrawMode.RadiusConnectingLine.ToString())
+            if (values[0] != null)
             {
-                for (var i = 0; i < points.Count - 1; i++)
-                {
-                    int current = i, last = i - 1, next = i + 1, next2 = i + 2;
-                    if (last == -1)
-                    {
-                        last = 0;
-                    }
-                    if (next == points.Count)
-                    {
-                        next = points.Count - 1;
-                    }
-                    if (next2 == points.Count)
-                    {
-                        next2 = points.Count - 1;
-                    }
-                    var bzs = SegmentHelper.GetBezierSegment(points[current], points[last], points[next], points[next2]);
-                    figure.Segments.Add(bzs);
-                }
-            }
-            else
-            {
-                for (int i = 0; i < points.Count; i++)
-                {
+                List<PointInfoBase> points = (List<PointInfoBase>)values[0];
 
-                    LineSegment arc = new LineSegment(points[i], true);
-                    figure.Segments.Add(arc);
+                PathFigure figure = new PathFigure();
+                figure.StartPoint = points[0];
+                if (values[1]?.ToString() == DrawMode.RadiusConnectingLine.ToString())
+                {
+                    for (var i = 0; i < points.Count - 1; i++)
+                    {
+                        int current = i, last = i - 1, next = i + 1, next2 = i + 2;
+                        if (last == -1)
+                        {
+                            last = 0;
+                        }
+                        if (next == points.Count)
+                        {
+                            next = points.Count - 1;
+                        }
+                        if (next2 == points.Count)
+                        {
+                            next2 = points.Count - 1;
+                        }
+                        var bzs = SegmentHelper.GetBezierSegment(points[current], points[last], points[next], points[next2]);
+                        figure.Segments.Add(bzs);
+                    }
                 }
-            }
+                else
+                {
+                    for (int i = 0; i < points.Count; i++)
+                    {
 
-            pathGeometry.Figures.Add(figure);
+                        LineSegment arc = new LineSegment(points[i], true);
+                        figure.Segments.Add(arc);
+                    }
+                }
+
+                pathGeometry.Figures.Add(figure);
+            }
             return pathGeometry;
         }
 
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Expander.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Expander.xaml
deleted file mode 100644
index 5974bb0..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Expander.xaml
+++ /dev/null
@@ -1,117 +0,0 @@
-<ResourceDictionary 
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- SimpleStyles: Expander -->
-
-  <ControlTemplate x:Key="ExpanderToggleButton" TargetType="ToggleButton">
-    <Border
-      Name="Border" 
-      CornerRadius="2,0,0,0"
-      Background="Transparent"
-      BorderBrush="{StaticResource NormalBorderBrush}"
-      BorderThickness="0,0,0,0">
-      <Path 
-        Name="Arrow"
-        Fill="{StaticResource GlyphBrush}"
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Data="M 0 0 L 4 4 L 8 0 Z"/>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="ToggleButton.IsMouseOver" Value="true">
-        <Setter TargetName="Border" Property="Background"
-                Value="{StaticResource DarkBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="true">
-        <Setter TargetName="Border" Property="Background"
-                Value="{StaticResource PressedBrush}" />
-      </Trigger>
-      <Trigger Property="IsChecked" Value="true">
-        <Setter TargetName="Arrow" Property="Data"
-                Value="M 0 4 L 4 0 L 8 4 Z" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter TargetName="Border" Property="Background"
-                Value="{StaticResource DisabledBackgroundBrush}" />
-        <Setter TargetName="Border" Property="BorderBrush"
-                Value="{StaticResource DisabledBorderBrush}" />
-        <Setter Property="Foreground"
-                Value="{StaticResource DisabledForegroundBrush}"/>
-        <Setter TargetName="Arrow" Property="Fill"
-                Value="{StaticResource DisabledForegroundBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="Expander">
-    <Setter Property="FontFamily" Value="SegoeUI"/>
-    <Setter Property="FontSize" Value="12"/>
-    <Setter Property="Foreground" Value="#4C4C4C"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Expander">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto"/>
-              <RowDefinition Name="ContentRow" Height="0"/>
-            </Grid.RowDefinitions>
-            <Border 
-              Name="Border" 
-              Grid.Row="0" 
-              Background="{StaticResource LightBrush}"
-              BorderBrush="{StaticResource NormalBorderBrush}"
-              BorderThickness="1" 
-              CornerRadius="2,2,0,0" >
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="20" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <ToggleButton
-                  IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,
-                                      RelativeSource={RelativeSource TemplatedParent}}"
-                  OverridesDefaultStyle="True" 
-                  Template="{StaticResource ExpanderToggleButton}" 
-                  Background="{StaticResource NormalBrush}" />
-                <ContentPresenter 
-                  Grid.Column="1"
-                  Margin="4" 
-                  ContentSource="Header" 
-                  RecognizesAccessKey="True" />
-              </Grid>
-            </Border>
-            <Border 
-              Name="Content" 
-              Grid.Row="1" 
-              Background="{StaticResource WindowBackgroundBrush}"
-              BorderBrush="{StaticResource SolidBorderBrush}" 
-              BorderThickness="1,0,1,1" 
-              CornerRadius="0,0,2,2" >
-              <ContentPresenter Margin="4" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded" Value="True">
-              <Setter TargetName="ContentRow" Property="Height"
-                      Value="{Binding ElementName=Content,Path=DesiredHeight}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter TargetName="Border" Property="Background"
-                      Value="{StaticResource DisabledBackgroundBrush}" />
-              <Setter TargetName="Border" Property="BorderBrush"
-                      Value="{StaticResource DisabledBorderBrush}" />
-              <Setter Property="Foreground"
-                      Value="{StaticResource DisabledForegroundBrush}"/>
-            </Trigger>
-
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/GroupBox.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/GroupBox.xaml
deleted file mode 100644
index f418927..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/GroupBox.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<ResourceDictionary 
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- SimpleStyles: GroupBox -->
-  <Style TargetType="GroupBox">
-    <Setter Property="FontFamily" Value="SegoeUI"/>
-    <Setter Property="FontSize" Value="12"/>
-    <Setter Property="Foreground" Value="#4C4C4C"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="GroupBox">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto"/>
-              <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <Border 
-              Grid.Row="0" 
-              Background="{StaticResource LightBrush}"
-              BorderBrush="{StaticResource NormalBorderBrush}"
-              BorderThickness="1" 
-              CornerRadius="2,2,0,0" >
-              <ContentPresenter 
-                Margin="4" 
-                ContentSource="Header" 
-                RecognizesAccessKey="True" />
-            </Border>
-            <Border 
-              Grid.Row="1" 
-              Background="{TemplateBinding Background}"
-              BorderBrush="{StaticResource SolidBorderBrush}" 
-              BorderThickness="1,0,1,1" 
-              CornerRadius="0,0,2,2" >
-              <ContentPresenter 
-                Margin="4" />
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollBar.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollBar.xaml
deleted file mode 100644
index f81c8a5..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollBar.xaml
+++ /dev/null
@@ -1,186 +0,0 @@
-<ResourceDictionary 
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <Style x:Key="ScrollBarLineButton" TargetType="{x:Type RepeatButton}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="Focusable" Value="false"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Border 
-            Name="Border"
-            Margin="1" 
-            CornerRadius="2" 
-            Background="{StaticResource NormalBrush}"
-            BorderBrush="{StaticResource NormalBorderBrush}"
-            BorderThickness="1">
-            <Path 
-              HorizontalAlignment="Center"
-              VerticalAlignment="Center"
-              Fill="{StaticResource GlyphBrush}"
-              Data="{Binding Path=Content,RelativeSource={RelativeSource TemplatedParent}}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsPressed" Value="true">
-              <Setter TargetName="Border" Property="Background" Value="{StaticResource PressedBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ScrollBarPageButton" TargetType="{x:Type RepeatButton}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="IsTabStop" Value="false"/>
-    <Setter Property="Focusable" Value="false"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Border Background="Transparent" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="IsTabStop" Value="false"/>
-    <Setter Property="Focusable" Value="false"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Border 
-            CornerRadius="2" 
-            Background="{TemplateBinding Background}"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="1" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
-    <Grid >
-      <Grid.RowDefinitions>
-        <RowDefinition MaxHeight="18"/>
-        <RowDefinition Height="0.00001*"/>
-        <RowDefinition MaxHeight="18"/>
-      </Grid.RowDefinitions>
-      <Border
-        Grid.RowSpan="3"
-        CornerRadius="2" 
-        Background="#F0F0F0" />
-      <RepeatButton 
-        Grid.Row="0"                           
-        Style="{StaticResource ScrollBarLineButton}"
-        Height="18"
-        Command="ScrollBar.LineUpCommand"
-        Content="M 0 4 L 8 4 L 4 0 Z" />
-      <Track 
-        Name="PART_Track"
-        Grid.Row="1"
-        IsDirectionReversed="true">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton 
-            Style="{StaticResource ScrollBarPageButton}"
-            Command="ScrollBar.PageUpCommand" />
-        </Track.DecreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb 
-            Style="{StaticResource ScrollBarThumb}" 
-            Margin="1,0,1,0"  
-            Background="{StaticResource HorizontalNormalBrush}"
-            BorderBrush="{StaticResource HorizontalNormalBorderBrush}" />
-        </Track.Thumb>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton 
-            Style="{StaticResource ScrollBarPageButton}"
-            Command="ScrollBar.PageDownCommand" />
-        </Track.IncreaseRepeatButton>
-      </Track>
-      <RepeatButton 
-        Grid.Row="3" 
-        Style="{StaticResource ScrollBarLineButton}"
-        Height="18"
-        Command="ScrollBar.LineDownCommand"
-        Content="M 0 0 L 4 4 L 8 0 Z"/>
-    </Grid>
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
-    <Grid >
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition MaxWidth="18"/>
-        <ColumnDefinition Width="0.00001*"/>
-        <ColumnDefinition MaxWidth="18"/>
-      </Grid.ColumnDefinitions>
-      <Border
-        Grid.ColumnSpan="3"
-        CornerRadius="2" 
-        Background="#F0F0F0" />
-      <RepeatButton 
-        Grid.Column="0"                           
-        Style="{StaticResource ScrollBarLineButton}"
-        Width="18"
-        Command="ScrollBar.LineLeftCommand"
-        Content="M 4 0 L 4 8 L 0 4 Z" />
-      <Track 
-        Name="PART_Track"
-        Grid.Column="1"
-        IsDirectionReversed="False">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton 
-            Style="{StaticResource ScrollBarPageButton}"
-            Command="ScrollBar.PageLeftCommand" />
-        </Track.DecreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb 
-            Style="{StaticResource ScrollBarThumb}" 
-            Margin="0,1,0,1"  
-            Background="{StaticResource NormalBrush}"
-            BorderBrush="{StaticResource NormalBorderBrush}" />
-        </Track.Thumb>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton 
-            Style="{StaticResource ScrollBarPageButton}"
-            Command="ScrollBar.PageRightCommand" />
-        </Track.IncreaseRepeatButton>
-      </Track>
-      <RepeatButton 
-        Grid.Column="3" 
-        Style="{StaticResource ScrollBarLineButton}"
-        Width="18"
-        Command="ScrollBar.LineRightCommand"
-        Content="M 0 0 L 4 4 L 0 8 Z"/>
-    </Grid>
-  </ControlTemplate>
-
-  <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Horizontal">
-        <Setter Property="Width" Value="Auto"/>
-        <Setter Property="Height" Value="18" />
-        <Setter Property="Template" Value="{StaticResource HorizontalScrollBar}" />
-      </Trigger>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Width" Value="18"/>
-        <Setter Property="Height" Value="Auto" />
-        <Setter Property="Template" Value="{StaticResource VerticalScrollBar}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollViewer.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollViewer.xaml
deleted file mode 100644
index 07fa158..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollViewer.xaml
+++ /dev/null
@@ -1,43 +0,0 @@
-<ResourceDictionary 
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
-
-  <!-- SimpleStyles: ScrollViewer -->
-
-  <Style x:Key="LeftScrollViewer" TargetType="{x:Type ScrollViewer}">
-    <Setter Property="OverridesDefaultStyle" Value="True"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ScrollViewer}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto"/>
-              <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition/>
-              <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-
-            <ScrollContentPresenter Grid.Column="1"/>
-
-            <ScrollBar Name="PART_VerticalScrollBar"
-              Value="{TemplateBinding VerticalOffset}"
-              Maximum="{TemplateBinding ScrollableHeight}"
-              ViewportSize="{TemplateBinding ViewportHeight}"
-              Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
-            <ScrollBar Name="PART_HorizontalScrollBar"
-              Orientation="Horizontal"
-              Grid.Row="1"
-              Grid.Column="1"
-              Value="{TemplateBinding HorizontalOffset}"
-              Maximum="{TemplateBinding ScrollableWidth}"
-              ViewportSize="{TemplateBinding ViewportWidth}"
-              Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
-            
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Shared.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Shared.xaml
deleted file mode 100644
index fd557d4..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Shared.xaml
+++ /dev/null
@@ -1,118 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    
-  <!-- Fill Brushes -->
-
-  <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#CCC" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="HorizontalNormalBrush" StartPoint="0,0" EndPoint="1,0">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#CCC" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#EEE" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#EEE" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#AAA" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#BBB" Offset="0.0"/>
-        <GradientStop Color="#EEE" Offset="0.1"/>
-        <GradientStop Color="#EEE" Offset="0.9"/>
-        <GradientStop Color="#FFF" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
-
-  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE" />
-
-  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF" />
-
-  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD" />
-
-  <!-- Border Brushes -->
-
-  <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#CCC" Offset="0.0"/>
-        <GradientStop Color="#444" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#CCC" Offset="0.0"/>
-        <GradientStop Color="#444" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#777" Offset="0.0"/>
-        <GradientStop Color="#000" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#444" Offset="0.0"/>
-        <GradientStop Color="#888" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
-
-  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
-
-  <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA" />
-  
-  <SolidColorBrush x:Key="GlyphBrush" Color="#444" />
-
-  <SolidColorBrush x:Key="LightColorBrush" Color="#DDD" />
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ToolTip.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ToolTip.xaml
deleted file mode 100644
index bdc742c..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ToolTip.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<ResourceDictionary 
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- SimpleStyles: ToolTip -->
-  <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="HasDropShadow" Value="True"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToolTip">
-          <Border Name="Border"
-            Background="{StaticResource LightBrush}"
-            BorderBrush="{StaticResource SolidBorderBrush}"
-            BorderThickness="1"
-            Width="{TemplateBinding Width}"
-            Height="{TemplateBinding Height}">
-            <ContentPresenter
-              Margin="4" 
-              HorizontalAlignment="Left"
-              VerticalAlignment="Top" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasDropShadow" Value="true">
-              <Setter TargetName="Border" Property="CornerRadius" Value="4"/>
-              <Setter TargetName="Border" Property="SnapsToDevicePixels" Value="true"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ZoomBox.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ZoomBox.xaml
deleted file mode 100644
index 53efc24..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ZoomBox.xaml
+++ /dev/null
@@ -1,245 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Shared.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style TargetType="{x:Type s:ZoomBox}">
-
-        <Style.Resources>
-
-            <VisualBrush x:Key="AlphaBrush"
-                         Stretch="None"
-                         TileMode="Tile"
-                         ViewportUnits="Absolute"
-                         Viewport="0,0,8,8">
-                <VisualBrush.Visual>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="4" />
-                            <ColumnDefinition Width="4" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="4" />
-                            <RowDefinition Height="4" />
-                        </Grid.RowDefinitions>
-                        <Rectangle Fill="#EEE"
-                                   Grid.Row="0"
-                                   Grid.Column="0" />
-                        <Rectangle Fill="#AAA"
-                                   Grid.Row="0"
-                                   Grid.Column="1" />
-                        <Rectangle Fill="#AAA"
-                                   Grid.Row="1"
-                                   Grid.Column="0" />
-                        <Rectangle Fill="#EEE"
-                                   Grid.Row="1"
-                                   Grid.Column="1" />
-                    </Grid>
-                </VisualBrush.Visual>
-            </VisualBrush>
-
-            <Style x:Key="ToggleButtonStyle"
-                   TargetType="ToggleButton">
-                <Setter Property="SnapsToDevicePixels"
-                        Value="true" />
-                <Setter Property="OverridesDefaultStyle"
-                        Value="true" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="ToggleButton">
-                            <Border x:Name="Border"
-                                    Background="{StaticResource NormalBrush}">
-                                <ContentPresenter />
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsMouseOver"
-                                         Value="true">
-                                    <Setter TargetName="Border"
-                                            Property="Background"
-                                            Value="{StaticResource DarkBrush}" />
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
-            <Style TargetType="Expander">
-                <Setter Property="SnapsToDevicePixels"
-                        Value="true" />
-                <Setter Property="OverridesDefaultStyle"
-                        Value="true" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Expander">
-                            <DockPanel>
-                                <ToggleButton Style="{StaticResource ToggleButtonStyle}"
-                                              DockPanel.Dock="Top"
-                                              IsChecked="{Binding Path=IsExpanded,Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                              HorizontalContentAlignment="Left"
-                                              VerticalContentAlignment="Center">
-                                    <ToggleButton.Content>
-                                        <Grid Margin="4">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="20" />
-                                                <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
-                                            <Path Grid.Column="0"
-                                                  SnapsToDevicePixels="True"
-                                                  Name="Arrow"
-                                                  Fill="{TemplateBinding Foreground}"
-                                                  Stroke="{TemplateBinding Foreground}"
-                                                  StrokeThickness="0.5"
-                                                  RenderTransformOrigin="0.5,0.5"
-                                                  HorizontalAlignment="Center"
-                                                  VerticalAlignment="Center"
-                                                  Data="M 0 0 L 0 8 L 5 4 Z">
-                                                <Path.RenderTransform>
-                                                    <RotateTransform Angle="0" />
-                                                </Path.RenderTransform>
-                                            </Path>
-                                            <ContentPresenter Grid.Column="1"
-                                                              Name="HeaderContent"
-                                                              ContentSource="Header" />
-                                        </Grid>
-                                    </ToggleButton.Content>
-                                </ToggleButton>
-                                <Border Name="Content">
-                                    <Border.LayoutTransform>
-                                        <ScaleTransform ScaleY="0" />
-                                    </Border.LayoutTransform>
-                                    <ContentPresenter Content="{TemplateBinding Content}" />
-                                </Border>
-                            </DockPanel>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="Expander.IsExpanded"
-                                         Value="True">
-                                    <Trigger.EnterActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <DoubleAnimation Storyboard.TargetName="Content"
-                                                                 Storyboard.TargetProperty="LayoutTransform.ScaleY"
-                                                                 To="1"
-                                                                 Duration="0:0:0.3" />
-                                                <DoubleAnimation Storyboard.TargetName="Content"
-                                                                 Storyboard.TargetProperty="Opacity"
-                                                                 To="1"
-                                                                 Duration="0:0:0.3" />
-                                                <DoubleAnimation Storyboard.TargetName="Arrow"
-                                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).(RotateTransform.Angle)"
-                                                                 Duration="0:0:0.2"
-                                                                 To="90"
-                                                                 DecelerationRatio="1" />
-                                            </Storyboard>
-                                        </BeginStoryboard>
-                                    </Trigger.EnterActions>
-                                    <Trigger.ExitActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <DoubleAnimation Storyboard.TargetName="Content"
-                                                                 Storyboard.TargetProperty="LayoutTransform.ScaleY"
-                                                                 To="0"
-                                                                 Duration="0:0:0.3" />
-                                                <DoubleAnimation Storyboard.TargetName="Content"
-                                                                 Storyboard.TargetProperty="Opacity"
-                                                                 To="0"
-                                                                 Duration="0:0:0.3" />
-                                                <DoubleAnimation Storyboard.TargetName="Arrow"
-                                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).(RotateTransform.Angle)"
-                                                                 Duration="0:0:0.2"
-                                                                 AccelerationRatio="1" />
-                                            </Storyboard>
-                                        </BeginStoryboard>
-                                    </Trigger.ExitActions>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
-        </Style.Resources>
-
-        <Setter Property="SnapsToDevicePixels"
-                Value="true" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type s:ZoomBox}">
-                    <Border CornerRadius="1"
-                            BorderThickness="1"
-                            Background="#EEE"
-                            BorderBrush="DimGray">
-                        <Expander IsExpanded="True"
-                                  Background="Transparent">
-                            <Border BorderBrush="DimGray"
-                                    BorderThickness="0,1,0,0"
-                                    Padding="0"
-                                    Height="180">
-                                <Grid>
-                                    <Canvas Margin="5"
-                                            Name="PART_ZoomCanvas">
-                                        <Canvas.Background>
-                                            <VisualBrush Stretch="Uniform"
-                                                         Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ScrollViewer.Content}" />
-                                        </Canvas.Background>
-                                        <Thumb Name="PART_ZoomThumb"
-                                               Cursor="SizeAll">
-                                            <Thumb.Style>
-                                                <Style TargetType="Thumb">
-                                                    <Setter Property="Template">
-                                                        <Setter.Value>
-                                                            <ControlTemplate TargetType="Thumb">
-                                                                <Rectangle StrokeThickness="1"
-                                                                           Stroke="Black"
-                                                                           Fill="Transparent" />
-                                                            </ControlTemplate>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </Style>
-                                            </Thumb.Style>
-                                        </Thumb>
-                                    </Canvas>
-                                </Grid>
-                            </Border>
-                            <Expander.Header>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <Slider Name="PART_ZoomSlider"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center"
-                                            Margin="0"
-                                            Ticks="25,50,75,100,125,150,200,300,400,500"
-                                            Minimum="25"
-                                            Maximum="500"
-                                            SmallChange="25"
-                                            LargeChange="25"
-                                            Value="100"
-                                            MinWidth="104"
-                                            MinHeight="21"
-                                            IsSnapToTickEnabled="True"
-                                            IsMoveToPointEnabled="False" />
-
-                                    <TextBlock Text="{Binding ElementName=PART_ZoomSlider, Path=Value}"
-                                               Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               HorizontalAlignment="Right"
-                                               Margin="0,0,14,0" />
-                                    <TextBlock Text="%"
-                                               Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               HorizontalAlignment="Right"
-                                               Margin="1,0,2,0" />
-                                </Grid>
-                            </Expander.Header>
-                        </Expander>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramHelper/Controls/ComboBox.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/ComboBox.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramHelper/Controls/ComboBox.xaml
rename to AIStudio.Wpf.DiagramDesigner/Styles/ComboBox.xaml
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/DesignerItems.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/DesignerItems.xaml
deleted file mode 100644
index 4b9a3b4..0000000
--- a/AIStudio.Wpf.DiagramDesigner/Styles/DesignerItems.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
-                    xmlns:c="clr-namespace:AIStudio.Wpf.DiagramDesigner.Controls">
-
-  
-    <!-- Connector Style -->
-    <Style TargetType="{x:Type s:Connector}">
-        <Setter Property="Width"
-                Value="8" />
-        <Setter Property="Height"
-                Value="8" />
-        <Setter Property="Cursor"
-                Value="Cross" />
-        <Setter Property="SnapsToDevicePixels"
-                Value="true" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type s:Connector}">
-                    <Grid>
-                        <!-- transparent extra space makes connector easier to hit -->
-                        <Rectangle Fill="Transparent"
-                                   Margin="-2" />
-                        <Rectangle Fill="Lavender"
-                                   StrokeThickness="1"
-                                   Stroke="#AA000080" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ConnectorDecoratorTemplate Default Template -->
-    <ControlTemplate x:Key="ConnectorDecoratorTemplate"
-                     TargetType="{x:Type Control}">
-        <Grid Margin="-5">
-            <s:Connector x:Name="Left"
-                         Orientation="Left"
-                         VerticalAlignment="Center"
-                         HorizontalAlignment="Left" />
-            <s:Connector x:Name="Top"
-                         Orientation="Top"
-                         VerticalAlignment="Top"
-                         HorizontalAlignment="Center" />
-            <s:Connector x:Name="Right"
-                         Orientation="Right"
-                         VerticalAlignment="Center"
-                         HorizontalAlignment="Right" />
-            <s:Connector x:Name="Bottom"
-                         Orientation="Bottom"
-                         VerticalAlignment="Bottom"
-                         HorizontalAlignment="Center" />
-        </Grid>
-    </ControlTemplate>
-
-
-    <!-- DragThumb Default Template -->
-    <Style TargetType="{x:Type c:DragThumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type c:DragThumb}">
-                    <Rectangle Fill="Transparent" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/Expander.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/Expander.xaml
index 5974bb0..6d740d7 100644
--- a/AIStudio.Wpf.DiagramDesigner/Styles/Expander.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Styles/Expander.xaml
@@ -2,116 +2,116 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
 
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
-  <!-- SimpleStyles: Expander -->
+    <!-- SimpleStyles: Expander -->
 
-  <ControlTemplate x:Key="ExpanderToggleButton" TargetType="ToggleButton">
-    <Border
+    <ControlTemplate x:Key="ExpanderToggleButton" TargetType="ToggleButton">
+        <Border
       Name="Border" 
       CornerRadius="2,0,0,0"
       Background="Transparent"
       BorderBrush="{StaticResource NormalBorderBrush}"
       BorderThickness="0,0,0,0">
-      <Path 
+            <Path 
         Name="Arrow"
         Fill="{StaticResource GlyphBrush}"
         HorizontalAlignment="Center"
         VerticalAlignment="Center"
         Data="M 0 0 L 4 4 L 8 0 Z"/>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="ToggleButton.IsMouseOver" Value="true">
-        <Setter TargetName="Border" Property="Background"
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsMouseOver" Value="true">
+                <Setter TargetName="Border" Property="Background"
                 Value="{StaticResource DarkBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="true">
-        <Setter TargetName="Border" Property="Background"
+            </Trigger>
+            <Trigger Property="IsPressed" Value="true">
+                <Setter TargetName="Border" Property="Background"
                 Value="{StaticResource PressedBrush}" />
-      </Trigger>
-      <Trigger Property="IsChecked" Value="true">
-        <Setter TargetName="Arrow" Property="Data"
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+                <Setter TargetName="Arrow" Property="Data"
                 Value="M 0 4 L 4 0 L 8 4 Z" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter TargetName="Border" Property="Background"
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="Border" Property="Background"
                 Value="{StaticResource DisabledBackgroundBrush}" />
-        <Setter TargetName="Border" Property="BorderBrush"
+                <Setter TargetName="Border" Property="BorderBrush"
                 Value="{StaticResource DisabledBorderBrush}" />
-        <Setter Property="Foreground"
+                <Setter Property="Foreground"
                 Value="{StaticResource DisabledForegroundBrush}"/>
-        <Setter TargetName="Arrow" Property="Fill"
+                <Setter TargetName="Arrow" Property="Fill"
                 Value="{StaticResource DisabledForegroundBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
 
-  <Style TargetType="Expander">
-    <Setter Property="FontFamily" Value="SegoeUI"/>
-    <Setter Property="FontSize" Value="12"/>
-    <Setter Property="Foreground" Value="#4C4C4C"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Expander">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto"/>
-              <RowDefinition Name="ContentRow" Height="0"/>
-            </Grid.RowDefinitions>
-            <Border 
+    <Style TargetType="Expander">
+        <Setter Property="FontFamily" Value="SegoeUI"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="#4C4C4C"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Expander">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Name="ContentRow" Height="0"/>
+                        </Grid.RowDefinitions>
+                        <Border 
               Name="Border" 
               Grid.Row="0" 
               Background="{StaticResource LightBrush}"
               BorderBrush="{StaticResource NormalBorderBrush}"
               BorderThickness="1" 
               CornerRadius="2,2,0,0" >
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="20" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <ToggleButton
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="20" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <ToggleButton
                   IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,
                                       RelativeSource={RelativeSource TemplatedParent}}"
                   OverridesDefaultStyle="True" 
                   Template="{StaticResource ExpanderToggleButton}" 
                   Background="{StaticResource NormalBrush}" />
-                <ContentPresenter 
+                                <ContentPresenter 
                   Grid.Column="1"
                   Margin="4" 
                   ContentSource="Header" 
                   RecognizesAccessKey="True" />
-              </Grid>
-            </Border>
-            <Border 
+                            </Grid>
+                        </Border>
+                        <Border 
               Name="Content" 
               Grid.Row="1" 
               Background="{StaticResource WindowBackgroundBrush}"
               BorderBrush="{StaticResource SolidBorderBrush}" 
               BorderThickness="1,0,1,1" 
               CornerRadius="0,0,2,2" >
-              <ContentPresenter Margin="4" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded" Value="True">
-              <Setter TargetName="ContentRow" Property="Height"
+                            <ContentPresenter Margin="4" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter TargetName="ContentRow" Property="Height"
                       Value="{Binding ElementName=Content,Path=DesiredHeight}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter TargetName="Border" Property="Background"
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background"
                       Value="{StaticResource DisabledBackgroundBrush}" />
-              <Setter TargetName="Border" Property="BorderBrush"
+                            <Setter TargetName="Border" Property="BorderBrush"
                       Value="{StaticResource DisabledBorderBrush}" />
-              <Setter Property="Foreground"
+                            <Setter Property="Foreground"
                       Value="{StaticResource DisabledForegroundBrush}"/>
-            </Trigger>
+                        </Trigger>
 
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/GroupBox.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/GroupBox.xaml
index f418927..61969d7 100644
--- a/AIStudio.Wpf.DiagramDesigner/Styles/GroupBox.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Styles/GroupBox.xaml
@@ -2,46 +2,46 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
 
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
-  <!-- SimpleStyles: GroupBox -->
-  <Style TargetType="GroupBox">
-    <Setter Property="FontFamily" Value="SegoeUI"/>
-    <Setter Property="FontSize" Value="12"/>
-    <Setter Property="Foreground" Value="#4C4C4C"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="GroupBox">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto"/>
-              <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <Border 
+    <!-- SimpleStyles: GroupBox -->
+    <Style TargetType="GroupBox">
+        <Setter Property="FontFamily" Value="SegoeUI"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="#4C4C4C"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GroupBox">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Border 
               Grid.Row="0" 
               Background="{StaticResource LightBrush}"
               BorderBrush="{StaticResource NormalBorderBrush}"
               BorderThickness="1" 
               CornerRadius="2,2,0,0" >
-              <ContentPresenter 
+                            <ContentPresenter 
                 Margin="4" 
                 ContentSource="Header" 
                 RecognizesAccessKey="True" />
-            </Border>
-            <Border 
+                        </Border>
+                        <Border 
               Grid.Row="1" 
               Background="{TemplateBinding Background}"
               BorderBrush="{StaticResource SolidBorderBrush}" 
               BorderThickness="1,0,1,1" 
               CornerRadius="0,0,2,2" >
-              <ContentPresenter 
+                            <ContentPresenter 
                 Margin="4" />
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/ScrollBar.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/ScrollBar.xaml
index f81c8a5..592fdaf 100644
--- a/AIStudio.Wpf.DiagramDesigner/Styles/ScrollBar.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Styles/ScrollBar.xaml
@@ -2,185 +2,185 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
 
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
-  <Style x:Key="ScrollBarLineButton" TargetType="{x:Type RepeatButton}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="Focusable" Value="false"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Border 
+    <Style x:Key="ScrollBarLineButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border 
             Name="Border"
             Margin="1" 
             CornerRadius="2" 
             Background="{StaticResource NormalBrush}"
             BorderBrush="{StaticResource NormalBorderBrush}"
             BorderThickness="1">
-            <Path 
+                        <Path 
               HorizontalAlignment="Center"
               VerticalAlignment="Center"
               Fill="{StaticResource GlyphBrush}"
               Data="{Binding Path=Content,RelativeSource={RelativeSource TemplatedParent}}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsPressed" Value="true">
-              <Setter TargetName="Border" Property="Background" Value="{StaticResource PressedBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource PressedBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-  <Style x:Key="ScrollBarPageButton" TargetType="{x:Type RepeatButton}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="IsTabStop" Value="false"/>
-    <Setter Property="Focusable" Value="false"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Border Background="Transparent" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+    <Style x:Key="ScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border Background="Transparent" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-  <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="IsTabStop" Value="false"/>
-    <Setter Property="Focusable" Value="false"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Border 
+    <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border 
             CornerRadius="2" 
             Background="{TemplateBinding Background}"
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="1" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-  <ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
-    <Grid >
-      <Grid.RowDefinitions>
-        <RowDefinition MaxHeight="18"/>
-        <RowDefinition Height="0.00001*"/>
-        <RowDefinition MaxHeight="18"/>
-      </Grid.RowDefinitions>
-      <Border
+    <ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
+        <Grid >
+            <Grid.RowDefinitions>
+                <RowDefinition MaxHeight="18"/>
+                <RowDefinition Height="0.00001*"/>
+                <RowDefinition MaxHeight="18"/>
+            </Grid.RowDefinitions>
+            <Border
         Grid.RowSpan="3"
         CornerRadius="2" 
         Background="#F0F0F0" />
-      <RepeatButton 
+            <RepeatButton 
         Grid.Row="0"                           
         Style="{StaticResource ScrollBarLineButton}"
         Height="18"
         Command="ScrollBar.LineUpCommand"
         Content="M 0 4 L 8 4 L 4 0 Z" />
-      <Track 
+            <Track 
         Name="PART_Track"
         Grid.Row="1"
         IsDirectionReversed="true">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton 
+                <Track.DecreaseRepeatButton>
+                    <RepeatButton 
             Style="{StaticResource ScrollBarPageButton}"
             Command="ScrollBar.PageUpCommand" />
-        </Track.DecreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb 
+                </Track.DecreaseRepeatButton>
+                <Track.Thumb>
+                    <Thumb 
             Style="{StaticResource ScrollBarThumb}" 
             Margin="1,0,1,0"  
             Background="{StaticResource HorizontalNormalBrush}"
             BorderBrush="{StaticResource HorizontalNormalBorderBrush}" />
-        </Track.Thumb>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton 
+                </Track.Thumb>
+                <Track.IncreaseRepeatButton>
+                    <RepeatButton 
             Style="{StaticResource ScrollBarPageButton}"
             Command="ScrollBar.PageDownCommand" />
-        </Track.IncreaseRepeatButton>
-      </Track>
-      <RepeatButton 
+                </Track.IncreaseRepeatButton>
+            </Track>
+            <RepeatButton 
         Grid.Row="3" 
         Style="{StaticResource ScrollBarLineButton}"
         Height="18"
         Command="ScrollBar.LineDownCommand"
         Content="M 0 0 L 4 4 L 8 0 Z"/>
-    </Grid>
-  </ControlTemplate>
+        </Grid>
+    </ControlTemplate>
 
-  <ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
-    <Grid >
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition MaxWidth="18"/>
-        <ColumnDefinition Width="0.00001*"/>
-        <ColumnDefinition MaxWidth="18"/>
-      </Grid.ColumnDefinitions>
-      <Border
+    <ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
+        <Grid >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition MaxWidth="18"/>
+                <ColumnDefinition Width="0.00001*"/>
+                <ColumnDefinition MaxWidth="18"/>
+            </Grid.ColumnDefinitions>
+            <Border
         Grid.ColumnSpan="3"
         CornerRadius="2" 
         Background="#F0F0F0" />
-      <RepeatButton 
+            <RepeatButton 
         Grid.Column="0"                           
         Style="{StaticResource ScrollBarLineButton}"
         Width="18"
         Command="ScrollBar.LineLeftCommand"
         Content="M 4 0 L 4 8 L 0 4 Z" />
-      <Track 
+            <Track 
         Name="PART_Track"
         Grid.Column="1"
         IsDirectionReversed="False">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton 
+                <Track.DecreaseRepeatButton>
+                    <RepeatButton 
             Style="{StaticResource ScrollBarPageButton}"
             Command="ScrollBar.PageLeftCommand" />
-        </Track.DecreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb 
+                </Track.DecreaseRepeatButton>
+                <Track.Thumb>
+                    <Thumb 
             Style="{StaticResource ScrollBarThumb}" 
             Margin="0,1,0,1"  
             Background="{StaticResource NormalBrush}"
             BorderBrush="{StaticResource NormalBorderBrush}" />
-        </Track.Thumb>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton 
+                </Track.Thumb>
+                <Track.IncreaseRepeatButton>
+                    <RepeatButton 
             Style="{StaticResource ScrollBarPageButton}"
             Command="ScrollBar.PageRightCommand" />
-        </Track.IncreaseRepeatButton>
-      </Track>
-      <RepeatButton 
+                </Track.IncreaseRepeatButton>
+            </Track>
+            <RepeatButton 
         Grid.Column="3" 
         Style="{StaticResource ScrollBarLineButton}"
         Width="18"
         Command="ScrollBar.LineRightCommand"
         Content="M 0 0 L 4 4 L 0 8 Z"/>
-    </Grid>
-  </ControlTemplate>
+        </Grid>
+    </ControlTemplate>
 
-  <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
-    <Setter Property="SnapsToDevicePixels" Value="True"/>
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Horizontal">
-        <Setter Property="Width" Value="Auto"/>
-        <Setter Property="Height" Value="18" />
-        <Setter Property="Template" Value="{StaticResource HorizontalScrollBar}" />
-      </Trigger>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Width" Value="18"/>
-        <Setter Property="Height" Value="Auto" />
-        <Setter Property="Template" Value="{StaticResource VerticalScrollBar}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
+    <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="Height" Value="18" />
+                <Setter Property="Template" Value="{StaticResource HorizontalScrollBar}" />
+            </Trigger>
+            <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="Width" Value="18"/>
+                <Setter Property="Height" Value="Auto" />
+                <Setter Property="Template" Value="{StaticResource VerticalScrollBar}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/ScrollViewer.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/ScrollViewer.xaml
index 07fa158..74f8657 100644
--- a/AIStudio.Wpf.DiagramDesigner/Styles/ScrollViewer.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Styles/ScrollViewer.xaml
@@ -2,31 +2,31 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
 
-  <!-- SimpleStyles: ScrollViewer -->
+    <!-- SimpleStyles: ScrollViewer -->
 
-  <Style x:Key="LeftScrollViewer" TargetType="{x:Type ScrollViewer}">
-    <Setter Property="OverridesDefaultStyle" Value="True"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ScrollViewer}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto"/>
-              <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition/>
-              <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
+    <Style x:Key="LeftScrollViewer" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
 
-            <ScrollContentPresenter Grid.Column="1"/>
+                        <ScrollContentPresenter Grid.Column="1"/>
 
-            <ScrollBar Name="PART_VerticalScrollBar"
+                        <ScrollBar Name="PART_VerticalScrollBar"
               Value="{TemplateBinding VerticalOffset}"
               Maximum="{TemplateBinding ScrollableHeight}"
               ViewportSize="{TemplateBinding ViewportHeight}"
               Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
-            <ScrollBar Name="PART_HorizontalScrollBar"
+                        <ScrollBar Name="PART_HorizontalScrollBar"
               Orientation="Horizontal"
               Grid.Row="1"
               Grid.Column="1"
@@ -34,10 +34,10 @@
               Maximum="{TemplateBinding ScrollableWidth}"
               ViewportSize="{TemplateBinding ViewportWidth}"
               Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
-            
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/Shared.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/Shared.xaml
index fd557d4..5497c1f 100644
--- a/AIStudio.Wpf.DiagramDesigner/Styles/Shared.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Styles/Shared.xaml
@@ -1,118 +1,118 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    
-  <!-- Fill Brushes -->
 
-  <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#CCC" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <!-- Fill Brushes -->
 
-  <LinearGradientBrush x:Key="HorizontalNormalBrush" StartPoint="0,0" EndPoint="1,0">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#CCC" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFF" Offset="0.0"/>
+                <GradientStop Color="#CCC" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#EEE" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="HorizontalNormalBrush" StartPoint="0,0" EndPoint="1,0">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFF" Offset="0.0"/>
+                <GradientStop Color="#CCC" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#EEE" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFF" Offset="0.0"/>
+                <GradientStop Color="#EEE" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#FFF" Offset="0.0"/>
-        <GradientStop Color="#AAA" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFF" Offset="0.0"/>
+                <GradientStop Color="#EEE" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#BBB" Offset="0.0"/>
-        <GradientStop Color="#EEE" Offset="0.1"/>
-        <GradientStop Color="#EEE" Offset="0.9"/>
-        <GradientStop Color="#FFF" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#FFF" Offset="0.0"/>
+                <GradientStop Color="#AAA" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
+    <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#BBB" Offset="0.0"/>
+                <GradientStop Color="#EEE" Offset="0.1"/>
+                <GradientStop Color="#EEE" Offset="0.9"/>
+                <GradientStop Color="#FFF" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE" />
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
 
-  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF" />
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE" />
 
-  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD" />
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF" />
 
-  <!-- Border Brushes -->
+    <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD" />
 
-  <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#CCC" Offset="0.0"/>
-        <GradientStop Color="#444" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <!-- Border Brushes -->
 
-  <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#CCC" Offset="0.0"/>
-        <GradientStop Color="#444" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#CCC" Offset="0.0"/>
+                <GradientStop Color="#444" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#777" Offset="0.0"/>
-        <GradientStop Color="#000" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#CCC" Offset="0.0"/>
+                <GradientStop Color="#444" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Color="#444" Offset="0.0"/>
-        <GradientStop Color="#888" Offset="1.0"/>
-      </GradientStopCollection>
-    </GradientBrush.GradientStops>
-  </LinearGradientBrush>
+    <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#777" Offset="0.0"/>
+                <GradientStop Color="#000" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+    <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Color="#444" Offset="0.0"/>
+                <GradientStop Color="#888" Offset="1.0"/>
+            </GradientStopCollection>
+        </GradientBrush.GradientStops>
+    </LinearGradientBrush>
 
-  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+    <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
 
-  <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA" />
-  
-  <SolidColorBrush x:Key="GlyphBrush" Color="#444" />
+    <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
 
-  <SolidColorBrush x:Key="LightColorBrush" Color="#DDD" />
+    <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA" />
+
+    <SolidColorBrush x:Key="GlyphBrush" Color="#444" />
+
+    <SolidColorBrush x:Key="LightColorBrush" Color="#DDD" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Styles/ToolTip.xaml b/AIStudio.Wpf.DiagramDesigner/Styles/ToolTip.xaml
index bdc742c..5461cea 100644
--- a/AIStudio.Wpf.DiagramDesigner/Styles/ToolTip.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Styles/ToolTip.xaml
@@ -2,37 +2,37 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
 
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Shared.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
-  <!-- SimpleStyles: ToolTip -->
-  <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
-    <Setter Property="OverridesDefaultStyle" Value="true"/>
-    <Setter Property="HasDropShadow" Value="True"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToolTip">
-          <Border Name="Border"
+    <!-- SimpleStyles: ToolTip -->
+    <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="HasDropShadow" Value="True"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToolTip">
+                    <Border Name="Border"
             Background="{StaticResource LightBrush}"
             BorderBrush="{StaticResource SolidBorderBrush}"
             BorderThickness="1"
             Width="{TemplateBinding Width}"
             Height="{TemplateBinding Height}">
-            <ContentPresenter
+                        <ContentPresenter
               Margin="4" 
               HorizontalAlignment="Left"
               VerticalAlignment="Top" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasDropShadow" Value="true">
-              <Setter TargetName="Border" Property="CornerRadius" Value="4"/>
-              <Setter TargetName="Border" Property="SnapsToDevicePixels" Value="true"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Border" Property="CornerRadius" Value="4"/>
+                            <Setter TargetName="Border" Property="SnapsToDevicePixels" Value="true"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Resources/Styles/DesignerItems.xaml b/AIStudio.Wpf.DiagramDesigner/Themes/ConnectorItem.xaml
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/Resources/Styles/DesignerItems.xaml
rename to AIStudio.Wpf.DiagramDesigner/Themes/ConnectorItem.xaml
diff --git a/AIStudio.Wpf.DiagramDesigner/Themes/DesignerItem.xaml b/AIStudio.Wpf.DiagramDesigner/Themes/DesignerItem.xaml
new file mode 100644
index 0000000..06fa030
--- /dev/null
+++ b/AIStudio.Wpf.DiagramDesigner/Themes/DesignerItem.xaml
@@ -0,0 +1,204 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
+                    xmlns:c="clr-namespace:AIStudio.Wpf.DiagramDesigner.Controls"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:gif="http://wpfanimatedgif.codeplex.com" >
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+    <s:ColorBrushConverter x:Key="ColorBrushConverter" />
+    <s:ConectorOrientationConverter  x:Key="ConectorOrientationConverter" />
+    <s:ConectorValueConverter x:Key="ConectorValueConverter"/>
+    <s:ArrowPathConverter x:Key="ArrowPathConverter"/>
+    <s:ArrowSizeConverter x:Key="ArrowSizeConverter"/>
+    <s:LineDashConverter x:Key="LineDashConverter"/>
+    <s:ClipConverter x:Key="ClipConverter"/>
+
+    <DataTemplate DataType="{x:Type s:TextDesignerItemViewModel}">
+        <Grid >
+            <Border Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" IsHitTestVisible="False"/>
+            <Grid  Margin="5">
+                <s:TextControl s:ControlAttachProperty.Watermark="{Binding Watermark}" />
+            </Grid>
+        </Grid>
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type s:ShapeDesignerItemViewModel}">
+        <Grid IsHitTestVisible="False" Background="White">
+            <Grid.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="显示点" IsCheckable="True" IsChecked="{Binding ShowConnectors}" />
+                </ContextMenu>
+            </Grid.ContextMenu>
+            <Control x:Name="control" />
+        </Grid>
+        <DataTemplate.Triggers>
+            <DataTrigger Binding="{Binding DrawMode}" Value="Line">
+                <Setter TargetName="control" Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Line X1="{Binding ConnectionPoints[0].X}" Y1="{Binding ConnectionPoints[0].Y}" 
+                                  X2="{Binding ConnectionPoints[1].X}" Y2="{Binding ConnectionPoints[1].Y}" 
+                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
+                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
+                                  Stretch="Fill"></Line>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DrawMode}" Value="Rectangle">
+                <Setter TargetName="control" Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Rectangle 
+                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
+                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
+                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                  Stretch="Fill"></Rectangle>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DrawMode}" Value="Ellipse">
+                <Setter TargetName="control" Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Ellipse 
+                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
+                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
+                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                  Stretch="Fill"></Ellipse>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DrawMode}" Value="Polyline">
+                <Setter TargetName="control" Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Polyline
+                                  Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}"
+                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
+                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
+                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                  FillRule="Nonzero"
+                                  Stretch="Fill"></Polyline>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DrawMode}" Value="Polygon">
+                <Setter TargetName="control" Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Polygon
+                                  Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}"
+                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
+                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
+                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                  FillRule="Nonzero"
+                                  Stretch="Fill"></Polygon>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DrawMode}" Value="DirectLine">
+                <Setter TargetName="control" Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Polyline
+                                  Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}"
+                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
+                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
+                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                  FillRule="Nonzero"
+                                  Stretch="Fill"></Polyline>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+
+
+        </DataTemplate.Triggers>
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type s:GroupDesignerItemViewModel}">
+        <Grid IsHitTestVisible="{Binding IsHitTestVisible}">
+
+        </Grid>
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type s:GifImageItemViewModel}">
+        <Grid IsHitTestVisible="False">
+            <Image Name="PART_Image_run" gif:ImageBehavior.AnimatedSource="{Binding Icon}" gif:ImageBehavior.AutoStart="True" VerticalAlignment="Center" HorizontalAlignment="Center"  Visibility="Visible"/>
+            <Control x:Name="control" />
+        </Grid>
+        <DataTemplate.Triggers>
+            <DataTrigger Binding="{Binding IsRunning}" Value="false">
+                <Setter TargetName="PART_Image_run" Property="gif:ImageBehavior.AutoStart" Value="False" />
+            </DataTrigger>
+        </DataTemplate.Triggers>
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type s:VideoItemViewModel}">
+        <Grid IsHitTestVisible="False">
+            <MediaElement x:Name="MediaPlayer" LoadedBehavior="Play" Source="{Binding Icon}" VerticalAlignment="Center" HorizontalAlignment="Center"  Visibility="Visible"/>
+        </Grid>
+    </DataTemplate>
+
+    <DataTemplate DataType="{x:Type s:ImageItemViewModel}">
+        <Grid ToolTip="{Binding Icon}">
+            <Grid IsHitTestVisible="False" ClipToBounds="True">
+                <Image x:Name="image" Source="{Binding Icon}" Stretch="Fill" 
+                           Margin="{Binding Object,Converter={StaticResource ClipConverter},ConverterParameter='Margin'}" 
+                           Clip="{Binding Object,Converter={StaticResource ClipConverter},ConverterParameter='Clip'}">
+                </Image>
+                <Image x:Name="gif" gif:ImageBehavior.AnimatedSource="{Binding Icon}" gif:ImageBehavior.AutoStart="True" Visibility="Collapsed" Stretch="Fill"/>
+            </Grid>
+            <!-- PART_ResizeDecorator -->
+            <Border x:Name="PART_ResizeDecorator" SnapsToDevicePixels="true" Margin="{Binding ResizeMargin,Mode=TwoWay}" Visibility="Collapsed">
+                <Grid x:Name="Grid" Margin="-2">
+                    <c:BorderResizeThumb Height="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
+                    <c:BorderResizeThumb Width="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Stretch" HorizontalAlignment="Left"/>
+                    <c:BorderResizeThumb Width="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
+                    <c:BorderResizeThumb Height="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Bottom" HorizontalAlignment="Stretch"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNS" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Top" HorizontalAlignment="Center"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeWE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeWE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNS" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNWSE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNESW" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Top" HorizontalAlignment="Right"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNESW" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNWSE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
+                     VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
+                </Grid>
+            </Border>
+        </Grid>
+        <DataTemplate.Triggers>
+            <DataTrigger Binding="{Binding Suffix}" Value=".gif">
+                <Setter TargetName="gif" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="image" Property="Visibility" Value="Collapsed"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding ResizeMode}" Value="True">
+                <Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Visible"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Suffix}" Value=".txt">
+                <Setter TargetName="image" Property="Source" Value="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/file.png"/>
+                <Setter TargetName="image" Property="Margin" Value="0"/>
+                <Setter TargetName="image" Property="Clip" Value="{x:Null}"/>
+            </DataTrigger>
+        </DataTemplate.Triggers>
+    </DataTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml b/AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml
index 85eefd4..9d0778d 100644
--- a/AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml
@@ -6,199 +6,8 @@
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" >
 
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    <s:ColorBrushConverter x:Key="ColorBrushConverter" />
-    <s:ConectorOrientationConverter  x:Key="ConectorOrientationConverter" />
-    <s:ConectorValueConverter x:Key="ConectorValueConverter"/>
-    <s:ArrowPathConverter x:Key="ArrowPathConverter"/>
-    <s:ArrowSizeConverter x:Key="ArrowSizeConverter"/>
-    <s:LineDashConverter x:Key="LineDashConverter"/>
-    <s:ClipConverter x:Key="ClipConverter"/>
-    
-    <DataTemplate DataType="{x:Type s:TextDesignerItemViewModel}">
-        <Grid >
-            <Border Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" IsHitTestVisible="False"/>
-            <Grid  Margin="5">
-                <s:TextControl s:ControlAttachProperty.Watermark="{Binding Watermark}" />
-            </Grid>
-        </Grid>
-    </DataTemplate>
-
-    <DataTemplate DataType="{x:Type s:ShapeDesignerItemViewModel}">
-        <Grid IsHitTestVisible="False" Background="White">
-            <Grid.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="显示点" IsCheckable="True" IsChecked="{Binding ShowConnectors}" />
-                </ContextMenu>
-            </Grid.ContextMenu>
-            <Control x:Name="control" />
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding DrawMode}" Value="Line">
-                <Setter TargetName="control" Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Line X1="{Binding ConnectionPoints[0].X}" Y1="{Binding ConnectionPoints[0].Y}" 
-                                  X2="{Binding ConnectionPoints[1].X}" Y2="{Binding ConnectionPoints[1].Y}" 
-                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
-                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
-                                  Stretch="Fill"></Line>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding DrawMode}" Value="Rectangle">
-                <Setter TargetName="control" Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Rectangle 
-                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
-                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
-                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
-                                  Stretch="Fill"></Rectangle>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding DrawMode}" Value="Ellipse">
-                <Setter TargetName="control" Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Ellipse 
-                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
-                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
-                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
-                                  Stretch="Fill"></Ellipse>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding DrawMode}" Value="Polyline">
-                <Setter TargetName="control" Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Polyline
-                                  Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}"
-                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
-                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
-                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
-                                  FillRule="Nonzero"
-                                  Stretch="Fill"></Polyline>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding DrawMode}" Value="Polygon">
-                <Setter TargetName="control" Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Polygon
-                                  Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}"
-                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
-                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
-                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
-                                  FillRule="Nonzero"
-                                  Stretch="Fill"></Polygon>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding DrawMode}" Value="DirectLine">
-                <Setter TargetName="control" Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Polyline
-                                  Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}"
-                                  Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" 
-                                  StrokeThickness="{Binding ColorViewModel.LineWidth}"
-                                  Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
-                                  FillRule="Nonzero"
-                                  Stretch="Fill"></Polyline>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
-
-            
-        </DataTemplate.Triggers>
-    </DataTemplate>
-
-    <DataTemplate DataType="{x:Type s:GroupDesignerItemViewModel}">
-        <Grid IsHitTestVisible="{Binding IsHitTestVisible}">
-
-        </Grid>
-    </DataTemplate>
-
-    <DataTemplate DataType="{x:Type s:GifImageItemViewModel}">
-        <Grid IsHitTestVisible="False">
-            <Image Name="PART_Image_run" gif:ImageBehavior.AnimatedSource="{Binding Icon}" gif:ImageBehavior.AutoStart="True" VerticalAlignment="Center" HorizontalAlignment="Center"  Visibility="Visible"/>
-            <Control x:Name="control" />
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding IsRunning}" Value="false">
-                <Setter TargetName="PART_Image_run" Property="gif:ImageBehavior.AutoStart" Value="False" />
-            </DataTrigger>
-        </DataTemplate.Triggers>
-    </DataTemplate>
-
-    <DataTemplate DataType="{x:Type s:VideoItemViewModel}">
-        <Grid IsHitTestVisible="False">
-            <MediaElement x:Name="MediaPlayer" LoadedBehavior="Play" Source="{Binding Icon}" VerticalAlignment="Center" HorizontalAlignment="Center"  Visibility="Visible"/>
-        </Grid>
-    </DataTemplate>
-
-    <DataTemplate DataType="{x:Type s:ImageItemViewModel}">
-        <Grid ToolTip="{Binding Icon}">
-            <Grid IsHitTestVisible="False" ClipToBounds="True">
-                <Image x:Name="image" Source="{Binding Icon}" Stretch="Fill" 
-                           Margin="{Binding Object,Converter={StaticResource ClipConverter},ConverterParameter='Margin'}" 
-                           Clip="{Binding Object,Converter={StaticResource ClipConverter},ConverterParameter='Clip'}">
-                </Image>
-                <Image x:Name="gif" gif:ImageBehavior.AnimatedSource="{Binding Icon}" gif:ImageBehavior.AutoStart="True" Visibility="Collapsed" Stretch="Fill"/>
-            </Grid>
-            <!-- PART_ResizeDecorator -->
-            <Border x:Name="PART_ResizeDecorator" SnapsToDevicePixels="true" Margin="{Binding ResizeMargin,Mode=TwoWay}" Visibility="Collapsed">
-                <Grid x:Name="Grid" Margin="-2">
-                    <c:BorderResizeThumb Height="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
-                    <c:BorderResizeThumb Width="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Stretch" HorizontalAlignment="Left"/>
-                    <c:BorderResizeThumb Width="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
-                    <c:BorderResizeThumb Height="5" Cursor="SizeAll" Margin="-3" ResizeMode="DragMargin" BorderBrush="Blue" BorderThickness="5" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Bottom" HorizontalAlignment="Stretch"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNS" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Top" HorizontalAlignment="Center"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeWE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeWE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNS" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNWSE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNESW" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Top" HorizontalAlignment="Right"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNESW" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
-                    <c:BorderResizeThumb Width="5" Height="5" Cursor="SizeNWSE" ResizeMode="Margin" Margin="-3" ResizeElement="{Binding ElementName=PART_ResizeDecorator}"
-                     VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
-                </Grid>
-            </Border>
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding Suffix}" Value=".gif">
-                <Setter TargetName="gif" Property="Visibility" Value="Visible"/>
-                <Setter TargetName="image" Property="Visibility" Value="Collapsed"/>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ResizeMode}" Value="True">
-                <Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Visible"/>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Suffix}" Value=".txt">
-                <Setter TargetName="image" Property="Source" Value="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/file.png"/>
-                <Setter TargetName="image" Property="Margin" Value="0"/>
-                <Setter TargetName="image" Property="Clip" Value="{x:Null}"/>
-            </DataTrigger>
-        </DataTemplate.Triggers>
-    </DataTemplate>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/AIStudio.Wpf.DiagramDesigner;component/Themes/DesignerItem.xaml" />
+        <ResourceDictionary Source="/AIStudio.Wpf.DiagramDesigner;component/Themes/ConnectorItem.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
index 2d9ad0d..593166f 100644
--- a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
@@ -1013,6 +1013,11 @@
                 </ItemsControl.ItemsPanel>
 
             </ItemsControl>
+            <!--<s:ZoomBox x:Name="zoomBox"
+                       Width="180"
+                       HorizontalAlignment="Right"
+                       VerticalAlignment="Bottom"
+                       Margin="0,0,5,5" />-->
         </Grid>
     </Border>
 </UserControl>
diff --git a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs
index e1c6234..868cae5 100644
--- a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs
@@ -24,7 +24,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             InitializeComponent();
         }
 
-        public static readonly DependencyProperty ZoomValueProperty = DependencyProperty.Register("ZoomValue", typeof(double), typeof(DiagramControl), new UIPropertyMetadata(1d));
+        public static readonly DependencyProperty ZoomValueProperty = DependencyProperty.Register(nameof(ZoomValue), typeof(double), typeof(DiagramControl), new UIPropertyMetadata(1d));
         public double ZoomValue
         {
             get
@@ -40,7 +40,8 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         private void DesignerCanvas_Loaded(object sender, RoutedEventArgs e)
         {
-     
+            //DesignerCanvas myDesignerCanvas = sender as DesignerCanvas;
+            //zoomBox.DesignerCanvas = myDesignerCanvas;
         }
 
         private async void ScaleTransform_Changed(object sender, EventArgs e)
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
index 9188450..0cb9e95 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
@@ -144,7 +144,7 @@ namespace AIStudio.Wpf.DiagramDesigner
         {
             get
             {
-                if (Parent?.IsReadOnly == true)
+                if (Parent?.IsReadOnly == true && Parent?.IsLoading == false)
                 {
                     return true;
                 }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs
index 494c20b..8f2db89 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs
@@ -27,6 +27,11 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        public bool IsLoading
+        {
+            get; set;
+        }
+
         public DrawMode? VectorLineDrawMode
         {
             get; set;
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
index e9ddf18..a99f334 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
@@ -46,6 +46,7 @@ namespace AIStudio.Wpf.DiagramDesigner
         void UpdateZIndex();
 
         bool IsReadOnly{ get; set; }
+        bool IsLoading{get;set;}
         Size PageSize { get; set; }
         PageSizeType PageSizeType { get; set; }
         bool ShowGrid { get; set; }
diff --git a/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj b/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj
index 120ffc4..944a2fd 100644
--- a/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj
+++ b/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj
@@ -68,4 +68,8 @@
     </Page>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Themes\" />
+  </ItemGroup>
+
 </Project>
diff --git a/AIStudio.Wpf.DiagramHelper/Themes/Generic.xaml b/AIStudio.Wpf.DiagramHelper/Themes/Generic.xaml
deleted file mode 100644
index 01a6b5d..0000000
--- a/AIStudio.Wpf.DiagramHelper/Themes/Generic.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Controls/ComboBox.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj b/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj
new file mode 100644
index 0000000..35d6f60
--- /dev/null
+++ b/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj
@@ -0,0 +1,273 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>AIStudio.Wpf.Flowchart</AssemblyName>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.Flowchart\obj\</MSBuildProjectExtensionsPath>
+    <_TargetAssemblyProjectName>AIStudio.Wpf.Flowchart</_TargetAssemblyProjectName>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MathParser.org-mXparser" Version="4.4.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Accessibility.dll" />
+    <ReferencePath Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\bin\Debug\netcoreapp3.1\AIStudio.Wpf.DiagramDesigner.dll" />
+    <ReferencePath Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramHelper\bin\Debug\netcoreapp3.1\AIStudio.Wpf.DiagramHelper.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\controlzex\4.4.0\lib\netcoreapp3.1\ControlzEx.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\fluent.ribbon\8.0.3\lib\netcoreapp3.0\Fluent.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BootstrapIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BoxIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Codicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Core.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Entypo.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.EvaIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FileIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Fontaudio.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FontAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.ForkAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Ionicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.JamIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Material.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialDesign.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialLight.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Microns.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Modern.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Octicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PicolIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PixelartIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RadixIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RemixIcon.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RPGAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.SimpleIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Typicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Unicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.VaadinIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.WeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Zondicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mathparser.org-mxparser\4.4.2\lib\netcoreapp31\MathParser.org-mXparser.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.VisualBasic.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.VisualBasic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.Registry.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.Registry.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.SystemEvents.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.31\lib\netcoreapp3.1\Microsoft.Xaml.Behaviors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\netstandard.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Aero.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Aero2.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.AeroLite.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Classic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Luna.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Royale.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationUI.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\ReachFramework.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\util.svg2xaml\1.2.0\lib\netcoreapp3.1\Svg2Xaml.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\util.svg2xamltestextension\1.2.5\lib\netcoreapp3.1\Svg2XamlTestExtension.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.AppContext.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Buffers.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.CodeDom.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.Immutable.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.NonGeneric.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.Specialized.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.DataAnnotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.TypeConverter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Configuration.ConfigurationManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Configuration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Data.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.DiagnosticSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.EventLog.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.PerformanceCounter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Process.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.TextWriterTraceListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.TraceSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.DirectoryServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.drawing.common\5.0.2\ref\netcoreapp3.0\System.Drawing.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Drawing.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Drawing.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Globalization.Calendars.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Globalization.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.Brotli.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.ZipFile.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.DriveInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.Watcher.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.IsolatedStorage.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.MemoryMappedFiles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Packaging.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Pipes.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Pipes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.UnmanagedMemoryStream.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Memory.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.HttpListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Mail.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.NameResolution.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Ping.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.ServicePoint.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Sockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebSockets.Client.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebSockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Numerics.Vectors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Printing.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.reactive\5.0.0\build\netcoreapp3.1\System.Reactive.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.DispatchProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Metadata.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.TypeExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.Reader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.Writer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.CompilerServices.Unsafe.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.CompilerServices.VisualC.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.InteropServices.WindowsRuntime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Intrinsics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Loader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Formatters.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Claims.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Cng.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Csp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Pkcs.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.ProtectedData.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Permissions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Principal.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.SecureString.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ServiceModel.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ServiceProcess.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encoding.CodePages.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encodings.Web.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.text.json\4.7.2\lib\netcoreapp3.0\System.Text.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Channels.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Overlapped.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.Dataflow.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.ThreadPool.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Transactions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Transactions.Local.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Web.HttpUtility.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Controls.Ribbon.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Forms.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Forms.Design.Editors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Input.Manipulations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Presentation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XmlSerializer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationClientSideProviders.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\WindowsFormsIntegration.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\wpfanimatedgif\2.0.0\lib\netcoreapp3.0\WpfAnimatedGif.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.Flowchart\obj\Debug\netcoreapp3.1\Controls\ToolBoxControl.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.Flowchart\obj\Debug\netcoreapp3.1\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\Gu.Roslyn.Extensions.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\WpfAnalyzers.dll" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+</Project>
\ No newline at end of file
diff --git a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml b/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml
index 8e8c944..c0a9919 100644
--- a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml
+++ b/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml
@@ -4,7 +4,7 @@
                     xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Flowchart;component/Themes/FlowNode.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Controls/ComboBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Styles/ComboBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="AIStudio.Styles.FlowchartEditor" TargetType="{x:Type controls:FlowchartEditor}">
diff --git a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs b/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs
index 6d29574..01fffcb 100644
--- a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs
+++ b/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs
@@ -92,9 +92,10 @@ namespace AIStudio.Wpf.Flowchart.Controls
 
         private void CreateFlowchartModel(string json)
         {
+            _diagramViewModel.IsLoading = true;
             _diagramViewModel.Items.Clear();
-
             _diagramViewModel.ToObject(json);
+            _diagramViewModel.IsLoading = false;
         }
 
         public static readonly DependencyProperty GetDataFuncProperty =
diff --git a/AIStudio.Wpf.Flowchart/Models/DiagramDataExtention.cs b/AIStudio.Wpf.Flowchart/Models/DiagramDataExtention.cs
index 02558a7..3278099 100644
--- a/AIStudio.Wpf.Flowchart/Models/DiagramDataExtention.cs
+++ b/AIStudio.Wpf.Flowchart/Models/DiagramDataExtention.cs
@@ -213,7 +213,7 @@ namespace AIStudio.Wpf.Flowchart.Models
             FullyCreatedConnectorInfo sourceConnectorInfo = sourceNode.Connectors.FirstOrDefault(p => p.Orientation.ToString() == diagramLink.SourcePortAlignment);
             FullyCreatedConnectorInfo sinkConnectorInfo = targetNode.Connectors.FirstOrDefault(p => p.Orientation.ToString() == diagramLink.TargetPortAlignment);
             ConnectorViewModel linkModel = new ConnectorViewModel(sourceConnectorInfo, sinkConnectorInfo, diagram.VectorLineDrawMode ?? DrawMode.BoundaryConnectingLine);
-
+            linkModel.Id = new Guid(diagramLink.Id);
             linkModel.ColorViewModel.LineColor.Color = SerializeHelper.DeserializeColor(diagramLink.Color);
             linkModel.ColorViewModel.LineWidth = diagramLink.Width;
             //线条形状与箭头待处理